Always depend on runtimeJar of kotlin-daemon-client

prepare/compiler-client-embeddable/build.gradle.kts

@@ -20,7 +20,7 @@ dependencies {
     jarContents(projectRuntimeJar(":kotlin-daemon-client"))
     testCompile(project(":compiler:cli-common"))
     testCompile(project(":compiler:daemon-common"))
-    testCompile(project(":kotlin-daemon-client"))
+    testCompile(projectRuntimeJar(":kotlin-daemon-client"))
     testCompile(commonDep("junit:junit"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectDist(":kotlin-test:kotlin-test-junit"))

prepare/jps-plugin/build.gradle.kts

@@ -10,7 +10,6 @@ val projectsToShadow = listOf(
         ":kotlin-build-common",
         ":compiler:cli-common",
         ":kotlin-compiler-runner",
-        ":kotlin-daemon-client",
         ":compiler:daemon-common",
         ":core:descriptors",
         ":core:descriptors.jvm",
@@ -28,6 +27,7 @@ dependencies {
     projectsToShadow.forEach {
         embeddedComponents(project(it)) { isTransitive = false }
     }
+    embeddedComponents(projectRuntimeJar(":kotlin-daemon-client"))
 }
 
 runtimeJar<ShadowJar>(task<ShadowJar>("jar")) {