Fix host configuration replacements
This commit is contained in:
+3
-2
@@ -13,6 +13,7 @@ import kotlin.script.experimental.api.ScriptCompilationConfiguration
|
|||||||
import kotlin.script.experimental.api.ScriptEvaluationConfiguration
|
import kotlin.script.experimental.api.ScriptEvaluationConfiguration
|
||||||
import kotlin.script.experimental.api.hostConfiguration
|
import kotlin.script.experimental.api.hostConfiguration
|
||||||
import kotlin.script.experimental.host.ScriptingHostConfiguration
|
import kotlin.script.experimental.host.ScriptingHostConfiguration
|
||||||
|
import kotlin.script.experimental.host.withDefaultsFrom
|
||||||
import kotlin.script.experimental.jvm.baseClassLoader
|
import kotlin.script.experimental.jvm.baseClassLoader
|
||||||
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
|
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
|
||||||
import kotlin.script.experimental.jvm.jvm
|
import kotlin.script.experimental.jvm.jvm
|
||||||
@@ -40,13 +41,13 @@ class KotlinJsr223ScriptEngineImpl(
|
|||||||
|
|
||||||
val compilationConfiguration by lazy {
|
val compilationConfiguration by lazy {
|
||||||
ScriptCompilationConfiguration(baseCompilationConfiguration) {
|
ScriptCompilationConfiguration(baseCompilationConfiguration) {
|
||||||
hostConfiguration(jsr223HostConfiguration)
|
hostConfiguration.update { it.withDefaultsFrom(jsr223HostConfiguration) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val evaluationConfiguration by lazy {
|
val evaluationConfiguration by lazy {
|
||||||
ScriptEvaluationConfiguration(baseEvaluationConfiguration) {
|
ScriptEvaluationConfiguration(baseEvaluationConfiguration) {
|
||||||
hostConfiguration(jsr223HostConfiguration)
|
hostConfiguration.update { it.withDefaultsFrom(jsr223HostConfiguration) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -30,7 +30,7 @@ open class JvmScriptCompiler(
|
|||||||
compilerProxy.compile(
|
compilerProxy.compile(
|
||||||
script,
|
script,
|
||||||
scriptCompilationConfiguration.with {
|
scriptCompilationConfiguration.with {
|
||||||
hostConfiguration(this@JvmScriptCompiler.hostConfiguration)
|
hostConfiguration.update { it.withDefaultsFrom(this@JvmScriptCompiler.hostConfiguration) }
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,7 @@
|
|||||||
package kotlin.script.experimental.jvm
|
package kotlin.script.experimental.jvm
|
||||||
|
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import kotlin.script.experimental.api.ScriptCompilationConfiguration
|
import kotlin.script.experimental.api.*
|
||||||
import kotlin.script.experimental.api.ScriptEvaluationConfiguration
|
|
||||||
import kotlin.script.experimental.api.baseClass
|
|
||||||
import kotlin.script.experimental.api.onFailure
|
|
||||||
import kotlin.script.experimental.host.createEvaluationConfigurationFromTemplate
|
import kotlin.script.experimental.host.createEvaluationConfigurationFromTemplate
|
||||||
import kotlin.script.experimental.jvm.impl.createScriptFromClassLoader
|
import kotlin.script.experimental.jvm.impl.createScriptFromClassLoader
|
||||||
|
|
||||||
@@ -17,10 +14,12 @@ import kotlin.script.experimental.jvm.impl.createScriptFromClassLoader
|
|||||||
fun runCompiledScript(scriptClass: Class<*>, vararg args: String) {
|
fun runCompiledScript(scriptClass: Class<*>, vararg args: String) {
|
||||||
val script = createScriptFromClassLoader(scriptClass.name, scriptClass.classLoader)
|
val script = createScriptFromClassLoader(scriptClass.name, scriptClass.classLoader)
|
||||||
val evaluator = BasicJvmScriptEvaluator()
|
val evaluator = BasicJvmScriptEvaluator()
|
||||||
|
val hostConfiguration = script.compilationConfiguration[ScriptCompilationConfiguration.hostConfiguration]
|
||||||
|
?: defaultJvmScriptingHostConfiguration
|
||||||
val baseEvaluationConfiguration =
|
val baseEvaluationConfiguration =
|
||||||
createEvaluationConfigurationFromTemplate(
|
createEvaluationConfigurationFromTemplate(
|
||||||
script.compilationConfiguration[ScriptCompilationConfiguration.baseClass]!!,
|
script.compilationConfiguration[ScriptCompilationConfiguration.baseClass]!!,
|
||||||
defaultJvmScriptingHostConfiguration,
|
hostConfiguration,
|
||||||
scriptClass.kotlin
|
scriptClass.kotlin
|
||||||
)
|
)
|
||||||
val evaluationConfiguration = ScriptEvaluationConfiguration(baseEvaluationConfiguration) {
|
val evaluationConfiguration = ScriptEvaluationConfiguration(baseEvaluationConfiguration) {
|
||||||
|
|||||||
Reference in New Issue
Block a user