From 162c2f3dc925517d2fcb281194a14c1e347bcc05 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 28 Jan 2020 21:55:03 +0300 Subject: [PATCH] 201: openapi.jar is removed --- build-common/build.gradle.kts | 5 +++-- compiler/android-tests/build.gradle.kts | 11 +++++++++-- compiler/build.gradle.kts | 5 ++++- compiler/fir/modularized-tests/build.gradle.kts | 6 +++++- compiler/fir/resolve/build.gradle.kts | 5 ++++- compiler/tests-common/build.gradle.kts | 4 +++- jps-plugin/build.gradle.kts | 5 ++++- js/js.tests/build.gradle.kts | 5 ++++- libraries/scripting/js-test/build.gradle.kts | 5 ++++- libraries/scripting/jvm-host-test/build.gradle.kts | 5 ++++- libraries/tools/kotlin-script-util/build.gradle.kts | 10 ++++++++-- plugins/kapt3/kapt3-compiler/build.gradle.kts | 5 ++++- .../sam-with-receiver-ide/build.gradle.kts | 5 ++++- .../source-sections-compiler/build.gradle.kts | 5 ++++- 14 files changed, 64 insertions(+), 17 deletions(-) diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index 92529e68a36..ee3da8aab4a 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -23,8 +23,9 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(protobufFull()) testCompile(kotlinStdlib()) - testCompileOnly(intellijDep()) { includeJars("openapi") } - + Platform[193].orLower { + testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + } testRuntime(project(":kotlin-reflect")) } diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index 622654609f2..47778282c8d 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -13,7 +13,10 @@ dependencies { compile(project(":kotlin-reflect")) compile(projectTests(":compiler:tests-common")) compile(commonDep("junit:junit")) - compileOnly(intellijDep()) { includeJars("openapi") } + + Platform[193].orLower { + compileOnly(intellijDep()) { includeJars("openapi") } + } testCompile(project(":compiler:incremental-compilation-impl")) testCompile(project(":core:descriptors")) @@ -21,7 +24,11 @@ dependencies { testCompile(project(":compiler:frontend.java")) testCompile(projectTests(":jps-plugin")) testCompile(commonDep("junit:junit")) - testCompile(intellijDep()) { includeJars("openapi", "util", "idea", "idea_rt", "groovy-all", rootProject = rootProject) } + Platform[193].orLower { + testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + } + + testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", "groovy-all", rootProject = rootProject) } Platform[191].orLower { testCompile(intellijDep()) { includeJars("jps-builders") } } diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 03e0e837691..3ca128f2cf8 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -67,7 +67,10 @@ dependencies { testCompileOnly(project(it)) } testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) } + Platform[193].orLower { + testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + } + testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util", "asm-all", rootProject = rootProject) } Platform[192].orHigher { testRuntimeOnly(intellijPluginDep("java")) diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts index a66b953c99a..05abc3c1430 100644 --- a/compiler/fir/modularized-tests/build.gradle.kts +++ b/compiler/fir/modularized-tests/build.gradle.kts @@ -9,8 +9,12 @@ plugins { } dependencies { + Platform[193].orLower { + testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + } + testCompileOnly(intellijDep()) { - includeJars("openapi", "extensions", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) + includeJars("extensions", "idea_rt", "util", "asm-all", rootProject = rootProject) } Platform[191].orLower { diff --git a/compiler/fir/resolve/build.gradle.kts b/compiler/fir/resolve/build.gradle.kts index 74b8cad5b6b..73ea4fac0db 100644 --- a/compiler/fir/resolve/build.gradle.kts +++ b/compiler/fir/resolve/build.gradle.kts @@ -19,7 +19,10 @@ dependencies { compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } - testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) } + Platform[193].orLower { + testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + } + testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) } testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 0173bebce3d..1a2359aed69 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -44,9 +44,11 @@ dependencies { testCompile(androidDxJar()) { isTransitive = false } testCompile(commonDep("com.android.tools:r8")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + Platform[193].orLower { + testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + } testCompile(intellijDep()) { includeJars( - "openapi", "jps-model", "extensions", "util", diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index b3761e13a91..cc33028f21c 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -18,8 +18,11 @@ dependencies { compile(project(":js:js.frontend")) compile(projectRuntimeJar(":kotlin-preloader")) compile(project(":idea:idea-jps-common")) + Platform[193].orLower { + compileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + } compileOnly(intellijDep()) { - includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject) + includeJars("jdom", "trove4j", "jps-model", "platform-api", "util", "asm-all", rootProject = rootProject) } compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(project(":kotlin-reflect-api")) diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 93e2c71a663..b1b2e8c5350 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -33,7 +33,10 @@ dependencies { testCompileOnly(project(":compiler:cli-js-klib")) testCompileOnly(project(":compiler:util")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") } + Platform[193].orLower { + testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + } + testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util") } testCompile(project(":compiler:backend.js")) testCompile(project(":compiler:backend.wasm")) testCompile(project(":kotlin-stdlib-js-ir")) diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts index 8480b251ff6..9f3661b3959 100644 --- a/libraries/scripting/js-test/build.gradle.kts +++ b/libraries/scripting/js-test/build.gradle.kts @@ -18,8 +18,11 @@ dependencies { testCompile(project(":js:js.engines")) testCompile(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } + Platform[193].orLower { + testRuntimeOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + } testRuntimeOnly(intellijDep()) { - includeJars("openapi", "idea", "idea_rt", "log4j", "picocontainer", "guava", "jdom", rootProject = rootProject) + includeJars("idea", "idea_rt", "log4j", "picocontainer", "guava", "jdom", rootProject = rootProject) } testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j")) } diff --git a/libraries/scripting/jvm-host-test/build.gradle.kts b/libraries/scripting/jvm-host-test/build.gradle.kts index dedca45bac3..44c8d1d7b4d 100644 --- a/libraries/scripting/jvm-host-test/build.gradle.kts +++ b/libraries/scripting/jvm-host-test/build.gradle.kts @@ -15,7 +15,10 @@ val embeddableTestRuntime by configurations.creating { dependencies { allTestsRuntime(commonDep("junit")) allTestsRuntime(intellijCoreDep()) { includeJars("intellij-core") } - allTestsRuntime(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "log4j", "jna") } + Platform[193].orLower { + allTestsRuntime(intellijDep()) { includeJars("openapi") } + } + allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") } testCompile(project(":kotlin-scripting-jvm-host")) testCompile(projectTests(":compiler:tests-common")) testCompile(project(":kotlin-scripting-compiler")) diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index 94e30a75cc6..a0b9c52858a 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -27,8 +27,14 @@ dependencies { testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3") testRuntime("org.sonatype.aether:aether-api:1.13.1") testRuntime("org.apache.maven:maven-core:3.0.3") - compileOnly(intellijDep()) { includeJars("openapi", "util") } - testCompile(intellijDep()) { includeJars("openapi", "platform-api", "util") } + Platform[193].orLower { + compileOnly(intellijDep()) { includeJars("openapi") } + } + compileOnly(intellijDep()) { includeJars("util") } + Platform[193].orLower { + testCompile(intellijDep()) { includeJars("openapi") } + } + testCompile(intellijDep()) { includeJars("platform-api", "util") } testCompile(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index cb13628971e..5d9141b5a6a 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -9,7 +9,10 @@ plugins { dependencies { testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntime(intellijDep()) - testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "openapi") } + testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt") } + Platform[193].orLower { + testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + } testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts index 3b508628f44..bbfdb40ecf2 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts @@ -18,7 +18,10 @@ dependencies { compileOnly(project(":idea")) compileOnly(project(":idea:idea-jvm")) - compileOnly(intellijDep()) { includeJars("platform-api", "openapi", "extensions", "util") } + Platform[193].orLower { + compileOnly(intellijDep()) { includeJars("openapi") } + } + compileOnly(intellijDep()) { includeJars("platform-api", "extensions", "util") } compileOnly(intellijDep("gradle")) } diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts index 36aee379af9..2ac2c026d58 100644 --- a/plugins/source-sections/source-sections-compiler/build.gradle.kts +++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts @@ -23,7 +23,10 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(intellijDep()) { includeJars("idea", "idea_rt", "openapi", "log4j", "jdom", "jps-model") } + Platform[193].orLower { + testCompileOnly(intellijDep()) { includeJars("openapi") } + } + testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jdom", "jps-model") } testRuntime(project(":kotlin-reflect")) testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }