Drop coroutines from compiler jar, add appropriate plugin dependency

#KT-30778 fixed

prepare/compiler/build.gradle.kts

@@ -46,6 +46,8 @@ val libraries by configurations.creating {
     }
 }
 
+val librariesStripVersion by configurations.creating
+
 // Compiler plugins should be copied without `kotlin-` prefix
 val compilerPlugins by configurations.creating  {
     exclude("org.jetbrains.kotlin", "kotlin-stdlib-common")
@@ -153,6 +155,8 @@ dependencies {
         libraries(project(":kotlin-test:kotlin-test-js", configuration = "distLibrary"))
     }
 
+    librariesStripVersion(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+
     distLibraryProjects.forEach {
         libraries(project(it)) { isTransitive = false }
     }
@@ -196,7 +200,6 @@ dependencies {
     fatJarContents(protobufFull())
     fatJarContents(commonDep("com.google.code.findbugs", "jsr305"))
     fatJarContents(commonDep("io.javaslang", "javaslang"))
-    fatJarContents(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     fatJarContents(commonDep("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) { isTransitive = false }
 
     fatJarContents(intellijCoreDep()) { includeJars("intellij-core") }
@@ -342,6 +345,11 @@ val distKotlinc = distTask<Sync>("distKotlinc") {
     into("lib") {
         from(jar) { rename { "$compilerBaseName.jar" } }
         from(libraries)
+        from(librariesStripVersion) {
+            rename {
+                it.replace(Regex("-\\d.*\\.jar\$"), ".jar")
+            }
+        }
         from(sources)
         from(compilerPlugins) {
             rename { it.removePrefix("kotlin-") }

prepare/compiler/compiler.pro

@@ -13,7 +13,6 @@
 -dontwarn com.intellij.ui.**
 -dontwarn com.intellij.util.IconUtil
 -dontwarn com.intellij.util.ImageLoader
--dontwarn kotlinx.coroutines.flow.FlowKt__MergeKt
 -dontwarn net.sf.cglib.**
 -dontwarn org.objectweb.asm.** # this is ASM3, the old version that we do not use
 -dontwarn com.sun.jna.NativeString
@@ -64,7 +63,6 @@
 -dontwarn org.w3c.dom.Window
 -dontwarn org.slf4j.**
 
-
 #-libraryjars '<rtjar>'
 #-libraryjars '<jssejar>'
 #-libraryjars '<bootstrap.runtime>'
@@ -219,9 +217,6 @@
 -keep class com.sun.tools.javac.** { *; }
 -keep class com.sun.source.** { *; }
 
-# for coroutines
--keep class kotlinx.coroutines.** { *; }
-
 # for webdemo
 -keep class com.intellij.openapi.progress.ProgressManager { *; }
 

prepare/compiler/compiler.pro.191

@@ -218,9 +218,6 @@
 -keep class com.sun.tools.javac.** { *; }
 -keep class com.sun.source.** { *; }
 
-# for coroutines
--keep class kotlinx.coroutines.** { *; }
-
 # for webdemo
 -keep class com.intellij.openapi.progress.ProgressManager { *; }