From 3c1c9ca523bc2272e23121e6b08ad0fab4ae41a6 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 24 Jun 2019 20:09:46 +0200 Subject: [PATCH] Fix jline proguarding in the compiler: fixes cli REPL #KT-32085 fixed --- compiler/compiler.pro | 10 +++++++++- compiler/compiler.pro.183 | 10 +++++++++- compiler/compiler.pro.192 | 10 +++++++++- compiler/compiler.pro.as34 | 10 +++++++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/compiler/compiler.pro b/compiler/compiler.pro index e775adb4946..03043902f27 100644 --- a/compiler/compiler.pro +++ b/compiler/compiler.pro @@ -256,4 +256,12 @@ messages/**) # used in LazyScriptDescriptor -keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; } --keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; } \ No newline at end of file +-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 { *; } diff --git a/compiler/compiler.pro.183 b/compiler/compiler.pro.183 index 731284cf533..c9901e68a20 100644 --- a/compiler/compiler.pro.183 +++ b/compiler/compiler.pro.183 @@ -255,4 +255,12 @@ messages/**) # used in LazyScriptDescriptor -keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; } --keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; } \ No newline at end of file +-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 { *; } diff --git a/compiler/compiler.pro.192 b/compiler/compiler.pro.192 index 99084faf4ea..45b5affa3b6 100644 --- a/compiler/compiler.pro.192 +++ b/compiler/compiler.pro.192 @@ -259,4 +259,12 @@ messages/**) # used in LazyScriptDescriptor -keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; } --keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; } \ No newline at end of file +-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 { *; } diff --git a/compiler/compiler.pro.as34 b/compiler/compiler.pro.as34 index 609736c04a5..32fb5e1992c 100644 --- a/compiler/compiler.pro.as34 +++ b/compiler/compiler.pro.as34 @@ -255,4 +255,12 @@ messages/**) # used in LazyScriptDescriptor -keep class org.jetbrains.kotlin.utils.addToStdlib.AddToStdlibKt { *; } --keep class com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem { *; } \ No newline at end of file +-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 { *; }