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:
committed by
Vyacheslav Gerasimov
parent
655b737a1e
commit
003f381fcd
@@ -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"))
|
||||
|
||||
@@ -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) }
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ plugins {
|
||||
jvmTarget = "1.6"
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-stdlib"))
|
||||
compile(projectDist(":kotlin-stdlib"))
|
||||
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user