Commit Graph

49695 Commits

Author SHA1 Message Date
Mikhail Glukhikh 94d87bfb67 MPP wizard tests: enable Groovy extension, don't wait for daemon death 2018-10-17 16:33:49 +03:00
Mikhail Glukhikh 02e6fb348d MPP wizard tests: check no empty files are generated 2018-10-17 16:33:47 +03:00
Mikhail Glukhikh 853d90d906 MPP wizard tests: extract test functions into separate class 2018-10-17 16:33:21 +03:00
Mikhail Glukhikh 35d4b7dfd9 MPP wizard tests: temporary fix for "failed to delete" problem 2018-10-17 16:33:19 +03:00
Mikhail Glukhikh 63146b98bb MPP wizard tests: add tests run #KT-27492 Fixed 2018-10-17 16:33:18 +03:00
Mikhail Glukhikh 855e2707e3 MPP wizard test: add project import (KT-27492) 2018-10-17 16:33:17 +03:00
Mikhail Glukhikh 43c8c44441 Add MPP wizard general test (KT-27492) 2018-10-17 16:33:15 +03:00
Mikhail Glukhikh 8281416dfa Introduce explicit plugin versions for MPP builder testing 2018-10-17 16:33:09 +03:00
Mikhail Glukhikh a16318624b MPP wizards: remove unused module parameter from createProjectSkeleton 2018-10-17 16:33:06 +03:00
Sergey Igushkin a88bfb726d Fix uninitialized lateinit compilerPluginOptionsTask in non-MPP
When a non-MPP is imported into the IDE, the importer anyway tries to
build the MPP source sets model, so it tries to access the
`compilerPluginArguments` and `compilerPluginClasspath`, resulting in
an import error.

Issue #KT-27646 Fixed
2018-10-17 16:19:16 +03:00
Alexander Udalov 5d040c459b Regenerate tests 2018-10-17 14:05:31 +02:00
romanart 71f109387a Update tests 2018-10-17 14:10:37 +03:00
romanart 6a66663739 Update IR Runtime 2018-10-17 14:10:37 +03:00
romanart eb2a33ebee [JS IR BE] Implement lowering to connect kotlin Throwable with JS Error 2018-10-17 14:10:37 +03:00
Roman Elizarov 1a86411139 Removed todo from Continuation.context
The design decision was the we would not provide its default impl
2018-10-17 11:59:26 +03:00
Mikhail Zarechenskiy fe233de825 Report error for Result as an extension receiver with safe call
#KT-27620 Fixed
2018-10-16 19:03:05 +03:00
Dmitriy Dolovov 249bdb969c Fix: K/N interop libs are not read by IDEA in certain cases
Issue #KT-27579 Fixed
2018-10-16 21:32:08 +07:00
Mikhail Glukhikh 2dd8b526fb Live templates test: fix typo & cleanup 2018-10-16 17:17:22 +03:00
Mikhail Glukhikh 0f94c0901f Introduce live templates for main without arguments #KT-27461 Fixed 2018-10-16 17:17:21 +03:00
Pavel V. Talanov 1c761c7864 KotlinJUnitRunConfigurationProducer: do not manually override sdk
Should be correct if the module is correct
Manually setting sdk led to problem in case of android SDK
2018-10-16 15:27:59 +02:00
Pavel V. Talanov 3c3e7b617b KotlinMultiplatformRunLocationsProvider: fix tests in android modules
Android modules are considered to be 'production' but can contain tests
    and test roots

 #KT-27371 In progress
2018-10-16 15:27:58 +02:00
victor.petukhov a2b7912db9 Add expect and actual modifiers to the grammar (KT-25477) 2018-10-16 16:18:32 +03:00
victor.petukhov 205bd3f829 Replace the invalid rule name element to expression in the collectionLiteral grammar rule 2018-10-16 16:16:18 +03:00
Sergey Igushkin c25cdb4264 Fix resourcesDir that cannot be imported due to not being a File 2018-10-16 14:30:25 +03:00
Sergey Igushkin e103bea211 Import compiler plugin options from new MPP into IDE
Issue #KT-27499 Fixed
2018-10-16 14:30:25 +03:00
Sergey Igushkin 7075509b1e Import experimental annotations from new MPP into IDE
Issue #KT-26840 Fixed
2018-10-16 14:30:25 +03:00
Sergey Igushkin 9f2e5cdc4d Propagate the subplugin options from the tasks to the source sets
If a source set is used in only one compilation, take the options from
its compile task.

If a source set is used by multiple compilations of a single target,
either choose the 'main' compilation or choose any (this will happen
for Android, and it looks OK for the first time). If there are multiple
compilations of different targets, use the metadata compilation.

