Build: Add proper kotlin-compiler-runner-unshaded for ide artifacts

Fixes tests in kt-212-master branch of kotlin plugin in
intellij-community repository

build.gradle.kts

@@ -280,7 +280,7 @@ extra["compilerModulesForJps"] = listOf(
     ":kotlin-util-klib",
     ":kotlin-util-klib-metadata",
     ":compiler:cli-common",
-    ":kotlin-compiler-runner",
+    ":kotlin-compiler-runner-unshaded",
     ":daemon-common",
     ":daemon-common-new",
     ":core:compiler.common",

compiler/compiler-runner-unshaded/build.gradle.kts

@@ -0,0 +1,25 @@
+description = "Compiler runner + daemon client unshaded"
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    api(project(":kotlin-build-common"))
+    api(project(":kotlin-daemon-client"))
+    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+
+    compileOnly(project(":compiler:cli-common"))
+    compileOnly(project(":kotlin-preloader"))
+    compileOnly(project(":compiler:frontend.java"))
+    compileOnly(project(":daemon-common"))
+    compileOnly(project(":daemon-common-new"))
+    compileOnly(project(":compiler:util"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}

compiler/compiler-runner/build.gradle.kts

@@ -6,22 +6,18 @@ plugins {
 }
 
 dependencies {
+    embedded(project(":kotlin-compiler-runner-unshaded")) { isTransitive = false }
+
     api(project(":kotlin-build-common"))
-    compileOnly(project(":compiler:cli-common"))
-    compileOnly(project(":kotlin-preloader"))
-    compileOnly(project(":compiler:frontend.java"))
-    compileOnly(project(":daemon-common"))
-    compileOnly(project(":daemon-common-new"))
     api(project(":kotlin-daemon-client"))
-    compileOnly(project(":compiler:util"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    runtimeOnly(project(":kotlin-compiler-embeddable"))
     api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+
+    runtimeOnly(project(":kotlin-compiler-embeddable"))
 }
 
 sourceSets {
-    "main" { projectDefault() }
+    "main" { }
-    "test" {}
+    "test" { }
 }
 
 publish()

prepare/ide-plugin-dependencies/kotlin-compiler-common-for-ide/build.gradle.kts

@@ -11,7 +11,7 @@ val excludedCompilerModules = listOf(
 )
 
 val projects = commonCompilerModules.asList() - excludedCompilerModules + listOf(
-    ":kotlin-compiler-runner",
+    ":kotlin-compiler-runner-unshaded",
     ":kotlin-preloader",
     ":daemon-common",
     ":kotlin-daemon-client"

prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts

@@ -23,7 +23,7 @@ val excludedCompilerModules = listOf(
 )
 
 val projects = compilerModules.asList() - excludedCompilerModules + listOf(
-    ":kotlin-compiler-runner",
+    ":kotlin-compiler-runner-unshaded",
     ":kotlin-preloader",
     ":daemon-common",
     ":kotlin-daemon-client"

settings.gradle

@@ -122,6 +122,7 @@ include ":benchmarks",
         ":compiler:frontend.common-psi",
         ":compiler:frontend.java",
         ":compiler:frontend:cfg",
+        ":kotlin-compiler-runner-unshaded",
         ":kotlin-compiler-runner",
         ":compiler:cli-common",
         ":compiler:ir.tree",
@@ -551,6 +552,7 @@ project(':daemon-common-new').projectDir = "$rootDir/compiler/daemon/daemon-comm
 project(':kotlin-daemon-client').projectDir = "$rootDir/compiler/daemon/daemon-client" as File
 project(':kotlin-daemon-client-new').projectDir = "$rootDir/compiler/daemon/daemon-client-new" as File
 project(':kotlin-daemon-tests').projectDir = "$rootDir/compiler/daemon/daemon-tests" as File
+project(':kotlin-compiler-runner-unshaded').projectDir = "$rootDir/compiler/compiler-runner-unshaded" as File
 project(':kotlin-compiler-runner').projectDir = "$rootDir/compiler/compiler-runner" as File
 project(':kotlin-ant').projectDir = "$rootDir/ant" as File
 project(':compiler:ir.tree').projectDir = "$rootDir/compiler/ir/ir.tree" as File