diff --git a/build.gradle.kts b/build.gradle.kts index dde9c80477f..02ccfe6a4ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -197,11 +197,11 @@ extra["IntellijCoreDependencies"] = "jdom", "jna", "log4j", - "picocontainer", + if (Platform[201].orHigher()) null else "picocontainer", "snappy-in-java", "streamex", "trove4j" - ) + ).filterNotNull() extra["compilerModules"] = arrayOf( diff --git a/compiler/cli/cli-js-klib/build.gradle.kts b/compiler/cli/cli-js-klib/build.gradle.kts index 79b818bd6ad..4e0ee17d0a6 100644 --- a/compiler/cli/cli-js-klib/build.gradle.kts +++ b/compiler/cli/cli-js-klib/build.gradle.kts @@ -7,7 +7,10 @@ dependencies { compile(project(":compiler:cli")) compile(project(":compiler:ir.serialization.js")) runtime(project(":kotlin-reflect")) - compile(intellijDep()) { includeJars("picocontainer", "trove4j", "guava", "jdom", rootProject = rootProject) } + if (Platform[193].orLower()) { + compile(intellijDep()) { includeJars("picocontainer", rootProject = rootProject) } + } + compile(intellijDep()) { includeJars("trove4j", "guava", "jdom", rootProject = rootProject) } compile(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/fir/tree/tree-generator/build.gradle.kts b/compiler/fir/tree/tree-generator/build.gradle.kts index 96c94eb0eed..d6e7951e303 100644 --- a/compiler/fir/tree/tree-generator/build.gradle.kts +++ b/compiler/fir/tree/tree-generator/build.gradle.kts @@ -18,8 +18,11 @@ dependencies { compile(project(":compiler:resolution")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } + Platform[193].orLower { + compileOnly(intellijDep()) { includeJars("picocontainer", rootProject = rootProject) } + } compileOnly(intellijDep()) { - includeJars("trove4j", "picocontainer", rootProject = rootProject) + includeJars("trove4j", rootProject = rootProject) } Platform[192].orHigher { diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 1a2359aed69..941a35ba0b8 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { testCompile(commonDep("com.android.tools:r8")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } Platform[193].orLower { - testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + testCompile(intellijDep()) { includeJars("openapi", "picocontainer", rootProject = rootProject) } } testCompile(intellijDep()) { includeJars( @@ -58,7 +58,6 @@ dependencies { "idea_rt", "guava", "trove4j", - "picocontainer", "asm-all", "log4j", "jdom", diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index b1b2e8c5350..ca2f7326e5e 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -54,7 +54,11 @@ dependencies { testCompile(project(":compiler:util")) testRuntime(project(":kotlin-reflect")) - testRuntime(intellijDep()) { includeJars("picocontainer", "trove4j", "guava", "jdom", rootProject = rootProject) } + + if (Platform[193].orLower()) { + testRuntime(intellijDep()) { includeJars("picocontainer", rootProject = rootProject) } + } + testRuntime(intellijDep()) { includeJars("trove4j", "guava", "jdom", rootProject = rootProject) } val currentOs = OperatingSystem.current() diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts index 9f3661b3959..49583a45fbd 100644 --- a/libraries/scripting/js-test/build.gradle.kts +++ b/libraries/scripting/js-test/build.gradle.kts @@ -19,10 +19,10 @@ dependencies { testCompile(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } Platform[193].orLower { - testRuntimeOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } + testRuntimeOnly(intellijDep()) { includeJars("openapi", "picocontainer", rootProject = rootProject) } } testRuntimeOnly(intellijDep()) { - includeJars("idea", "idea_rt", "log4j", "picocontainer", "guava", "jdom", rootProject = rootProject) + includeJars("idea", "idea_rt", "log4j", "guava", "jdom", rootProject = rootProject) } testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j")) } diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index d835cbb7c3e..dc8c6a4d383 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -31,8 +31,13 @@ dependencies { fullJsIrCli(project(":js:js.dce")) fullJsIrCli(project(":kotlin-reflect")) fullJsIrCli(intellijCoreDep()) { includeJars("intellij-core") } + if (Platform[193].orLower()) { + fullJsIrCli(intellijDep()) { + includeJars("picocontainer", rootProject = rootProject) + } + } fullJsIrCli(intellijDep()) { - includeJars("picocontainer", "trove4j", "guava", "jdom", "asm-all", rootProject = rootProject) + includeJars("trove4j", "guava", "jdom", "asm-all", rootProject = rootProject) } }