Drop coroutines from compiler jar, add appropriate plugin dependency

#KT-30778 fixed
2020-05-20 15:14:51 +02:00
parent 343e519f7f
commit 9d98c90881
8 changed files with 15 additions and 13 deletions
@@ -83,7 +83,7 @@ val proguard by task<CacheableProguardTask> {
    dependsOn(relocatedJar)
    configuration("main-kts.pro")

-    injars(mapOf("filter" to "!META-INF/versions/**"), relocatedJar.get().outputs.files)
+    injars(mapOf("filter" to "!META-INF/versions/**,!kotlinx/coroutines/debug/**"), relocatedJar.get().outputs.files)

    outjars(fileFrom(buildDir, "libs", "$jarBaseName-$version-after-proguard.jar"))

@@ -15,6 +15,8 @@
 -dontwarn org.bouncycastle.**
 -dontwarn org.apache.ivy.ant.**
 -dontwarn kotlin.annotations.jvm.**
+# hopefully temporarily, for coroutines
+-dontwarn kotlin.time.**

 -keep class org.jetbrains.kotlin.mainKts.** { *; }
 -keep class kotlin.script.experimental.** { *; }