azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix proguarding of jline library in compiler

Browse Source 
#KT-32234 fixed
#KT-32259 fixed
This commit is contained in:
Ilya Chernikov
2019-07-01 17:38:33 +02:00
parent 3f28b71509
commit 72b68ee683
6 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/embeddable.kt
+2 -2
View File
@@ -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") val compilerJar = configurations.getOrCreate("compilerJar")
dependencies.add(compilerJar.name, dependencies.project(":kotlin-compiler", configuration = "runtimeJar")) 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) { compilerShadowJar(taskName) {
configureEmbeddableCompilerRelocation() configureEmbeddableCompilerRelocation()
body() body()
compiler/compiler.pro
+2
View File
@@ -265,6 +265,8 @@ messages/**)
-keep class org.jline.reader.History { *; } -keep class org.jline.reader.History { *; }
-keep class org.jline.reader.EndOfFileException { *; } -keep class org.jline.reader.EndOfFileException { *; }
-keep class org.jline.reader.UserInterruptException { *; } -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 { -keepclassmembers class * implements java.io.Serializable {
static final long serialVersionUID; static final long serialVersionUID;
compiler/compiler.pro.183
+2
View File
@@ -264,6 +264,8 @@ messages/**)
-keep class org.jline.reader.History { *; } -keep class org.jline.reader.History { *; }
-keep class org.jline.reader.EndOfFileException { *; } -keep class org.jline.reader.EndOfFileException { *; }
-keep class org.jline.reader.UserInterruptException { *; } -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 { -keepclassmembers class * implements java.io.Serializable {
static final long serialVersionUID; static final long serialVersionUID;
compiler/compiler.pro.192
+2
View File
@@ -268,6 +268,8 @@ messages/**)
-keep class org.jline.reader.History { *; } -keep class org.jline.reader.History { *; }
-keep class org.jline.reader.EndOfFileException { *; } -keep class org.jline.reader.EndOfFileException { *; }
-keep class org.jline.reader.UserInterruptException { *; } -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 { -keepclassmembers class * implements java.io.Serializable {
static final long serialVersionUID; static final long serialVersionUID;
compiler/compiler.pro.as34
+2
View File
@@ -264,6 +264,8 @@ messages/**)
-keep class org.jline.reader.History { *; } -keep class org.jline.reader.History { *; }
-keep class org.jline.reader.EndOfFileException { *; } -keep class org.jline.reader.EndOfFileException { *; }
-keep class org.jline.reader.UserInterruptException { *; } -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 { -keepclassmembers class * implements java.io.Serializable {
static final long serialVersionUID; static final long serialVersionUID;
prepare/compiler-embeddable/build.gradle.kts
+2
View File
@@ -24,6 +24,8 @@ compilerDummyJar(compilerDummyForDependenciesRewriting("compilerDummy") {
runtimeJar(embeddableCompiler()) { runtimeJar(embeddableCompiler()) {
exclude("com/sun/jna/**") exclude("com/sun/jna/**")
exclude("org/jetbrains/annotations/**")
mergeServiceFiles()
} }
sourcesJar() sourcesJar()