From 1cb9592fcce6a76370c40ca37f32d2259f33c836 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 2 Mar 2018 19:06:11 +0100
Subject: [PATCH] Change samples after adding configuration dsl

---
 .../script/examples/jvm/resolve/maven/host.kt | 30 ++++++++++---------
 .../kotlin/script/examples/jvm/simple/host.kt | 19 ++++++------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host.kt b/libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host.kt
index 304649d1d8c..e8a7bb97e14 100644
--- a/libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host.kt
+++ b/libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host.kt
@@ -36,8 +36,8 @@ class MyConfigurator(val baseClass: KClass<Any>? = null) : ScriptConfigurator {
 
     private val resolver = FilesAndMavenResolver()
 
-    override suspend fun baseConfiguration(scriptSource: ScriptSource?) : ResultWithDiagnostics<ScriptCompileConfiguration> =
-        myJvmConfig(scriptSource.toConfigEntry()).asSuccess()
+    override suspend fun baseConfiguration(scriptSource: ScriptSource?): ResultWithDiagnostics<ScriptCompileConfiguration> =
+        myJvmConfig { add(scriptSource.toConfigEntry()) }.asSuccess()
 
     override suspend fun refineConfiguration(
         configuration: ScriptCompileConfiguration,
@@ -69,18 +69,20 @@ class MyConfigurator(val baseClass: KClass<Any>? = null) : ScriptConfigurator {
     }
 }
 
-fun myJvmConfig(vararg params: Pair<TypedKey<*>, Any?>): ScriptCompileConfiguration =
-    jvmConfigWithJavaHome(
-        ScriptCompileConfigurationParams.scriptSignature to ScriptSignature(MyScriptWithMavenDeps::class, ProvidedDeclarations()),
-        ScriptCompileConfigurationParams.importedPackages to listOf(DependsOn::class.qualifiedName!!, Repository::class.qualifiedName!!),
-        ScriptCompileConfigurationParams.dependencies to listOf(
-            JvmDependency(listOf(stdlibFile)),
-            JvmDependency(listOf(selfFile)),
-            JvmDependency(listOf(scriptUtilsJarFile))
-        ),
-        ScriptCompileConfigurationParams.updateConfigurationOnAnnotations to listOf(DependsOn::class, Repository::class),
-        *params
+inline fun myJvmConfig(
+    from: HeterogeneousMap = HeterogeneousMap(),
+    crossinline body: JvmScriptCompileConfigurationParams.Builder.() -> Unit = {}
+) = jvmConfigWithJavaHome(from) {
+    signature<MyScriptWithMavenDeps>()
+    ScriptCompileConfigurationParams.importedPackages(listOf(DependsOn::class.qualifiedName!!, Repository::class.qualifiedName!!))
+    dependencies(
+        listOf(stdlibFile),
+        listOf(selfFile),
+        listOf(scriptUtilsJarFile)
     )
+    ScriptCompileConfigurationParams.updateConfigurationOnAnnotations(listOf(DependsOn::class, Repository::class))
+    body()
+}
 
 fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
     val scriptCompiler = JvmScriptCompiler(KJVMCompilerImpl(), DummyCompiledJvmScriptCache())
@@ -92,7 +94,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) {
diff --git a/libraries/examples/scripting/jvm-simple-script/src/org/jetbrains/kotlin/script/examples/jvm/simple/host.kt b/libraries/examples/scripting/jvm-simple-script/src/org/jetbrains/kotlin/script/examples/jvm/simple/host.kt
index c47b98754e5..0da1fc3109c 100644
--- a/libraries/examples/scripting/jvm-simple-script/src/org/jetbrains/kotlin/script/examples/jvm/simple/host.kt
+++ b/libraries/examples/scripting/jvm-simple-script/src/org/jetbrains/kotlin/script/examples/jvm/simple/host.kt
@@ -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) {