Replace dependencies on kotlin-reflect with kotlin-reflect-api

See the previous commit for information on the kotlin-reflect vs
kotlin-reflect-api distinction.

Add kotlin-reflect as an explicit runtime dependency of most of the test
configurations because even though they all depend on tests-common, the
runtime dependency on kotlin-reflect is not exported from tests-common
to other modules because the projectTests dependency is not transitive.
This commit is contained in:
Alexander Udalov
2017-11-10 14:11:12 +01:00
parent 329fbd8fa8
commit aca74cef0e
22 changed files with 33 additions and 9 deletions
+3
View File
@@ -1,10 +1,12 @@
import org.gradle.jvm.tasks.Jar
apply { plugin("kotlin") }
dependencies {
compile(project(":kotlin-stdlib"))
compileOnly(project(":kotlin-reflect-api"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:backend"))
@@ -67,6 +69,7 @@ dependencies {
testRuntime(ideaPluginDeps("*.jar", plugin = "testng"))
testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-preloader"))
// deps below are test runtime deps, but made test compile to split compilation and running to reduce mem req
+2 -1
View File
@@ -2,7 +2,7 @@
apply { plugin("kotlin") }
dependencies {
compile(projectDist(":kotlin-reflect"))
compileOnly(project(":kotlin-reflect-api"))
compile(project(":compiler:util"))
compile(project(":compiler:light-classes"))
compile(project(":compiler:frontend"))
@@ -28,6 +28,7 @@ dependencies {
testCompile(ideaSdkDeps("gson"))
testCompile(commonDep("junit:junit"))
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(project(":plugins:android-extensions-ide"))
testRuntime(project(":plugins:kapt3-idea"))
+1
View File
@@ -2,6 +2,7 @@ apply { plugin("kotlin") }
dependencies {
compile(projectDist(":kotlin-stdlib"))
compileOnly(project(":kotlin-reflect-api"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:frontend"))
+1
View File
@@ -22,6 +22,7 @@ dependencies {
testCompile(ideaPluginDeps("Groovy", plugin = "Groovy"))
testCompileOnly(ideaSdkDeps("groovy-all", "idea_rt"))
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(project(":idea:idea-jvm"))
testRuntime(project(":idea:idea-android"))
testRuntime(project(":plugins:kapt3-idea"))
+1
View File
@@ -3,6 +3,7 @@ apply { plugin("kotlin") }
dependencies {
compile(projectDist(":kotlin-stdlib"))
compileOnly(project(":kotlin-reflect-api"))
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
compile(project(":compiler:frontend.java"))
+1
View File
@@ -23,6 +23,7 @@ dependencies {
testCompileOnly(ideaSdkDeps("openapi", "idea", "gson", "idea_rt"))
testCompileOnly(ideaPluginDeps("maven", "maven-server-api", plugin = "maven"))
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(project(":idea:idea-jvm"))
testRuntime(project(":idea:idea-android"))
testRuntime(project(":plugins:android-extensions-ide"))
@@ -9,6 +9,7 @@ dependencies {
compile(project(":idea:idea-core"))
compile(project(":idea:idea-jps-common"))
compile(project(":kotlin-test:kotlin-test-jvm"))
compileOnly(project(":kotlin-reflect-api"))
compile(commonDep("junit:junit"))
compile(ideaSdkDeps("openapi", "idea"))
}