Fixes after refactoring the API

This commit is contained in:
Ilya Chernikov
2018-03-26 19:38:16 +02:00
parent 1f0cac50d2
commit ae2af238fa
13 changed files with 63 additions and 54 deletions
@@ -25,12 +25,14 @@ inline fun myJvmConfig(
fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
val scriptCompiler = JvmScriptCompiler(KJVMCompilerImpl(), DummyCompiledJvmScriptCache())
val scriptDefinition = ScriptDefinitionFromAnnotatedBaseClass(MyScript::class)
val scriptDefinition = ScriptDefinitionFromAnnotatedBaseClass(
ScriptingEnvironment(ScriptingEnvironmentParams.baseClass to MyScript::class)
)
val host = JvmBasicScriptingHost(
scriptDefinition.configurator,
scriptDefinition.compilationConfigurator,
scriptCompiler,
scriptDefinition.runner
scriptDefinition.evaluator
)
return host.eval(myJvmConfig { add(scriptFile.toScriptSource().toConfigEntry()) }, ScriptEvaluationEnvironment())
@@ -6,11 +6,11 @@
package org.jetbrains.kotlin.script.examples.jvm.simple
import kotlin.script.experimental.annotations.KotlinScript
import kotlin.script.experimental.basic.DefaultScriptSelector
import kotlin.script.experimental.basic.PassThroughConfigurator
import kotlin.script.experimental.jvm.runners.BasicJvmScriptRunner
import kotlin.script.experimental.annotations.KotlinScriptEvaluator
import kotlin.script.experimental.jvm.runners.BasicJvmScriptEvaluator
@KotlinScript(DefaultScriptSelector::class, PassThroughConfigurator::class, BasicJvmScriptRunner::class)
@KotlinScript
@KotlinScriptEvaluator(BasicJvmScriptEvaluator::class)
abstract class MyScript {
// abstract fun body(vararg args: String): Int
}