diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index 826c1d713ba..b7159a55626 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -23,7 +23,13 @@ dependencies { testCompile(project(":compiler:frontend.java")) testCompile(projectTests(":jps-plugin")) testCompile(commonDep("junit:junit")) - testCompile(intellijDep()) { includeJars("openapi", "util", "idea", "idea_rt", "groovy-all", "jps-builders", rootProject = rootProject) } + testCompile(intellijDep()) { includeJars("openapi", "util", "idea", "idea_rt", "groovy-all", rootProject = rootProject) } + Platform[191].orLower { + testCompile(intellijDep()) { includeJars("jps-builders") } + } + Platform[192].orHigher { + testCompile(intellijPluginDep("java")) { includeJars("jps-builders") } + } testCompile(jpsStandalone()) { includeJars("jps-model") } testCompile(jpsBuildTest()) } diff --git a/compiler/cli/cli-js/build.gradle.kts b/compiler/cli/cli-js/build.gradle.kts index 8b1894bd7d9..31948b38c0c 100644 --- a/compiler/cli/cli-js/build.gradle.kts +++ b/compiler/cli/cli-js/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { compile(project(":js:js.serializer")) compile(project(":js:js.dce")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompile(project(":compiler:backend")) testCompile(project(":compiler:cli")) diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts index cc8cdf573ce..0a93b9f5dc8 100644 --- a/compiler/fir/fir2ir/build.gradle.kts +++ b/compiler/fir/fir2ir/build.gradle.kts @@ -32,6 +32,10 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testRuntime(project(":kotlin-reflect")) + Platform[192].orHigher { + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } + } } sourceSets { diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts index d9548729838..ba9262a4348 100644 --- a/compiler/fir/modularized-tests/build.gradle.kts +++ b/compiler/fir/modularized-tests/build.gradle.kts @@ -10,7 +10,15 @@ plugins { dependencies { testCompileOnly(intellijDep()) { - includeJars("openapi", "java-api", "extensions", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) + includeJars("openapi", "extensions", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) + } + + Platform[191].orLower { + testCompileOnly(intellijDep()) { includeJars("java-api") } + } + + Platform[192].orHigher { + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") } } testRuntime(intellijDep()) diff --git a/compiler/fir/psi2fir/build.gradle.kts b/compiler/fir/psi2fir/build.gradle.kts index 579fe56c552..101a5262193 100644 --- a/compiler/fir/psi2fir/build.gradle.kts +++ b/compiler/fir/psi2fir/build.gradle.kts @@ -25,6 +25,11 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testRuntime(project(":kotlin-reflect")) + + Platform[192].orHigher { + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } + } } sourceSets { diff --git a/compiler/fir/resolve/build.gradle.kts b/compiler/fir/resolve/build.gradle.kts index bac66a19b53..2593dd9e5ca 100644 --- a/compiler/fir/resolve/build.gradle.kts +++ b/compiler/fir/resolve/build.gradle.kts @@ -12,7 +12,15 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } - testCompileOnly(intellijDep()) { includeJars("openapi", "java-api", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) } + testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) } + + Platform[191].orLower { + testCompileOnly(intellijDep()) { includeJars("java-api") } + } + + Platform[192].orHigher { + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") } + } testRuntime(intellijDep()) diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts index 55aee03dd48..5485cf50c08 100644 --- a/compiler/light-classes/build.gradle.kts +++ b/compiler/light-classes/build.gradle.kts @@ -10,6 +10,11 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + + Platform[192].orHigher { + compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") } + } + compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) } } diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index f7476f9fa0b..4021422005c 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -61,6 +61,10 @@ dependencies { ) isTransitive = false } + + Platform[192].orHigher { + testCompile(intellijDep()) { includeJars("platform-util-ui") } + } } sourceSets { diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts index 865cb5ef445..ff01d6e1deb 100644 --- a/core/descriptors.runtime/build.gradle.kts +++ b/core/descriptors.runtime/build.gradle.kts @@ -13,6 +13,10 @@ dependencies { testCompile(projectTests(":generators:test-generator")) testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } + Platform[192].orHigher { + testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } + testRuntimeOnly(intellijPluginDep("jps-standalone")) { includeJars("jps-model") } + } } sourceSets { diff --git a/gradle/versions.properties.192 b/gradle/versions.properties.192 index 44c6cb3d77f..ce24b116ed6 100644 --- a/gradle/versions.properties.192 +++ b/gradle/versions.properties.192 @@ -1,9 +1,9 @@ -versions.intellijSdk=192.4205.45-EAP-SNAPSHOT +versions.intellijSdk=192.5118.30-EAP-SNAPSHOT versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=181.3494.12 versions.jar.asm-all=7.0.1 versions.jar.guava=25.1-jre -versions.jar.groovy-all=2.4.15 +versions.jar.groovy-all=2.4.17 versions.jar.lombok-ast=0.2.3 versions.jar.swingx-core=1.6.2-2 versions.jar.kxml2=2.3.0 diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 2e4a0d840c0..c7b40c95ff7 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -99,6 +99,13 @@ dependencies { compileOnly(project(":kotlin-daemon-client")) compileOnly(intellijDep()) + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") } + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") } + testRuntime(intellijCoreDep()) { includeJars("intellij-core") } + testRuntime(intellijPluginDep("java")) + } + compileOnly(commonDep("org.jetbrains", "markdown")) compileOnly(commonDep("com.google.code.findbugs", "jsr305")) compileOnly(intellijPluginDep("IntelliLang")) diff --git a/idea/fir-view/build.gradle.kts b/idea/fir-view/build.gradle.kts index cf5cd2a2390..7684fe67e70 100644 --- a/idea/fir-view/build.gradle.kts +++ b/idea/fir-view/build.gradle.kts @@ -21,6 +21,11 @@ dependencies { compile(project(":idea:idea-core")) compileOnly(intellijDep()) + + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + } + compileOnly(intellijPluginDep("gradle")) } diff --git a/idea/formatter/build.gradle.kts b/idea/formatter/build.gradle.kts index 9fcc1681832..2cc6de51388 100644 --- a/idea/formatter/build.gradle.kts +++ b/idea/formatter/build.gradle.kts @@ -8,6 +8,9 @@ dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) compileOnly(intellijDep()) + Platform[192].orHigher { + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + } } sourceSets { diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index 27c9dbf3df0..ffa52adcc74 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -22,6 +22,16 @@ dependencies { compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false } compileOnly(intellijDep()) + + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { + includeJars( + "java-api", "java-impl", + "external-system-rt", "external-system-impl" + ) + } + } + compileOnly(intellijPluginDep("gradle")) } diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts index 58b0de9ad6d..f2a4b9bbec8 100644 --- a/idea/idea-gradle-native/build.gradle.kts +++ b/idea/idea-gradle-native/build.gradle.kts @@ -32,6 +32,10 @@ dependencies { testCompileOnly(intellijPluginDep("Groovy")) testCompileOnly(intellijDep()) + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("external-system-rt", "external-system-impl") } + } + testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index e9ea8220833..1c8b0db0506 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -22,6 +22,18 @@ dependencies { compileOnly(intellijPluginDep("junit")) compileOnly(intellijPluginDep("testng")) + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { + includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") + } + + testCompileOnly(intellijPluginDep("java")) { + includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") + } + + testRuntimeOnly(intellijPluginDep("java")) + } + testCompile(projectTests(":idea")) testCompile(projectTests(":idea:idea-test-framework")) diff --git a/idea/idea-j2k/build.gradle.kts b/idea/idea-j2k/build.gradle.kts index 24cfc3b70fa..d26f58a8935 100644 --- a/idea/idea-j2k/build.gradle.kts +++ b/idea/idea-j2k/build.gradle.kts @@ -8,6 +8,10 @@ dependencies { compile(project(":idea:idea-core")) compileOnly(intellijDep()) + + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + } } sourceSets { diff --git a/idea/idea-jvm/build.gradle.kts b/idea/idea-jvm/build.gradle.kts index eaa33538b50..5b3fe6f63d9 100644 --- a/idea/idea-jvm/build.gradle.kts +++ b/idea/idea-jvm/build.gradle.kts @@ -12,6 +12,12 @@ dependencies { compileOnly(intellijDep()) compileOnly(commonDep("com.google.code.findbugs", "jsr305")) + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { + includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") + } + } + compileOnly(intellijPluginDep("junit")) compileOnly(intellijPluginDep("testng")) compileOnly(intellijPluginDep("coverage")) diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index ed1a9b685a0..3aecc5de41b 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -19,6 +19,12 @@ dependencies { compile(project(":idea:idea-jps-common")) compileOnly(intellijDep()) + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") } + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") } + testRuntime(intellijPluginDep("java")) + } + excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) } testCompile(projectTests(":idea")) diff --git a/idea/idea-native/build.gradle.kts b/idea/idea-native/build.gradle.kts index 33c3ce786ac..e9cd43d0cee 100644 --- a/idea/idea-native/build.gradle.kts +++ b/idea/idea-native/build.gradle.kts @@ -9,6 +9,9 @@ dependencies { compile(project(":idea:idea-jvm")) compile(project(":compiler:frontend")) compileOnly(intellijDep()) + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + } compile(project(":kotlin-native:kotlin-native-library-reader")) testCompileOnly(intellijDep()) diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts index b85fcb29091..1040b07b89e 100644 --- a/idea/idea-test-framework/build.gradle.kts +++ b/idea/idea-test-framework/build.gradle.kts @@ -15,6 +15,9 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testCompile(commonDep("junit:junit")) testCompileOnly(intellijDep()) + Platform[192].orHigher { + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") } + } } sourceSets { diff --git a/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts index b8a3885e0bf..f5367d21a28 100644 --- a/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts @@ -13,6 +13,11 @@ dependencies { compile(files("${System.getProperty("java.home")}/../lib/tools.jar")) compileOnly(intellijDep()) + + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + } + compileOnly(intellijPluginDep("stream-debugger")) testCompile(project(":kotlin-test:kotlin-test-junit")) diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts index 79792322083..1e66e650b04 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts @@ -10,6 +10,9 @@ dependencies { compile(project(":idea:idea-j2k")) compile(project(":idea:jvm-debugger:jvm-debugger-util")) compile(files("${System.getProperty("java.home")}/../lib/tools.jar")) + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + } compileOnly(intellijDep()) diff --git a/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts index 6cadaafcd10..a7df250de4a 100644 --- a/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts @@ -9,6 +9,10 @@ dependencies { compile(files("${System.getProperty("java.home")}/../lib/tools.jar")) compileOnly(intellijDep()) + Platform[192].orHigher { + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + } + compileOnly(intellijPluginDep("stream-debugger")) testCompile(project(":kotlin-test:kotlin-test-junit")) diff --git a/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts index 8cdb388dc44..c586069f85c 100644 --- a/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts @@ -12,6 +12,10 @@ dependencies { compile(project(":idea:jvm-debugger:eval4j")) compile(files("${System.getProperty("java.home")}/../lib/tools.jar")) + + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + } compileOnly(intellijDep()) diff --git a/idea/resources/META-INF/plugin.xml.192 b/idea/resources/META-INF/plugin.xml.192 index 070a10927ec..c8b72fc9cf8 100644 --- a/idea/resources/META-INF/plugin.xml.192 +++ b/idea/resources/META-INF/plugin.xml.192 @@ -13,7 +13,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. @snapshot@ JetBrains - + com.intellij.modules.platform diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 33e62c68665..a1d04603bd4 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -24,6 +24,11 @@ dependencies { testCompileOnly(intellijDep()) + Platform[192].orHigher { + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + testRuntimeOnly(intellijPluginDep("java")) + } + testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index 2ffe1efb648..9587501a2c3 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -25,7 +25,17 @@ dependencies { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject) } } - compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") } + + Platform[191].orLower { + testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") } + compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") } + } + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("jps-builders", "jps-builders-6") } + testCompileOnly(intellijPluginDep("java")) { includeJars("jps-builders", "jps-builders-6") } + testRuntimeOnly(intellijPluginDep("java")) + } + testCompileOnly(project(":kotlin-reflect-api")) testCompile(project(":compiler:incremental-compilation-impl")) testCompile(projectTests(":compiler:tests-common")) @@ -33,7 +43,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) - testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") } + Ide.IJ { testCompile(intellijDep("devkit")) } diff --git a/nj2k/build.gradle.kts b/nj2k/build.gradle.kts index e2216d189dd..38e818b84d0 100644 --- a/nj2k/build.gradle.kts +++ b/nj2k/build.gradle.kts @@ -17,7 +17,17 @@ dependencies { compile(project(":compiler:util")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } - compileOnly(intellijDep()) { includeJars("platform-api", "java-impl", "platform-impl", rootProject = rootProject) } + compileOnly(intellijDep()) { includeJars("platform-api", "platform-impl", rootProject = rootProject) } + + Platform[191].orLower { + compileOnly(intellijDep()) { includeJars("java-impl") } + } + + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + testRuntime(intellijPluginDep("java")) + } testCompile(project(":idea")) testCompile(projectTests(":j2k")) diff --git a/nj2k/nj2k-services/build.gradle.kts b/nj2k/nj2k-services/build.gradle.kts index ca80b31aa04..d4c10c3ba6a 100644 --- a/nj2k/nj2k-services/build.gradle.kts +++ b/nj2k/nj2k-services/build.gradle.kts @@ -44,6 +44,10 @@ dependencies { compileOnly(project(":kotlin-daemon-client")) compileOnly(intellijDep()) + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + } + compileOnly(commonDep("com.google.code.findbugs", "jsr305")) compileOnly(intellijPluginDep("IntelliLang")) compileOnly(intellijPluginDep("copyright")) diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index f28684b97fc..d76f781f479 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -15,6 +15,10 @@ dependencies { testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } } + Platform[192].orHigher { + testRuntime(intellijCoreDep()) { includeJars("intellij-core") } + } + compile(project(":compiler:util")) compile(project(":compiler:cli")) compile(project(":compiler:backend")) diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts index c17fbc62692..3705aba6396 100644 --- a/plugins/kapt3/kapt3-idea/build.gradle.kts +++ b/plugins/kapt3/kapt3-idea/build.gradle.kts @@ -12,6 +12,11 @@ dependencies { compile(project(":idea:idea-core")) compile(project(":idea:idea-gradle")) compileOnly(intellijDep()) + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) { + includeJars("external-system-rt", "external-system-impl") + } + } compileOnly(intellijPluginDep("gradle")) compileOnly(intellijPluginDep("android")) } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 9456a23498e..b29c8e405c4 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -22,6 +22,10 @@ dependencies { testCompile("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.11.0") testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } + + Platform[192].orHigher { + testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } + } } sourceSets { diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts index f8031bf8335..8ecc10d4894 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts @@ -18,6 +18,10 @@ dependencies { testCompile(commonDep("junit:junit")) testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } + + Platform[192].orHigher { + testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } + } } sourceSets { diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts index b8093e3cc2b..f1d56f821d9 100644 --- a/plugins/source-sections/source-sections-compiler/build.gradle.kts +++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts @@ -27,6 +27,10 @@ dependencies { testRuntime(project(":kotlin-reflect")) testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } + + Platform[192].orHigher { + testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } + } } sourceSets { diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts index 32046295d83..4a04785c28c 100644 --- a/plugins/uast-kotlin-idea/build.gradle.kts +++ b/plugins/uast-kotlin-idea/build.gradle.kts @@ -13,6 +13,9 @@ dependencies { compile(project(":idea:idea-core")) compile(project(":plugins:uast-kotlin")) compileOnly(intellijDep()) + Platform[192].orHigher { + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + } } sourceSets { diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 09ddf1f628c..78011b4e960 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -14,9 +14,18 @@ dependencies { // BEWARE: Uast should not depend on IDEA. compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) } - compileOnly(intellijDep()) { includeJars("java-api", "java-impl") } + + if (Platform.P191.orLower()) { + compileOnly(intellijDep()) { includeJars("java-api", "java-impl") } + testCompileOnly(intellijDep()) { includeJars("java-api", "java-impl") } + } + if (Platform.P192.orHigher()) { compileOnly(intellijDep()) { includeJars("platform-impl") } + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + testCompileOnly(intellijDep()) { includeJars("platform-impl") } + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + testRuntime(intellijPluginDep("java")) } testCompile(project(":kotlin-test:kotlin-test-jvm")) @@ -27,10 +36,6 @@ dependencies { testCompile(projectTests(":idea:idea-test-framework")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompileOnly(intellijDep()) { includeJars("java-api", "java-impl") } - if (Platform.P192.orHigher()) { - testCompileOnly(intellijDep()) { includeJars("platform-impl") } - } testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 8e47870da76..89a2c854c57 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -77,7 +77,7 @@ dependencies { fatJarContents(intellijDep()) { includeJars("lz4-1.3.0") } } - if (Platform.P183.orHigher()) { + if (Platform.P183.orHigher() && Platform.P191.orLower()) { fatJarContents(intellijCoreDep()) { includeJars("java-compatibility-1.0.1") } }