Make all intellij-core dependencies non-transitive
This commit is contained in:
@@ -15,7 +15,7 @@ dependencies {
|
||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testRuntime(intellijDep()) { includeJars("trove4j") }
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ dependencies {
|
||||
testCompile(project(":kotlin-stdlib"))
|
||||
testCompile(projectTests(":kotlin-build-common"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompile(intellijDep()) { includeJars("annotations", "log4j", "jdom") }
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ dependencies {
|
||||
testCompileOnly(project(":kotlin-reflect-api"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testCompile(androidDxJar()) { isTransitive = false }
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core"); isTransitive = false }
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompile(intellijDep()) {
|
||||
includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer-1.2", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
|
||||
isTransitive = false
|
||||
|
||||
@@ -29,7 +29,7 @@ dependencies {
|
||||
testCompileOnly(project(":kotlin-reflect-api"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testCompile(androidDxJar()) { isTransitive = false }
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core"); isTransitive = false }
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompile(intellijDep()) {
|
||||
includeJars("openapi", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "annotations", rootProject = rootProject)
|
||||
isTransitive = false
|
||||
|
||||
@@ -29,7 +29,7 @@ dependencies {
|
||||
testCompileOnly(project(":kotlin-reflect-api"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testCompile(androidDxJar()) { isTransitive = false }
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core"); 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
|
||||
|
||||
@@ -7,7 +7,7 @@ plugins {
|
||||
|
||||
dependencies {
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompile(projectTests(":generators:test-generator"))
|
||||
testRuntime(project(":kotlin-reflect"))
|
||||
testRuntime(intellijDep())
|
||||
|
||||
@@ -23,7 +23,7 @@ dependencies {
|
||||
testCompileOnly(project(":compiler:frontend"))
|
||||
testCompileOnly(project(":compiler:cli"))
|
||||
testCompileOnly(project(":compiler:util"))
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") }
|
||||
testCompile(project(":compiler:backend.js"))
|
||||
testCompile(project(":js:js.translator"))
|
||||
|
||||
@@ -9,7 +9,7 @@ plugins {
|
||||
val robolectricClasspath by configurations.creating
|
||||
|
||||
dependencies {
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:plugin-api"))
|
||||
|
||||
@@ -24,7 +24,7 @@ dependencies {
|
||||
testCompile(projectRuntimeJar(":kotlin-daemon-client"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompile(intellijDep()) { includeJars("idea", "idea_rt", "openapi", "log4j", "jdom", "jps-model") }
|
||||
testRuntime(project(":kotlin-reflect"))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user