azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

201: picocontainer.jar is removed

Browse Source
This commit is contained in:
Nikolay Krasko
2020-01-28 21:55:04 +03:00
parent 354d7306dd
commit 2a71fe97cf
7 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+2 -2
View File
@@ -197,11 +197,11 @@ extra["IntellijCoreDependencies"] =
"jdom", "jdom",
"jna", "jna",
"log4j", "log4j",
"picocontainer", if (Platform[201].orHigher()) null else "picocontainer",
"snappy-in-java", "snappy-in-java",
"streamex", "streamex",
"trove4j" "trove4j"
) ).filterNotNull()
extra["compilerModules"] = arrayOf( extra["compilerModules"] = arrayOf(
compiler/cli/cli-js-klib/build.gradle.kts
+4 -1
View File
@@ -7,7 +7,10 @@ dependencies {
compile(project(":compiler:cli")) compile(project(":compiler:cli"))
compile(project(":compiler:ir.serialization.js")) compile(project(":compiler:ir.serialization.js"))
runtime(project(":kotlin-reflect")) 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") } compile(intellijCoreDep()) { includeJars("intellij-core") }
} }
compiler/fir/tree/tree-generator/build.gradle.kts
+4 -1
View File
@@ -18,8 +18,11 @@ dependencies {
compile(project(":compiler:resolution")) compile(project(":compiler:resolution"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
Platform[193].orLower {
compileOnly(intellijDep()) { includeJars("picocontainer", rootProject = rootProject) }
}
compileOnly(intellijDep()) { compileOnly(intellijDep()) {
includeJars("trove4j", "picocontainer", rootProject = rootProject) includeJars("trove4j", rootProject = rootProject)
} }
Platform[192].orHigher { Platform[192].orHigher {
compiler/tests-common/build.gradle.kts
+1 -2
View File
@@ -45,7 +45,7 @@ dependencies {
testCompile(commonDep("com.android.tools:r8")) testCompile(commonDep("com.android.tools:r8"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[193].orLower { Platform[193].orLower {
testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) } testCompile(intellijDep()) { includeJars("openapi", "picocontainer", rootProject = rootProject) }
} }
testCompile(intellijDep()) { testCompile(intellijDep()) {
includeJars( includeJars(
@@ -58,7 +58,6 @@ dependencies {
"idea_rt", "idea_rt",
"guava", "guava",
"trove4j", "trove4j",
"picocontainer",
"asm-all", "asm-all",
"log4j", "log4j",
"jdom", "jdom",
js/js.tests/build.gradle.kts
+5 -1
View File
@@ -54,7 +54,11 @@ dependencies {
testCompile(project(":compiler:util")) testCompile(project(":compiler:util"))
testRuntime(project(":kotlin-reflect")) 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() val currentOs = OperatingSystem.current()
libraries/scripting/js-test/build.gradle.kts
+2 -2
View File
@@ -19,10 +19,10 @@ dependencies {
testCompile(intellijCoreDep()) { includeJars("intellij-core") } testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[193].orLower { Platform[193].orLower {
testRuntimeOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } testRuntimeOnly(intellijDep()) { includeJars("openapi", "picocontainer", rootProject = rootProject) }
} }
testRuntimeOnly(intellijDep()) { 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")) testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
} }
libraries/stdlib/js-ir/build.gradle.kts
+6 -1
View File
@@ -31,8 +31,13 @@ dependencies {
fullJsIrCli(project(":js:js.dce")) fullJsIrCli(project(":js:js.dce"))
fullJsIrCli(project(":kotlin-reflect")) fullJsIrCli(project(":kotlin-reflect"))
fullJsIrCli(intellijCoreDep()) { includeJars("intellij-core") } fullJsIrCli(intellijCoreDep()) { includeJars("intellij-core") }
if (Platform[193].orLower()) {
fullJsIrCli(intellijDep()) {
includeJars("picocontainer", rootProject = rootProject)
}
}
fullJsIrCli(intellijDep()) { fullJsIrCli(intellijDep()) {
includeJars("picocontainer", "trove4j", "guava", "jdom", "asm-all", rootProject = rootProject) includeJars("trove4j", "guava", "jdom", "asm-all", rootProject = rootProject)
} }
} }