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

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
+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')
+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))))
@@ -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"))
@@ -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"))
@@ -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"))
@@ -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"))
+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 {