Build: Fix dependencies on :kotlin-compiler project

Dependencies on :kotlin-compiler should never be used in configurations
which are imported transitively because ide fails to import it as
project dependency. When :kotlin-compiler dependency is imported as
kotlin-compiler.jar dependency ide re-indexes it on every change. This
behaviour is super annoying.

 #KT-31120 Fixed
This commit is contained in:
Vyacheslav Gerasimov
2019-06-06 20:19:53 +03:00
parent c39896165e
commit 5bde9720b7
11 changed files with 23 additions and 15 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ dependencies {
compileOnly(project(":compiler:cli-common"))
// This dependency is necessary to keep the right dependency record inside of POM file:
mavenCompileScope(projectRuntimeJar(":kotlin-compiler"))
mavenCompileScope(project(":kotlin-compiler"))
compile(project(":kotlin-native:kotlin-native-utils"))
@@ -9,9 +9,11 @@ dependencies {
compile(kotlinStdlib())
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":compiler:util"))
runtime(project(":kotlin-reflect"))
testRuntimeOnly(projectRuntimeJar(":kotlin-compiler"))
testRuntimeOnly(project(":kotlin-compiler"))
testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(project(":kotlin-scripting-compiler"))
testCompile(commonDep("junit"))
}
@@ -7,7 +7,8 @@ dependencies {
compile(project(":examples:scripting-jvm-simple-script"))
compile(project(":kotlin-scripting-jvm-host"))
compile(project(":kotlin-script-util"))
testRuntimeOnly(projectRuntimeJar(":kotlin-compiler"))
testRuntimeOnly(project(":kotlin-compiler"))
testRuntimeOnly(project(":kotlin-scripting-compiler"))
testRuntimeOnly(project(":kotlin-reflect"))
testCompile(commonDep("junit"))
}
@@ -12,7 +12,11 @@ dependencies {
testCompileOnly(project(":kotlin-scripting-jvm-host"))
testCompileOnly(project(":compiler:cli"))
testCompileOnly(project(":core:util.runtime"))
testRuntime(project(":kotlin-scripting-jsr223"))
testRuntimeOnly(project(":kotlin-scripting-jsr223"))
testRuntimeOnly(project(":kotlin-compiler"))
testRuntimeOnly(project(":kotlin-reflect"))
embeddableTestRuntime(commonDep("junit"))
embeddableTestRuntime(project(":kotlin-scripting-jsr223-embeddable"))
embeddableTestRuntime(testSourceSet.output)
@@ -15,8 +15,6 @@ dependencies {
compileOnly(project(":compiler:cli-common"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep())
runtime(project(":kotlin-compiler"))
runtime(project(":kotlin-reflect"))
}
sourceSets {
@@ -19,6 +19,12 @@ dependencies {
testCompile(project(":kotlin-scripting-jvm-host"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(project(":daemon-common")) // TODO: fix import (workaround for jps build)
testRuntimeOnly(project(":kotlin-compiler"))
testRuntimeOnly(project(":kotlin-scripting-compiler"))
testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
embeddableTestRuntime(project(":kotlin-scripting-jvm-host-embeddable"))
embeddableTestRuntime(project(":kotlin-test:kotlin-test-jvm"))
embeddableTestRuntime(project(":kotlin-test:kotlin-test-junit"))
@@ -14,10 +14,6 @@ dependencies {
compileOnly(project(":compiler:cli"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep())
runtime(project(":kotlin-compiler"))
runtime(project(":kotlin-scripting-compiler"))
runtime(project(":kotlin-reflect"))
runtime(commonDep("org.jetbrains.intellij.deps", "trove4j"))
}
sourceSets {
@@ -23,7 +23,7 @@ dependencies {
testRuntime(project(":kotlin-reflect"))
testCompile(commonDep("junit:junit"))
testCompile(project(":kotlin-scripting-compiler"))
testRuntimeOnly(projectRuntimeJar(":kotlin-compiler"))
testRuntimeOnly(project(":kotlin-compiler"))
testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
testRuntime("org.sonatype.aether:aether-api:1.13.1")
testRuntime("org.apache.maven:maven-core:3.0.3")
+2 -1
View File
@@ -16,7 +16,8 @@ dependencies {
testRuntimeOnly(intellijDep()) {
includeJars("guava", rootProject = rootProject)
}
testRuntimeOnly(projectRuntimeJar(":kotlin-compiler"))
testRuntimeOnly(project(":kotlin-compiler"))
testCompile(project(":compiler:backend"))
testCompile(project(":compiler:cli"))
+1 -1
View File
@@ -18,7 +18,7 @@ dependencies {
testRuntimeOnly(intellijDep()) {
includeJars("guava", rootProject = rootProject)
}
testRuntimeOnly(projectRuntimeJar(":kotlin-compiler"))
testRuntimeOnly(project(":kotlin-compiler"))
testCompile(project(":compiler:backend"))
testCompile(project(":compiler:cli"))
testCompile(projectTests(":compiler:tests-common"))
+1 -1
View File
@@ -80,7 +80,7 @@ dependencies {
testRuntime(project(":kotlin-reflect"))
testRuntime(project(":kotlin-script-runtime"))
testRuntimeOnly(projectRuntimeJar(":kotlin-compiler"))
testRuntimeOnly(project(":kotlin-compiler"))
testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false }
testRuntime(project(":plugins:android-extensions-compiler")) { isTransitive = false }
testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }