Implement simplified property bag dsl:
move it to the separate jar, use property bag chaining
This commit is contained in:
+2
-1
@@ -38,7 +38,8 @@ class BridgeDependenciesResolver(
|
||||
val processedScriptData =
|
||||
ProcessedScriptData(ProcessedScriptDataParams.annotations to scriptContents.annotations)
|
||||
|
||||
val scriptCompilerConfiguration = baseScriptCompilerConfiguration.cloneWith(
|
||||
val scriptCompilerConfiguration = ChainedPropertyBag(
|
||||
baseScriptCompilerConfiguration,
|
||||
ScriptCompileConfigurationParams.scriptSourceFragments to scriptContents.toScriptSourceFragments()
|
||||
)
|
||||
|
||||
|
||||
+3
-9
@@ -8,16 +8,10 @@ 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
|
||||
|
||||
inline fun jvmConfigWithJavaHome(
|
||||
from: ChainedPropertyBag = ChainedPropertyBag(),
|
||||
crossinline body: JvmScriptCompileConfigurationParams.Builder.() -> Unit = {}
|
||||
) =
|
||||
jvmScriptConfiguration(from) {
|
||||
javaHomeDir(File(System.getProperty("java.home")))
|
||||
body()
|
||||
}
|
||||
val jvmJavaHomeParams = with(JvmScriptCompileConfigurationParams) {
|
||||
listOf(javaHomeDir to File(System.getProperty("java.home")))
|
||||
}
|
||||
|
||||
val ScriptCompilationConfigurator?.defaultConfiguration: ScriptCompileConfiguration
|
||||
get() = this?.let { runBlocking { defaultConfiguration } } ?: ScriptCompileConfiguration()
|
||||
@@ -6,19 +6,12 @@
|
||||
package kotlin.script.experimental.jvm
|
||||
|
||||
import java.io.File
|
||||
import kotlin.script.experimental.api.*
|
||||
import kotlin.script.experimental.api.ScriptDependency
|
||||
import kotlin.script.experimental.api.typedKey
|
||||
|
||||
object JvmScriptCompileConfigurationParams {
|
||||
val javaHomeDir by typedKey<File>()
|
||||
|
||||
open class Builder : ScriptCompileConfigurationParams.Builder() {
|
||||
fun dependencies(vararg classpath: Iterable<File>) =
|
||||
add(ScriptCompileConfigurationParams.dependencies to classpath.map(::JvmDependency))
|
||||
}
|
||||
}
|
||||
|
||||
inline fun jvmScriptConfiguration(from: ChainedPropertyBag = ChainedPropertyBag(), body: JvmScriptCompileConfigurationParams.Builder.() -> Unit) =
|
||||
JvmScriptCompileConfigurationParams.Builder().build(from, body)
|
||||
|
||||
class JvmDependency(val classpath: Iterable<File>) : ScriptDependency
|
||||
|
||||
|
||||
@@ -7,7 +7,9 @@
|
||||
|
||||
package kotlin.script.experimental.jvm
|
||||
|
||||
import kotlin.script.experimental.api.*
|
||||
import kotlin.script.experimental.api.ScriptCompilationConfigurator
|
||||
import kotlin.script.experimental.api.ScriptEvaluator
|
||||
import kotlin.script.experimental.api.typedKey
|
||||
import kotlin.script.experimental.host.BasicScriptingHost
|
||||
|
||||
open class JvmBasicScriptingHost<ScriptBase : Any>(
|
||||
@@ -16,11 +18,6 @@ open class JvmBasicScriptingHost<ScriptBase : Any>(
|
||||
evaluator: ScriptEvaluator<ScriptBase>
|
||||
) : BasicScriptingHost<ScriptBase>(configurationExtractor, compiler, evaluator)
|
||||
|
||||
class JvmScriptEvaluationEnvironmentParams : ScriptEvaluationEnvironmentParams() {
|
||||
companion object {
|
||||
val baseClassLoader by typedKey<ClassLoader?>()
|
||||
}
|
||||
object JvmScriptEvaluationEnvironmentParams {
|
||||
val baseClassLoader by typedKey<ClassLoader?>()
|
||||
}
|
||||
|
||||
inline fun jvmScriptEvaluationEnvironment(from: ChainedPropertyBag = ChainedPropertyBag(), body: JvmScriptEvaluationEnvironmentParams.() -> Unit) =
|
||||
JvmScriptEvaluationEnvironmentParams().build(from, body)
|
||||
|
||||
Reference in New Issue
Block a user