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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
build-common/build.gradle.kts
+2 -1
View File
@@ -10,15 +10,16 @@ dependencies {
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":js:js.serializer"))
compileOnly(project(":js:js.frontend"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(ideaSdkDeps("util"))
testCompileOnly(project(":compiler:cli-common"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testCompile(protobufFull())
testCompile(projectDist(":kotlin-stdlib"))
testCompile(projectDist(":kotlin-reflect"))
testCompileOnly(ideaSdkDeps("openapi"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(projectDist(":kotlin-reflect"))
}
sourceSets {
compiler/build.gradle.kts
+6 -3
View File
@@ -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"))
compiler/cli/cli-common/build.gradle.kts
+1 -1
View File
@@ -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" {}
}
compiler/daemon/daemon-client/build.gradle.kts
+1
View File
@@ -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)
}
compiler/frontend.script/build.gradle.kts
+1 -1
View File
@@ -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"))
}
compiler/tests-common/build.gradle.kts
+1
View File
@@ -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"))
compiler/tests-java8/build.gradle.kts
+1
View File
@@ -5,6 +5,7 @@ apply { plugin("kotlin") }
dependencies {
testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":generators:test-generator"))
testRuntime(projectDist(":kotlin-reflect"))
}
sourceSets {
eval4j/build.gradle.kts
-1
View File
@@ -3,7 +3,6 @@ apply { plugin("kotlin") }
dependencies {
compile(projectDist(":kotlin-stdlib"))
compile(projectDist(":kotlin-reflect"))
compile(project(":compiler:backend"))
compile(ideaSdkDeps("asm-all"))
// compile(files(PathUtil.getJdkClassesRootsFromCurrentJre())) // TODO: make this one work instead of the nex one, since it contains more universal logic
generators/build.gradle.kts
+2
View File
@@ -32,10 +32,12 @@ dependencies {
compile(projectTests(":js:js.tests"))
compile(projectTests(":generators:test-generator"))
compile(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
compileOnly(project(":kotlin-reflect-api"))
testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
testCompile(project(":compiler:incremental-compilation-impl"))
testCompile(commonDep("junit:junit"))
testCompile(ideaSdkDeps("openapi", "idea"))
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang"))
idea/build.gradle.kts
+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
idea/idea-android/build.gradle.kts
+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"))
idea/idea-core/build.gradle.kts
+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"))
idea/idea-gradle/build.gradle.kts
+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"))
idea/idea-jps-common/build.gradle.kts
+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"))
idea/idea-maven/build.gradle.kts
+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"))
idea/idea-test-framework/build.gradle.kts
+1
View File
@@ -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"))
}
jps-plugin/build.gradle.kts
+2
View File
@@ -13,6 +13,7 @@ dependencies {
compile(projectRuntimeJar(":kotlin-preloader"))
compile(project(":idea:idea-jps-common"))
compile(ideaSdkDeps("jps-builders", "jps-builders-6", subdir = "jps"))
testCompileOnly(project(":kotlin-reflect-api"))
testCompile(project(":compiler:incremental-compilation-impl"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler:incremental-compilation-impl"))
@@ -24,6 +25,7 @@ dependencies {
compilerModules.forEach {
testRuntime(project(it))
}
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(ideaSdkCoreDeps("*.jar"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaSdkDeps("*.jar", subdir = "jps/test"))
plugins/android-extensions/android-extensions-idea/build.gradle.kts
+1
View File
@@ -21,6 +21,7 @@ dependencies {
testCompile(projectTests(":idea:idea-android"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(commonDep("junit:junit"))
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(project(":idea:idea-jvm"))
testRuntime(project(":plugins:android-extensions-jps"))
testRuntime(project(":sam-with-receiver-ide-plugin"))
plugins/plugins-tests/build.gradle.kts
+1
View File
@@ -25,6 +25,7 @@ dependencies {
testCompileOnly(ideaSdkDeps("jps-builders"))
testCompile(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
testCompile(ideaPluginDeps("*.jar", plugin = "android", subdir = "lib/jps"))
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(project(":jps-plugin"))
testRuntime(projectTests(":compiler:tests-common-jvm6"))
testRuntime(ideaSdkDeps("*.jar"))
plugins/source-sections/source-sections-compiler/build.gradle.kts
+1
View File
@@ -19,6 +19,7 @@ dependencies {
testCompile(projectTests(":compiler:tests-common"))
testCompile(ideaSdkDeps("idea", "idea_rt", "openapi"))
testCompile(commonDep("junit:junit"))
testRuntime(projectDist(":kotlin-reflect"))
}
sourceSets {
plugins/uast-kotlin/build.gradle.kts
+1
View File
@@ -16,6 +16,7 @@ dependencies {
testCompile(project(":compiler:cli"))
testCompile(project(":idea:idea-test-framework"))
testCompileOnly(ideaSdkDeps("idea_rt"))
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("*.jar", plugin = "junit"))
testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))
ultimate/build.gradle.kts
+2 -1
View File
@@ -21,7 +21,7 @@ val ideaProjectResources = project(":idea").the<JavaPluginConvention>().sourceS
evaluationDependsOn(":prepare:idea-plugin")
dependencies {
compile(projectDist(":kotlin-reflect"))
compileOnly(project(":kotlin-reflect-api"))
compile(projectDist(":kotlin-stdlib"))
compile(project(":core:descriptors")) { isTransitive = false }
compile(project(":core:descriptors.jvm")) { isTransitive = false }
@@ -65,6 +65,7 @@ dependencies {
testCompile(ideaUltimateSdkDeps("gson"))
testCompile(preloadedDeps("kotlinx-coroutines-core"))
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-script-runtime"))
testRuntime(projectRuntimeJar(":kotlin-compiler"))
testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false }