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

Fix jline proguarding in the compiler: fixes cli REPL

Browse Source 
#KT-32085 fixed
This commit is contained in:
Ilya Chernikov
2019-06-24 20:09:46 +02:00
parent b3e08c0b61
commit 3c1c9ca523
4 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/compiler.pro
+9 -1
View File
@@ -256,4 +256,12 @@ messages/**)
# used in LazyScriptDescriptor # used in LazyScriptDescriptor
-keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; } -keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; }
-keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; } -keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; }
# used in REPL
# TODO: pack jline directly to scripting-compiler jars instead
-keep class org.jline.reader.LineReaderBuilder { *; }
-keep class org.jline.reader.LineReader { *; }
-keep class org.jline.reader.History { *; }
-keep class org.jline.reader.EndOfFileException { *; }
-keep class org.jline.reader.UserInterruptException { *; }
compiler/compiler.pro.183
+9 -1
View File
@@ -255,4 +255,12 @@ messages/**)
# used in LazyScriptDescriptor # used in LazyScriptDescriptor
-keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; } -keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; }
-keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; } -keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; }
# used in REPL
# TODO: pack jline directly to scripting-compiler jars instead
-keep class org.jline.reader.LineReaderBuilder { *; }
-keep class org.jline.reader.LineReader { *; }
-keep class org.jline.reader.History { *; }
-keep class org.jline.reader.EndOfFileException { *; }
-keep class org.jline.reader.UserInterruptException { *; }
compiler/compiler.pro.192
+9 -1
View File
@@ -259,4 +259,12 @@ messages/**)
# used in LazyScriptDescriptor # used in LazyScriptDescriptor
-keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; } -keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; }
-keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; } -keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; }
# used in REPL
# TODO: pack jline directly to scripting-compiler jars instead
-keep class org.jline.reader.LineReaderBuilder { *; }
-keep class org.jline.reader.LineReader { *; }
-keep class org.jline.reader.History { *; }
-keep class org.jline.reader.EndOfFileException { *; }
-keep class org.jline.reader.UserInterruptException { *; }
compiler/compiler.pro.as34
+9 -1
View File
@@ -255,4 +255,12 @@ messages/**)
# used in LazyScriptDescriptor # used in LazyScriptDescriptor
-keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; } -keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; }
-keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; } -keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; }
# used in REPL
# TODO: pack jline directly to scripting-compiler jars instead
-keep class org.jline.reader.LineReaderBuilder { *; }
-keep class org.jline.reader.LineReader { *; }
-keep class org.jline.reader.History { *; }
-keep class org.jline.reader.EndOfFileException { *; }
-keep class org.jline.reader.UserInterruptException { *; }