azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change samples after adding configuration dsl

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
libraries/examples/scripting/jvm-maven-deps/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host.kt
+16 -14
View File
@@ -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) {
libraries/examples/scripting/jvm-simple-script/src/org/jetbrains/kotlin/script/examples/jvm/simple/host.kt
+9 -10
View File
@@ -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) {