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

Original commit: 003f381fcd
This commit is contained in:
Denis Zharkov
2018-04-24 15:21:47 +03:00
committed by Vyacheslav Gerasimov
parent bdd795200c
commit f4d5649cd5
4 changed files with 4 additions and 0 deletions
+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"))
+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"))
+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"))
+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"))