Issue #KT-27499 In Progress
2018-10-16 14:30:24 +03:00
Sergey Igushkin e573911e16 Fix the format used by Kotlin/Native tasks for compiler plugin args
The correct format is "-P arg1", not "-Parg1".
2018-10-16 14:30:24 +03:00
Sergey Igushkin ee63a6b3af Don't apply the Android Extensions subplugin to non-Android JVM tasks
In a multiplatform project with both Android and non-Android JVM targets
the subplugin should only affect the tasks of the Android target
2018-10-16 14:30:24 +03:00
Sergey Igushkin 5db23f1a81 Support -Xuse-experimental in the new MPP languageSettings { ... } DSL
Add the corresponding Gradle plugin DSL, consistency checks, and logic
for propagating these settings to the compiler during build.

Issue #KT-26840 In Progress
2018-10-16 14:30:24 +03:00
Sergey Rostov bde6d841c1 IC: move CacheVersionManager from build_common to jps plugin, tests 2018-10-16 13:33:24 +03:00
Sergey Rostov 0d1f7965d4 JPS, CacheAttributesManager: remove unused methods 2018-10-16 12:29:58 +03:00
Sergey Rostov d91f6f8c43 IC: move CacheVersionManager from build_common to jps plugin 2018-10-16 12:29:58 +03:00
Sergey Rostov 940861c245 IC: remove CacheVersionManager usages from build_common.
They are kept up to date but was never used.
2018-10-16 12:29:58 +03:00
Sergey Rostov 5232f080d6 JPS: Fix updating cache format version for rebuilt targets by removing i/o optimization
Problem: previously, format-version.txt file was deleted while cleaning
target output on rebuild. Since directory was deleted, cache
attributesDiff stored in memory was not updated. This causes that on
saveExpectedStateIfNeeded does nothing.

The right way to fix it is move cache version format diff into
AbstractIncrementalCache, and override `clean()` method. But this is
hard to do for lookup storage, since used compilers set (jvm/js) will
known only after context init. This can be done by moving `expected`
attributes out of manager, but this is huge change for small benefit.

So, the optimal way for now is to write version for each build, even if
it is not changed.

#KT-27044 Fixed
2018-10-16 12:29:58 +03:00
Alexey Sedunov cf31e4d58c MPP: Recover content root import accidentally removed earlier 2018-10-16 12:05:19 +03:00
Alexey Sedunov fea397a2ad MPP: Support MPP-dependent Java modules in Android projects
#KT-27265 Fixed
2018-10-16 12:05:19 +03:00
Alexey Sedunov dcdd42ba00 MPP: Add Android tests for new MPP 2018-10-16 12:05:19 +03:00
Alexey Sedunov da06e49b19 MPP: Merge module dependencies if one of them has COMPILE scope 2018-10-16 12:05:18 +03:00
Alexey Sedunov d36ee02499 Gradle: Retrieve AndroidModuleModel using IdeModifiableModelsProvider
Otherwise it may be null if module is just created by the import
2018-10-16 12:05:18 +03:00
Alexey Sedunov 3a0e539eee MPP: Add MPP source roots to dependent non-MPP module
#KT-27365 Fixed
2018-10-16 12:05:18 +03:00
Alexey Sedunov 558345b057 MPP: Assign TEST scope to dependencies of test source sets
#KT-26868 Fixed
2018-10-16 12:05:17 +03:00
Alexey Sedunov 523b662680 MPP: Update Kotlin version in tests to 1.3-RC3 2018-10-16 12:05:17 +03:00
Alexey Sedunov abec171685 Native: Register '.klib' extension through FileTypeFactory 2018-10-16 12:05:17 +03:00
Alexey Sedunov ca2367f2b5 MPP: Rewrite ImportedModule name instead of wrapping it
Otherwise this instance is not deserialized properly
breaking import on opening project in AS

 #KT-27485 Fixed
 #KT-27473 Fixed
2018-10-16 12:05:17 +03:00
Denis Zharkov bda1ef8d57 Do not run bytecode optimization passes for in bodyless modes
FunctionsFromAnyGeneratorImpl has been changed because previously
it didn't satisfy annotation visitor contract but it wasn't important
for MethodNode
2018-10-16 11:16:53 +03:00
Denis Zharkov 26da0b9e7e Do not call default constructor of SourceInterpreter in subclasses
It became illegal since asm-6.x

See https://gitlab.ow2.org/asm/asm/blob/c72a86bd5f48a308537695213d3a23ac35a57d55/asm-analysis/src/main/java/org/objectweb/asm/tree/analysis/SourceInterpreter.java#L56

 #KT-27572 Fixed
2018-10-16 11:16:53 +03:00
Valentin Kipyatkov c63eb18b3c Fixed nested class in companion object case 2018-10-16 08:41:43 +03:00
Valentin Kipyatkov 28e2683146 One more test 2018-10-16 08:41:42 +03:00
Valentin Kipyatkov 69f74b2a51 Fixed ShortenReferences for extension on companion object 2018-10-16 08:41:42 +03:00