Always depend on runtimeJar of kotlin-daemon-client

This commit is contained in:
Alexey Tsvetkov
2018-02-22 08:08:07 +03:00
parent 0039be6972
commit c736f229ce
8 changed files with 9 additions and 7 deletions
+1 -1
View File
@@ -66,7 +66,7 @@ dependencies {
testCompile(projectTests(":generators:test-generator"))
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(projectRuntimeJar(":kotlin-daemon-client"))
testCompileOnly(project(":kotlin-reflect-api"))
otherCompilerModules.forEach {
testCompileOnly(project(it))
+1 -1
View File
@@ -14,7 +14,7 @@ dependencies {
compileOnly(project(":kotlin-preloader"))
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:daemon-common"))
compile(project(":kotlin-daemon-client"))
compile(projectRuntimeJar(":kotlin-daemon-client"))
compileOnly(project(":compiler:util"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable"))
@@ -30,6 +30,8 @@ sourceSets {
"test" {}
}
noDefaultJar()
runtimeJar(task<ShadowJar>("shadowJar")) {
from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
fromEmbeddedComponents()