Rename heterogeneous map to PropertyBag, make it chainable
the commit is needed to implement single chained script configuration bags
This commit is contained in:
+1
-1
@@ -11,7 +11,7 @@ import java.io.File
|
||||
import kotlin.script.experimental.jvm.JvmScriptCompileConfigurationParams.javaHomeDir
|
||||
|
||||
inline fun jvmConfigWithJavaHome(
|
||||
from: HeterogeneousMap = HeterogeneousMap(),
|
||||
from: ChainedPropertyBag = ChainedPropertyBag(),
|
||||
crossinline body: JvmScriptCompileConfigurationParams.Builder.() -> Unit = {}
|
||||
) =
|
||||
jvmScriptConfiguration(from) {
|
||||
|
||||
@@ -17,7 +17,7 @@ object JvmScriptCompileConfigurationParams {
|
||||
}
|
||||
}
|
||||
|
||||
inline fun jvmScriptConfiguration(from: HeterogeneousMap = HeterogeneousMap(), body: JvmScriptCompileConfigurationParams.Builder.() -> Unit) =
|
||||
inline fun jvmScriptConfiguration(from: ChainedPropertyBag = ChainedPropertyBag(), body: JvmScriptCompileConfigurationParams.Builder.() -> Unit) =
|
||||
JvmScriptCompileConfigurationParams.Builder().build(from, body)
|
||||
|
||||
class JvmDependency(val classpath: Iterable<File>) : ScriptDependency
|
||||
|
||||
@@ -22,5 +22,5 @@ class JvmScriptEvaluationEnvironmentParams : ScriptEvaluationEnvironmentParams()
|
||||
}
|
||||
}
|
||||
|
||||
inline fun jvmScriptEvaluationEnvironment(from: HeterogeneousMap = HeterogeneousMap(), body: JvmScriptEvaluationEnvironmentParams.() -> Unit) =
|
||||
inline fun jvmScriptEvaluationEnvironment(from: ChainedPropertyBag = ChainedPropertyBag(), body: JvmScriptEvaluationEnvironmentParams.() -> Unit) =
|
||||
JvmScriptEvaluationEnvironmentParams().build(from, body)
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ package kotlin.script.experimental.jvm.runners
|
||||
|
||||
import kotlin.script.experimental.api.*
|
||||
|
||||
open class BasicJvmScriptEvaluator<ScriptBase : Any>(val environment: ScriptingEnvironment) : ScriptEvaluator<ScriptBase> {
|
||||
open class BasicJvmScriptEvaluator<ScriptBase : Any>(val environment: ChainedPropertyBag) : ScriptEvaluator<ScriptBase> {
|
||||
|
||||
override suspend fun eval(
|
||||
compiledScript: CompiledScript<ScriptBase>,
|
||||
|
||||
Reference in New Issue
Block a user