Introduce new Kotlin Daemon without RMI abstraction

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

@@ -16,9 +16,11 @@ val archives by configurations
 dependencies {
     jarContents(project(":compiler:cli-common")) { isTransitive = false }
     jarContents(project(":compiler:daemon-common")) { isTransitive = false }
+    jarContents(project(":compiler:daemon-common-new")) { isTransitive = false }
     jarContents(projectRuntimeJar(":kotlin-daemon-client"))
     testCompile(project(":compiler:cli-common"))
     testCompile(project(":compiler:daemon-common"))
+    testCompile(project(":compiler:daemon-common-new"))
     testCompile(projectRuntimeJar(":kotlin-daemon-client"))
     testCompile(commonDep("junit:junit"))
     testCompile(project(":kotlin-test:kotlin-test-jvm"))

prepare/compiler/build.gradle.kts

@@ -32,6 +32,8 @@ default.extendsFrom(runtimeJar)
 
 val compilerBaseName = name
 
+val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
+
 val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName.jar")
 
 val compilerModules: Array<String> by rootProject.extra
@@ -58,6 +60,9 @@ dependencies {
     trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
 
     fatJarContents(kotlinBuiltins())
+    fatJarContents(project(":kotlin-daemon-client-new")) {
+        isTransitive = false
+    }
     fatJarContents(commonDep("javax.inject"))
     fatJarContents(commonDep("org.jline", "jline"))
     fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
@@ -65,6 +70,11 @@ dependencies {
     fatJarContents(commonDep("com.google.code.findbugs", "jsr305"))
     fatJarContents(commonDep("io.javaslang", "javaslang"))
     fatJarContents(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    fatJarContents(commonDep("io.ktor", "ktor-network")) {
+        ktorExcludesForDaemon.forEach { (group, module) ->
+            exclude(group = group, module = module)
+        }
+    }
 
     fatJarContents(intellijCoreDep()) { includeJars("intellij-core", "java-compatibility-1.0.1") }
     fatJarContents(intellijDep()) {

prepare/compiler/build.gradle.kts.182

@@ -36,6 +36,8 @@ val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName.jar")
 
 val compilerModules: Array<String> by rootProject.extra
 
+val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
+
 dependencies {
     compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
@@ -58,6 +60,9 @@ dependencies {
     trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
 
     fatJarContents(kotlinBuiltins())
+    fatJarContents(project(":kotlin-daemon-client-new")) {
+        isTransitive = false
+    }
     fatJarContents(commonDep("javax.inject"))
     fatJarContents(commonDep("org.jline", "jline"))
     fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
@@ -65,6 +70,11 @@ dependencies {
     fatJarContents(commonDep("com.google.code.findbugs", "jsr305"))
     fatJarContents(commonDep("io.javaslang", "javaslang"))
     fatJarContents(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    fatJarContents(commonDep("io.ktor", "ktor-network")) {
+        ktorExcludesForDaemon.forEach { (group, module) ->
+           exclude(group = group, module = module)
+        }
+    }
 
     fatJarContents(intellijCoreDep()) { includeJars("intellij-core") }
     fatJarContents(intellijDep()) {

prepare/compiler/build.gradle.kts.as34

@@ -36,6 +36,8 @@ val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName.jar")
 
 val compilerModules: Array<String> by rootProject.extra
 
+val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
+
 dependencies {
     compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
@@ -58,6 +60,9 @@ dependencies {
     trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
 
     fatJarContents(kotlinBuiltins())
+    fatJarContents(project(":kotlin-daemon-client-new")) {
+        isTransitive = false
+    }
     fatJarContents(commonDep("javax.inject"))
     fatJarContents(commonDep("org.jline", "jline"))
     fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
@@ -65,6 +70,11 @@ dependencies {
     fatJarContents(commonDep("com.google.code.findbugs", "jsr305"))
     fatJarContents(commonDep("io.javaslang", "javaslang"))
     fatJarContents(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    fatJarContents(commonDep("io.ktor", "ktor-network")) {
+        ktorExcludesForDaemon.forEach { (group, module) ->
+            exclude(group = group, module = module)
+        }
+    }
 
     fatJarContents(intellijCoreDep()) { includeJars("intellij-core") }
     fatJarContents(intellijDep()) {

prepare/idea-plugin/build.gradle.kts

@@ -22,6 +22,7 @@ val projectsToShadow by extra(listOf(
         ":compiler:cli-common",
         ":compiler:container",
         ":compiler:daemon-common",
+        ":compiler:daemon-common-new",
         ":core:metadata",
         ":core:metadata.jvm",
         ":core:descriptors",

prepare/jps-plugin/build.gradle.kts

@@ -11,6 +11,7 @@ val projectsToShadow = listOf(
     ":compiler:cli-common",
     ":kotlin-compiler-runner",
     ":compiler:daemon-common",
+    ":compiler:daemon-common-new",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":idea:idea-jps-common",