From 34569071b3dbd42441454a82e9a4abbbbf69fbea Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 6 Sep 2018 12:54:52 +0200 Subject: [PATCH] [minor] rename function --- .../kotlin/script/examples/jvm/resolve/maven/host/host.kt | 4 ++-- .../kotlin/script/examples/jvm/simple/host/host.kt | 4 ++-- .../script/experimental/jvmhost/BasicJvmScriptingHost.kt | 2 +- .../script/experimental/jvmhost/test/ScriptingHostTest.kt | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/examples/scripting/jvm-maven-deps/host/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host/host.kt b/libraries/examples/scripting/jvm-maven-deps/host/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host/host.kt index dda4000cf83..bd09baf9244 100644 --- a/libraries/examples/scripting/jvm-maven-deps/host/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host/host.kt +++ b/libraries/examples/scripting/jvm-maven-deps/host/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host/host.kt @@ -11,11 +11,11 @@ import kotlin.script.experimental.api.EvaluationResult import kotlin.script.experimental.api.ResultWithDiagnostics import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost -import kotlin.script.experimental.jvmhost.createCompilationConfigurationFromTemplate +import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate fun evalFile(scriptFile: File): ResultWithDiagnostics { - val compilationConfiguration = createCompilationConfigurationFromTemplate() + val compilationConfiguration = createJvmCompilationConfigurationFromTemplate() return BasicJvmScriptingHost().eval(scriptFile.toScriptSource(), compilationConfiguration, null) } diff --git a/libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt b/libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt index 539daff7580..677753aa889 100644 --- a/libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt +++ b/libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt @@ -13,10 +13,10 @@ import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.jvm.dependenciesFromCurrentContext import kotlin.script.experimental.jvm.jvm import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost -import kotlin.script.experimental.jvmhost.createCompilationConfigurationFromTemplate +import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate fun evalFile(scriptFile: File): ResultWithDiagnostics { - val compilationConfiguration = createCompilationConfigurationFromTemplate { + val compilationConfiguration = createJvmCompilationConfigurationFromTemplate { jvm { dependenciesFromCurrentContext( "scripting-jvm-simple-script" /* script library jar name */ diff --git a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/BasicJvmScriptingHost.kt b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/BasicJvmScriptingHost.kt index d113a09a25a..03c458b5b15 100644 --- a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/BasicJvmScriptingHost.kt +++ b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/BasicJvmScriptingHost.kt @@ -20,7 +20,7 @@ open class BasicJvmScriptingHost( ) : BasicScriptingHost(compiler, evaluator) -inline fun createCompilationConfigurationFromTemplate( +inline fun createJvmCompilationConfigurationFromTemplate( hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingHostConfiguration, noinline body: ScriptCompilationConfiguration.Builder.() -> Unit = {} ): ScriptCompilationConfiguration = createCompilationConfigurationFromTemplate( diff --git a/libraries/scripting/jvm-host/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt b/libraries/scripting/jvm-host/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt index c185a538f5f..61ca73fcf7f 100644 --- a/libraries/scripting/jvm-host/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt +++ b/libraries/scripting/jvm-host/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt @@ -67,7 +67,7 @@ class ScriptingHostTest { val host = BasicJvmScriptingHost(compiler = compiler, evaluator = evaluator) Assert.assertTrue(cache.baseDir.listFiles().isEmpty()) - val scriptCompilationConfiguration = createCompilationConfigurationFromTemplate() + val scriptCompilationConfiguration = createJvmCompilationConfigurationFromTemplate() var compiledScript: CompiledScript<*>? = null val output = captureOut { @@ -110,7 +110,7 @@ class ScriptingHostTest { @Test fun testCompiledScriptClassLoader() { val script = "val x = 1" - val scriptCompilationConfiguration = createCompilationConfigurationFromTemplate() + val scriptCompilationConfiguration = createJvmCompilationConfigurationFromTemplate() val compiler = JvmScriptCompiler(defaultJvmScriptingHostConfiguration) val compiledScript = runBlocking { val res = compiler(script.toScriptSource(), scriptCompilationConfiguration).throwOnFailure() @@ -147,7 +147,7 @@ fun ResultWithDiagnostics<*>.throwOnFailure(): ResultWithDiagnostics<*> = apply } private fun evalScript(script: String, host: BasicScriptingHost = BasicJvmScriptingHost()) { - val compilationConfiguration = createCompilationConfigurationFromTemplate() + val compilationConfiguration = createJvmCompilationConfigurationFromTemplate() host.eval(script.toScriptSource(), compilationConfiguration, null).throwOnFailure() }