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

Fix picocontainer version

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-11-06 20:57:35 +03:00
parent 0fcd1a2072
commit aa8031691e
3 changed files with 2 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/visitors-generator/build.gradle.kts
+1 -1
View File
@@ -17,7 +17,7 @@ dependencies {
compile(intellijCoreDep()) { includeJars("intellij-core") } compile(intellijCoreDep()) { includeJars("intellij-core") }
compile(intellijDep()) { compile(intellijDep()) {
includeJars("trove4j", "picocontainer-1.2", "annotations", rootProject = rootProject) includeJars("trove4j", "picocontainer", "annotations", rootProject = rootProject)
isTransitive = false isTransitive = false
} }
compile(intellijDep()) { includeJars("guava", rootProject = rootProject) } compile(intellijDep()) { includeJars("guava", rootProject = rootProject) }
compiler/tests-common/build.gradle.kts
+1 -1
View File
@@ -35,7 +35,7 @@ dependencies {
testCompile(androidDxJar()) { isTransitive = false } testCompile(androidDxJar()) { isTransitive = false }
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijDep()) { testCompile(intellijDep()) {
includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer-1.2", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject) includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
isTransitive = false isTransitive = false
} }
} }
compiler/tests-common/build.gradle.kts.181
-48
View File
@@ -1,48 +0,0 @@
plugins {
kotlin("jvm")
id("jps-compatible")
}
dependencies {
testCompile(project(":core:descriptors"))
testCompile(project(":core:descriptors.jvm"))
testCompile(project(":core:deserialization"))
testCompile(project(":compiler:util"))
testCompile(project(":compiler:backend"))
testCompile(project(":compiler:fir:tree"))
testCompile(project(":compiler:fir:psi2fir"))
testCompile(project(":compiler:fir:cones"))
testCompile(project(":compiler:fir:resolve"))
testCompile(project(":compiler:ir.ir2cfg"))
testCompile(project(":compiler:frontend"))
testCompile(project(":compiler:frontend.java"))
testCompile(project(":compiler:util"))
testCompile(project(":compiler:cli-common"))
testCompile(project(":compiler:cli"))
testCompile(project(":compiler:light-classes"))
testCompile(project(":compiler:serialization"))
testCompile(project(":kotlin-preloader"))
testCompile(project(":compiler:daemon-common"))
testCompile(project(":js:js.serializer"))
testCompile(project(":js:js.frontend"))
testCompile(project(":js:js.translator"))
testCompileOnly(project(":plugins:android-extensions-compiler"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":compiler:tests-common-jvm6"))
testCompileOnly(project(":kotlin-reflect-api"))
testCompile(commonDep("junit:junit"))
testCompile(androidDxJar()) { isTransitive = false }
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijDep()) {
includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
isTransitive = false
}
}
sourceSets {
"main" { }
"test" { projectDefault() }
}
testsJar {}