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

Isolate script execution from compiler classloader

Browse Source 
Since fix of KT-33554, the script execution classpath is set correctly
according to the compilation classpath, so isolation makes sense now.
This commit is contained in:
Ilya Chernikov
2019-09-05 12:29:35 +02:00
parent 771f5c13dd
commit 939d76fd2a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt
+5
View File
@@ -27,6 +27,8 @@ import java.io.PrintStream
import kotlin.script.experimental.api.* import kotlin.script.experimental.api.*
import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.host.toScriptSource
import kotlin.script.experimental.jvm.BasicJvmScriptEvaluator import kotlin.script.experimental.jvm.BasicJvmScriptEvaluator
import kotlin.script.experimental.jvm.baseClassLoader
import kotlin.script.experimental.jvm.jvm
class JvmCliScriptEvaluationExtension : ScriptEvaluationExtension { class JvmCliScriptEvaluationExtension : ScriptEvaluationExtension {
override fun isAccepted(arguments: CommonCompilerArguments): Boolean = override fun isAccepted(arguments: CommonCompilerArguments): Boolean =
@@ -69,6 +71,9 @@ class JvmCliScriptEvaluationExtension : ScriptEvaluationExtension {
val evaluationConfiguration = definition.evaluationConfiguration.with { val evaluationConfiguration = definition.evaluationConfiguration.with {
constructorArgs(scriptArgs.toTypedArray()) constructorArgs(scriptArgs.toTypedArray())
jvm {
baseClassLoader(null)
}
} }
val scriptCompilationConfiguration = definition.compilationConfiguration val scriptCompilationConfiguration = definition.compilationConfiguration