Change jvm implementation after adding configuration dsl

libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfigurationParams.kt

@@ -36,8 +36,7 @@ object ScriptCompileConfigurationParams {
 }
 
 // DSL
-inline
+inline fun scriptConfiguration(from: HeterogeneousMap = HeterogeneousMap(), body: ScriptCompileConfigurationParams.Builder.() -> Unit) =
-fun scriptConfiguration(from: HeterogeneousMap = HeterogeneousMap(), body: ScriptCompileConfigurationParams.Builder.() -> Unit) =
     ScriptCompileConfigurationParams.Builder().build(from, body)
 
 

libraries/scripting/common/src/kotlin/script/experimental/api/scriptEvaluation.kt

@@ -19,8 +19,7 @@ open class ScriptEvaluationEnvironmentParams : HeterogeneousMapBuilder() {
     }
 }
 
-inline
+inline fun scriptEvaluationEnvironment(from: HeterogeneousMap = HeterogeneousMap(), body: ScriptEvaluationEnvironmentParams.() -> Unit) =
-fun scriptEvaluationEnvironment(from: HeterogeneousMap = HeterogeneousMap(), body: ScriptEvaluationEnvironmentParams.() -> Unit) =
     ScriptEvaluationEnvironmentParams().build(from, body)
 
 typealias ScriptEvaluationEnvironment = HeterogeneousMap

libraries/scripting/common/src/kotlin/script/experimental/api/scriptProcessedDataParams.kt

@@ -13,6 +13,5 @@ class ProcessedScriptDataParams : HeterogeneousMapBuilder() {
     }
 }
 
-inline
+inline fun processedScriptData(from: HeterogeneousMap = HeterogeneousMap(), body: ProcessedScriptDataParams.() -> Unit) =
-fun processedScriptData(from: HeterogeneousMap = HeterogeneousMap(), body: ProcessedScriptDataParams.() -> Unit) =
     ProcessedScriptDataParams().build(from, body)

libraries/scripting/common/src/kotlin/script/experimental/api/scriptUtil.kt

@@ -44,8 +44,7 @@ open class HeterogeneousMapBuilder {
     }
 }
 
-inline
+inline fun <T : HeterogeneousMapBuilder> T.build(from: HeterogeneousMap = HeterogeneousMap(), body: T.() -> Unit): HeterogeneousMap {
-fun <T : HeterogeneousMapBuilder> T.build(from: HeterogeneousMap = HeterogeneousMap(), body: T.() -> Unit): HeterogeneousMap {
     body()
     return HeterogeneousMap(from, pairs)
 }

libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptConfiguration.kt

@@ -8,12 +8,16 @@ package kotlin.script.experimental.jvm
 import kotlinx.coroutines.experimental.runBlocking
 import kotlin.script.experimental.api.*
 import java.io.File
+import kotlin.script.experimental.jvm.JvmScriptCompileConfigurationParams.javaHomeDir
 
-fun jvmConfigWithJavaHome(vararg params: Pair<TypedKey<*>, Any?>): ScriptCompileConfiguration =
+inline fun jvmConfigWithJavaHome(
-    ScriptCompileConfiguration(
+    from: HeterogeneousMap = HeterogeneousMap(),
-        JvmScriptCompileConfigurationParams.javaHomeDir to File(System.getProperty("java.home")),
+    crossinline body: JvmScriptCompileConfigurationParams.Builder.() -> Unit = {}
-        *params
+) =
-    )
+    jvmScriptConfiguration(from) {
+        javaHomeDir(File(System.getProperty("java.home")))
+        body()
+    }
 
 val ScriptConfigurator?.defaultConfiguration: ScriptCompileConfiguration
     get() = this?.let { runBlocking { baseConfiguration(null) } }?.resultOrNull() ?: ScriptCompileConfiguration()

libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptData.kt

@@ -6,13 +6,19 @@
 package kotlin.script.experimental.jvm
 
 import java.io.File
-import kotlin.script.experimental.api.ScriptDependency
+import kotlin.script.experimental.api.*
-import kotlin.script.experimental.api.TypedKey
 
 object JvmScriptCompileConfigurationParams {
+    val javaHomeDir by typedKey<File>()
 
-    val javaHomeDir = TypedKey<File>("javaHomeDir")
+    open class Builder : ScriptCompileConfigurationParams.Builder() {
+        fun dependencies(vararg classpath: Iterable<File>) =
+            add(ScriptCompileConfigurationParams.dependencies to classpath.map(::JvmDependency))
+    }
 }
 
-class JvmDependency(val classpath: Iterable<File>): ScriptDependency
+inline fun jvmScriptConfiguration(from: HeterogeneousMap = HeterogeneousMap(), body: JvmScriptCompileConfigurationParams.Builder.() -> Unit) =
+    JvmScriptCompileConfigurationParams.Builder().build(from, body)
+
+class JvmDependency(val classpath: Iterable<File>) : ScriptDependency
 

libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptEvaluation.kt

@@ -7,9 +7,7 @@
 
 package kotlin.script.experimental.jvm
 
-import kotlin.script.experimental.api.ScriptConfigurator
+import kotlin.script.experimental.api.*
-import kotlin.script.experimental.api.ScriptRunner
-import kotlin.script.experimental.api.typedKey
 import kotlin.script.experimental.host.BasicScriptingHost
 
 open class JvmBasicScriptingHost<ScriptBase : Any>(
@@ -18,6 +16,11 @@ open class JvmBasicScriptingHost<ScriptBase : Any>(
     runner: ScriptRunner<ScriptBase>
 ) : BasicScriptingHost<ScriptBase>(configurationExtractor, compiler, runner)
 
-object JvmScriptEvaluationEnvironmentParams {
+class JvmScriptEvaluationEnvironmentParams : ScriptEvaluationEnvironmentParams() {
-    val baseClassLoader by typedKey<ClassLoader?>()
+    companion object {
+        val baseClassLoader by typedKey<ClassLoader?>()
+    }
 }
+
+inline fun jvmScriptEvaluationEnvironment(from: HeterogeneousMap = HeterogeneousMap(), body: JvmScriptEvaluationEnvironmentParams.() -> Unit) =
+    JvmScriptEvaluationEnvironmentParams().build(from, body)