diff --git a/buildSrc/src/main/kotlin/embeddable.kt b/buildSrc/src/main/kotlin/embeddable.kt
index 12ad645ab52..aa98dee657e 100644
--- a/buildSrc/src/main/kotlin/embeddable.kt
+++ b/buildSrc/src/main/kotlin/embeddable.kt
@@ -59,7 +59,7 @@ private fun ShadowJar.configureEmbeddableCompilerRelocation(withJavaxInject: Boo
     }
 }
 
-private fun Project.compilerShadowJar(taskName: String, body: ShadowJar.() -> Unit): TaskProvider<out Jar> {
+private fun Project.compilerShadowJar(taskName: String, body: ShadowJar.() -> Unit): TaskProvider<out ShadowJar> {
 
     val compilerJar = configurations.getOrCreate("compilerJar")
     dependencies.add(compilerJar.name, dependencies.project(":kotlin-compiler", configuration = "runtimeJar"))
@@ -72,7 +72,7 @@ private fun Project.compilerShadowJar(taskName: String, body: ShadowJar.() -> Un
     }
 }
 
-fun Project.embeddableCompiler(taskName: String = "embeddable", body: ShadowJar.() -> Unit = {}): TaskProvider<out Jar> =
+fun Project.embeddableCompiler(taskName: String = "embeddable", body: ShadowJar.() -> Unit = {}): TaskProvider<out ShadowJar> =
     compilerShadowJar(taskName) {
         configureEmbeddableCompilerRelocation()
         body()
diff --git a/compiler/compiler.pro b/compiler/compiler.pro
index 806fe18cc4f..6aad71f82fc 100644
--- a/compiler/compiler.pro
+++ b/compiler/compiler.pro
@@ -265,6 +265,8 @@ messages/**)
 -keep class org.jline.reader.History { *; }
 -keep class org.jline.reader.EndOfFileException { *; }
 -keep class org.jline.reader.UserInterruptException { *; }
+-keep class org.jline.terminal.impl.jna.JnaSupportImpl  { *; }
+-keep class org.jline.terminal.impl.jansi.JansiSupportImpl  { *; }
 
 -keepclassmembers class * implements java.io.Serializable {
     static final long serialVersionUID;
diff --git a/compiler/compiler.pro.183 b/compiler/compiler.pro.183
index 4c03d7c8673..8c8934a0a67 100644
--- a/compiler/compiler.pro.183
+++ b/compiler/compiler.pro.183
@@ -264,6 +264,8 @@ messages/**)
 -keep class org.jline.reader.History { *; }
 -keep class org.jline.reader.EndOfFileException { *; }
 -keep class org.jline.reader.UserInterruptException { *; }
+-keep class org.jline.terminal.impl.jna.JnaSupportImpl  { *; }
+-keep class org.jline.terminal.impl.jansi.JansiSupportImpl  { *; }
 
 -keepclassmembers class * implements java.io.Serializable {
     static final long serialVersionUID;
diff --git a/compiler/compiler.pro.192 b/compiler/compiler.pro.192
index 18e17988282..a31576ff126 100644
--- a/compiler/compiler.pro.192
+++ b/compiler/compiler.pro.192
@@ -268,6 +268,8 @@ messages/**)
 -keep class org.jline.reader.History { *; }
 -keep class org.jline.reader.EndOfFileException { *; }
 -keep class org.jline.reader.UserInterruptException { *; }
+-keep class org.jline.terminal.impl.jna.JnaSupportImpl  { *; }
+-keep class org.jline.terminal.impl.jansi.JansiSupportImpl  { *; }
 
 -keepclassmembers class * implements java.io.Serializable {
     static final long serialVersionUID;
diff --git a/compiler/compiler.pro.as34 b/compiler/compiler.pro.as34
index 2535d402a82..77149cf4281 100644
--- a/compiler/compiler.pro.as34
+++ b/compiler/compiler.pro.as34
@@ -264,6 +264,8 @@ messages/**)
 -keep class org.jline.reader.History { *; }
 -keep class org.jline.reader.EndOfFileException { *; }
 -keep class org.jline.reader.UserInterruptException { *; }
+-keep class org.jline.terminal.impl.jna.JnaSupportImpl  { *; }
+-keep class org.jline.terminal.impl.jansi.JansiSupportImpl  { *; }
 
 -keepclassmembers class * implements java.io.Serializable {
     static final long serialVersionUID;
diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts
index b8726ac5aed..f456447ce39 100644
--- a/prepare/compiler-embeddable/build.gradle.kts
+++ b/prepare/compiler-embeddable/build.gradle.kts
@@ -24,6 +24,8 @@ compilerDummyJar(compilerDummyForDependenciesRewriting("compilerDummy") {
 
 runtimeJar(embeddableCompiler()) {
     exclude("com/sun/jna/**")
+    exclude("org/jetbrains/annotations/**")
+    mergeServiceFiles()
 }
 
 sourcesJar()