Change samples after adding configuration dsl

This commit is contained in:
Ilya Chernikov
2018-03-02 19:06:11 +01:00
parent 0f0934aaa2
commit 1cb9592fcc
2 changed files with 25 additions and 24 deletions
@@ -24,15 +24,14 @@ val selfFile: File by lazy {
?: throw Exception("Unable to get path to the script base")
}
fun myJvmConfig(vararg params: Pair<TypedKey<*>, Any?>): ScriptCompileConfiguration =
jvmConfigWithJavaHome(
ScriptCompileConfigurationParams.scriptSignature to ScriptSignature(MyScript::class, ProvidedDeclarations.Empty),
ScriptCompileConfigurationParams.dependencies to listOf(
JvmDependency(listOf(stdlibFile)),
JvmDependency(listOf(selfFile))
),
*params
)
inline fun myJvmConfig(
from: HeterogeneousMap = HeterogeneousMap(),
crossinline body: JvmScriptCompileConfigurationParams.Builder.() -> Unit = {}
) = jvmConfigWithJavaHome(from) {
signature<MyScript>()
dependencies(listOf(stdlibFile), listOf(selfFile))
body()
}
fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
@@ -45,7 +44,7 @@ fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
scriptDefinition.runner
)
return host.eval(myJvmConfig(scriptFile.toScriptSource().toConfigEntry()), ScriptEvaluationEnvironment())
return host.eval(myJvmConfig { add(scriptFile.toScriptSource().toConfigEntry()) }, ScriptEvaluationEnvironment())
}
fun main(vararg args: String) {