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:
@@ -12,8 +12,8 @@ val otherCompilerModules = compilerModules.filter { it != path }
|
||||
val depDistProjects = listOf(
|
||||
":kotlin-script-runtime",
|
||||
":kotlin-stdlib",
|
||||
":kotlin-reflect",
|
||||
":kotlin-test:kotlin-test-jvm")
|
||||
":kotlin-test:kotlin-test-jvm"
|
||||
)
|
||||
|
||||
// TODO: it seems incomplete, find and add missing dependencies
|
||||
val testDistProjects = listOf(
|
||||
@@ -33,7 +33,8 @@ val testDistProjects = listOf(
|
||||
":plugins:android-extensions-compiler",
|
||||
":kotlin-ant",
|
||||
":kotlin-annotations-jvm",
|
||||
":kotlin-annotations-android")
|
||||
":kotlin-annotations-android"
|
||||
)
|
||||
|
||||
val testJvm6ServerRuntime by configurations.creating
|
||||
|
||||
@@ -49,11 +50,13 @@ dependencies {
|
||||
testCompile(project(":compiler:ir.ir2cfg"))
|
||||
testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
|
||||
testCompileOnly(project(":kotlin-daemon-client"))
|
||||
testCompileOnly(project(":kotlin-reflect-api"))
|
||||
otherCompilerModules.forEach {
|
||||
testCompileOnly(project(it))
|
||||
}
|
||||
testCompile(ideaSdkDeps("openapi", "idea", "util", "asm-all", "commons-httpclient-3.1-patched"))
|
||||
|
||||
testRuntime(projectDist(":kotlin-reflect"))
|
||||
testRuntime(projectDist(":kotlin-compiler"))
|
||||
testRuntime(projectDist(":kotlin-daemon-client"))
|
||||
testRuntime(preloadedDeps("dx", subdir = "android-5.0/lib"))
|
||||
|
||||
@@ -8,6 +8,7 @@ dependencies {
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:frontend.java"))
|
||||
compile(project(":compiler:frontend.script"))
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
|
||||
}
|
||||
|
||||
@@ -15,4 +16,3 @@ sourceSets {
|
||||
"main" { projectDefault() }
|
||||
"test" {}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ dependencies {
|
||||
compileOnly(project(":compiler:util"))
|
||||
compileOnly(project(":compiler:cli-common"))
|
||||
compileOnly(project(":compiler:daemon-common"))
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
compileOnly(nativePlatformUberjar)
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(projectDist(":kotlin-stdlib"))
|
||||
compile(projectDist(":kotlin-reflect"))
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
compile(preloadedDeps("kotlinx-coroutines-core"))
|
||||
}
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@ dependencies {
|
||||
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(ideaSdkCoreDeps("intellij-core"))
|
||||
testCompile(ideaSdkDeps("openapi", "idea", "idea_rt"))
|
||||
|
||||
@@ -5,6 +5,7 @@ apply { plugin("kotlin") }
|
||||
dependencies {
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(projectTests(":generators:test-generator"))
|
||||
testRuntime(projectDist(":kotlin-reflect"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
Reference in New Issue
Block a user