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

Replace default-type dependencies to :kotlin-stdlib with distJar

Browse Source 
Use distJar configuration instead.
It's necessary because currently when using default-type, subproject
starts having a transitive dependency to :kotlin-stdlib-common
and that leads to exception from KT-20897 when building light classes

This change might be reverted once KT-23942 is fixed

 #KT-23942 Submitted
This commit is contained in:
Denis Zharkov
2018-04-24 15:21:47 +03:00
committed by Vyacheslav Gerasimov
parent 655b737a1e
commit 003f381fcd
20 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/container/build.gradle.kts
+2 -2
View File
@@ -9,9 +9,9 @@ jvmTarget = "1.6"
dependencies {
compile(project(":core:util.runtime"))
compile(commonDep("javax.inject"))
compileOnly(project(":kotlin-stdlib"))
compileOnly(projectDist(":kotlin-stdlib"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(project(":kotlin-stdlib"))
testCompile(projectDist(":kotlin-stdlib"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
testCompile(commonDep("junit:junit"))
compiler/daemon/daemon-common/build.gradle.kts
+1 -1
View File
@@ -11,7 +11,7 @@ dependencies {
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
}
compiler/tests-common-jvm6/build.gradle.kts
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
jvmTarget = "1.6"
dependencies {
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
}
core/metadata/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(protobufLite())
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
}
sourceSets {
idea/build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ plugins {
dependencies {
testRuntime(intellijDep())
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compileOnly(project(":kotlin-reflect-api"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
idea/build.gradle.kts.181
+1 -1
View File
@@ -8,7 +8,7 @@ plugins {
dependencies {
testRuntime(intellijDep())
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compileOnly(project(":kotlin-reflect-api"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
idea/build.gradle.kts.as31
+1 -1
View File
@@ -8,7 +8,7 @@ plugins {
dependencies {
testRuntime(intellijDep())
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compileOnly(project(":kotlin-reflect-api"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
idea/build.gradle.kts.as32
+1 -1
View File
@@ -8,7 +8,7 @@ plugins {
dependencies {
testRuntime(intellijDep())
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compileOnly(project(":kotlin-reflect-api"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
jps-plugin/build.gradle.kts
+1
View File
@@ -15,6 +15,7 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(projectRuntimeJar(":kotlin-preloader"))
compile(project(":idea:idea-jps-common"))
compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all") }
compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(project(":kotlin-reflect-api"))
jps-plugin/build.gradle.kts.181
+1
View File
@@ -15,6 +15,7 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(projectRuntimeJar(":kotlin-preloader"))
compile(project(":idea:idea-jps-common"))
compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all") }
compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(project(":kotlin-reflect-api"))
jps-plugin/build.gradle.kts.as31
+1
View File
@@ -15,6 +15,7 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(projectRuntimeJar(":kotlin-preloader"))
compile(project(":idea:idea-jps-common"))
compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all") }
compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(project(":kotlin-reflect-api"))
jps-plugin/build.gradle.kts.as32
+1
View File
@@ -15,6 +15,7 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(projectRuntimeJar(":kotlin-preloader"))
compile(project(":idea:idea-jps-common"))
compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all") }
compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(project(":kotlin-reflect-api"))
libraries/reflect/api/build.gradle
+1 -1
View File
@@ -14,7 +14,7 @@ sourceSets {
}
dependencies {
compile project(':kotlin-stdlib')
compile project(path: ':kotlin-stdlib', configuration: 'distJar')
compileOnly project(':core:descriptors')
compileOnly project(':core:descriptors.jvm')
compileOnly project(':core:deserialization')
libraries/reflect/build.gradle.kts
+1 -1
View File
@@ -38,7 +38,7 @@ configurations.getByName("compileOnly").extendsFrom(shadows)
val mainJar by configurations.creating
dependencies {
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
proguardDeps(project(":kotlin-stdlib"))
proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String))))
libraries/scripting/jvm-host/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ jvmTarget = "1.6"
dependencies {
compile(project(":kotlin-script-runtime"))
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compile(project(":kotlin-scripting-common"))
compile(project(":kotlin-scripting-jvm"))
compile(project(":kotlin-script-util"))
libraries/tools/kotlin-script-util/build.gradle.kts
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
}
dependencies {
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compile(project(":kotlin-script-runtime"))
compileOnly(project(":compiler:cli"))
compileOnly(project(":compiler:daemon-common"))
libraries/tools/kotlin-script-util/build.gradle.kts.181
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
}
dependencies {
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compile(project(":kotlin-script-runtime"))
compileOnly(project(":compiler:cli"))
compileOnly(project(":compiler:daemon-common"))
libraries/tools/kotlin-script-util/build.gradle.kts.as32
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
}
dependencies {
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compile(project(":kotlin-script-runtime"))
compileOnly(project(":compiler:cli"))
compileOnly(project(":compiler:daemon-common"))
libraries/tools/script-runtime/build.gradle
+1 -1
View File
@@ -9,7 +9,7 @@ configurePublishing(project)
project.ext["jpsLibraryPath"] = rootProject.distLibDir
dependencies {
compileOnly project(':kotlin-stdlib')
compileOnly project(path: ':kotlin-stdlib', configuration: 'distJar')
}
configurations {
plugins/android-extensions/android-extensions-runtime/build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ plugins {
jvmTarget = "1.6"
dependencies {
compile(project(":kotlin-stdlib"))
compile(projectDist(":kotlin-stdlib"))
compileOnly(commonDep("com.google.android", "android"))
}