Move daemon jar from compiler

2019-04-03 19:34:06 +03:00
parent ced973b707
commit 01a05a5495
67 changed files with 441 additions and 759 deletions
@@ -21,8 +21,8 @@ val projectsToShadow by extra(listOf(
        ":kotlin-build-common",
        ":compiler:cli-common",
        ":compiler:container",
-        ":compiler:daemon-common",
-        ":compiler:daemon-common-new",
+        ":daemon-common",
+        ":daemon-common-new",
        ":core:metadata",
        ":core:metadata.jvm",
        ":core:descriptors",
@@ -120,6 +120,10 @@ dependencies {
    libraries(project(":kotlin-reflect"))
    libraries(project(":kotlin-compiler-client-embeddable"))
    libraries(project(":kotlin-daemon-client"))
+    libraries(project(":kotlin-daemon-client-new"))
+    libraries(project(":kotlin-daemon")) {
+        isTransitive = false
+    }
    libraries(project(":kotlin-script-runtime"))
    libraries(project(":kotlin-script-util"))
    libraries(project(":kotlin-scripting-common"))