201: picocontainer.jar is removed

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(

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") }
 }
 

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 {

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",

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()

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"))
 }

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)
     }
 }