From b7c12014ee4f01b418e8c9db24181455df534f4c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 24 Jun 2019 17:36:56 +0300 Subject: [PATCH] Modify dependencies for 192 branch: more dependencies to full java plugin --- idea/build.gradle.kts | 5 ++--- idea/fir-view/build.gradle.kts | 2 +- idea/formatter/build.gradle.kts | 2 +- idea/idea-core/build.gradle.kts | 7 +------ idea/idea-gradle-native/build.gradle.kts | 2 +- idea/idea-gradle/build.gradle.kts | 10 ++-------- idea/idea-j2k/build.gradle.kts | 2 +- idea/idea-jvm/build.gradle.kts | 6 ++---- idea/idea-maven/build.gradle.kts | 4 ++-- idea/idea-native/build.gradle.kts | 2 +- idea/idea-test-framework/build.gradle.kts | 2 +- .../jvm-debugger-core/build.gradle.kts | 2 +- .../jvm-debugger-evaluation/build.gradle.kts | 2 +- .../jvm-debugger-sequence/build.gradle.kts | 2 +- .../jvm-debugger-util/build.gradle.kts | 2 +- j2k/build.gradle.kts | 2 +- jps-plugin/build.gradle.kts | 18 ++++++------------ plugins/kapt3/kapt3-compiler/build.gradle.kts | 2 +- plugins/kapt3/kapt3-idea/build.gradle.kts | 4 +--- plugins/uast-kotlin-idea/build.gradle.kts | 2 +- 20 files changed, 29 insertions(+), 51 deletions(-) diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index c7b40c95ff7..32e71ebe80f 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -100,9 +100,8 @@ dependencies { 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") } + compileOnly(intellijPluginDep("java")) + testCompileOnly(intellijPluginDep("java")) testRuntime(intellijPluginDep("java")) } diff --git a/idea/fir-view/build.gradle.kts b/idea/fir-view/build.gradle.kts index 7684fe67e70..93539b16d2e 100644 --- a/idea/fir-view/build.gradle.kts +++ b/idea/fir-view/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { compileOnly(intellijDep()) Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + compileOnly(intellijPluginDep("java")) } compileOnly(intellijPluginDep("gradle")) diff --git a/idea/formatter/build.gradle.kts b/idea/formatter/build.gradle.kts index 2cc6de51388..77679d76b69 100644 --- a/idea/formatter/build.gradle.kts +++ b/idea/formatter/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { compile(project(":compiler:frontend")) compileOnly(intellijDep()) Platform[192].orHigher { - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijPluginDep("java")) } } diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index ffa52adcc74..9cfab3ff0dd 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -24,12 +24,7 @@ dependencies { compileOnly(intellijDep()) Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { - includeJars( - "java-api", "java-impl", - "external-system-rt", "external-system-impl" - ) - } + compileOnly(intellijPluginDep("java")) } compileOnly(intellijPluginDep("gradle")) diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts index f2a4b9bbec8..7ac70eb22e6 100644 --- a/idea/idea-gradle-native/build.gradle.kts +++ b/idea/idea-gradle-native/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { testCompileOnly(intellijDep()) Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("external-system-rt", "external-system-impl") } + compileOnly(intellijPluginDep("java")) } testRuntime(project(":kotlin-reflect")) diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 1c8b0db0506..06b540a1e0c 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -23,14 +23,8 @@ dependencies { 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") - } - + compileOnly(intellijPluginDep("java")) + testCompileOnly(intellijPluginDep("java")) testRuntimeOnly(intellijPluginDep("java")) } diff --git a/idea/idea-j2k/build.gradle.kts b/idea/idea-j2k/build.gradle.kts index d26f58a8935..44389d0adcb 100644 --- a/idea/idea-j2k/build.gradle.kts +++ b/idea/idea-j2k/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compileOnly(intellijDep()) Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + compileOnly(intellijPluginDep("java")) } } diff --git a/idea/idea-jvm/build.gradle.kts b/idea/idea-jvm/build.gradle.kts index 5b3fe6f63d9..1a320c509cf 100644 --- a/idea/idea-jvm/build.gradle.kts +++ b/idea/idea-jvm/build.gradle.kts @@ -8,14 +8,12 @@ dependencies { compile(project(":idea")) compile(project(":compiler:light-classes")) compile(project(":compiler:frontend.java")) - compile(project(":compiler:backend.jvm")) // TODO: fix import (workaround for jps build) + compile(project(":compiler:backend.jvm")) 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("java")) } compileOnly(intellijPluginDep("junit")) diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index 3aecc5de41b..3a2bfee45b0 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -20,8 +20,8 @@ dependencies { 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") } + compileOnly(intellijPluginDep("java")) + testCompileOnly(intellijPluginDep("java")) testRuntime(intellijPluginDep("java")) } diff --git a/idea/idea-native/build.gradle.kts b/idea/idea-native/build.gradle.kts index e9cd43d0cee..c428880e9b9 100644 --- a/idea/idea-native/build.gradle.kts +++ b/idea/idea-native/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compile(project(":compiler:frontend")) compileOnly(intellijDep()) Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + compileOnly(intellijPluginDep("java")) } compile(project(":kotlin-native:kotlin-native-library-reader")) diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts index 1040b07b89e..4525af69b9f 100644 --- a/idea/idea-test-framework/build.gradle.kts +++ b/idea/idea-test-framework/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompileOnly(intellijDep()) Platform[192].orHigher { - testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") } + testCompileOnly(intellijPluginDep("java")) } } diff --git a/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts index f5367d21a28..f875ef63234 100644 --- a/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { compileOnly(intellijDep()) Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + compileOnly(intellijPluginDep("java")) } compileOnly(intellijPluginDep("stream-debugger")) diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts index 1e66e650b04..1974039a934 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { 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(intellijPluginDep("java")) } 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 a7df250de4a..34450527e9e 100644 --- a/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compileOnly(intellijDep()) Platform[192].orHigher { - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijPluginDep("java")) } compileOnly(intellijPluginDep("stream-debugger")) diff --git a/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts index c586069f85c..cd05857c8a3 100644 --- a/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { compile(files("${System.getProperty("java.home")}/../lib/tools.jar")) Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + compileOnly(intellijPluginDep("java")) } compileOnly(intellijDep()) diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index a1d04603bd4..5ed168f83a3 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { testCompileOnly(intellijDep()) Platform[192].orHigher { - testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + testCompileOnly(intellijPluginDep("java")) testRuntimeOnly(intellijPluginDep("java")) } diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index 9587501a2c3..b1265cd780b 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -25,17 +25,7 @@ dependencies { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject) } } - - 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")) - } - + compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(project(":kotlin-reflect-api")) testCompile(project(":compiler:incremental-compilation-impl")) testCompile(projectTests(":compiler:tests-common")) @@ -43,7 +33,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")) } @@ -55,6 +45,10 @@ dependencies { testRuntime(project(it)) } + Platform[192].orHigher { + testRuntimeOnly(intellijPluginDep("java")) + } + testRuntime(project(":kotlin-reflect")) testRuntime(project(":kotlin-script-runtime")) } diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index d76f781f479..5cfee2b47e2 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { } Platform[192].orHigher { - testRuntime(intellijCoreDep()) { includeJars("intellij-core") } + testRuntime(intellijPluginDep("java")) } compile(project(":compiler:util")) diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts index 3705aba6396..bc8a1140d02 100644 --- a/plugins/kapt3/kapt3-idea/build.gradle.kts +++ b/plugins/kapt3/kapt3-idea/build.gradle.kts @@ -13,9 +13,7 @@ dependencies { compile(project(":idea:idea-gradle")) compileOnly(intellijDep()) Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { - includeJars("external-system-rt", "external-system-impl") - } + compileOnly(intellijPluginDep("java")) } compileOnly(intellijPluginDep("gradle")) compileOnly(intellijPluginDep("android")) diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts index 4a04785c28c..3cc70972b73 100644 --- a/plugins/uast-kotlin-idea/build.gradle.kts +++ b/plugins/uast-kotlin-idea/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { compile(project(":plugins:uast-kotlin")) compileOnly(intellijDep()) Platform[192].orHigher { - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijPluginDep("java")) } }