From 9900ac24621f758622a07492a319eaf42a00f352 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 18 Apr 2019 13:01:50 +0200 Subject: [PATCH] Fix runtime compatibility with the obsolete script jvm eval config options... also switch mainKtsTest to the mew option --- .../jvmhost/obsoleteJvmScriptEvaluation.kt | 11 +++++++---- .../org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/obsoleteJvmScriptEvaluation.kt b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/obsoleteJvmScriptEvaluation.kt index 499a0113b75..2f070bcfab7 100644 --- a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/obsoleteJvmScriptEvaluation.kt +++ b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/obsoleteJvmScriptEvaluation.kt @@ -11,22 +11,25 @@ import kotlin.script.experimental.api.ScriptEvaluationConfiguration import kotlin.script.experimental.api.ScriptEvaluationConfigurationKeys import kotlin.script.experimental.jvm.baseClassLoader import kotlin.script.experimental.jvm.jvm -import kotlin.script.experimental.util.PropertiesCollection @Deprecated("use the same definitions from kotlin.script.experimental.jvm package", level = DeprecationLevel.WARNING) -interface JvmScriptEvaluationConfigurationKeys +interface JvmScriptEvaluationConfigurationKeys : kotlin.script.experimental.jvm.JvmScriptEvaluationConfigurationKeys +@Suppress("DEPRECATION") @Deprecated("use the same definitions from kotlin.script.experimental.jvm package", level = DeprecationLevel.WARNING) -open class JvmScriptEvaluationConfigurationBuilder : PropertiesCollection.Builder(), JvmScriptEvaluationConfigurationKeys { +open class JvmScriptEvaluationConfigurationBuilder + : kotlin.script.experimental.jvm.JvmScriptEvaluationConfigurationBuilder(), JvmScriptEvaluationConfigurationKeys { companion object : JvmScriptEvaluationConfigurationBuilder() } +@Suppress("DEPRECATION") @Deprecated("use the same definitions from kotlin.script.experimental.jvm package", level = DeprecationLevel.ERROR) val JvmScriptEvaluationConfigurationKeys.baseClassLoader get() = ScriptEvaluationConfiguration.jvm.baseClassLoader +@Suppress("DEPRECATION") @Deprecated("use the same definitions from kotlin.script.experimental.jvm package", level = DeprecationLevel.ERROR) -val ScriptEvaluationConfigurationKeys.jvm get() = ScriptEvaluationConfiguration.jvm +val ScriptEvaluationConfigurationKeys.jvm get() = JvmScriptEvaluationConfigurationBuilder() @Deprecated("use the same definitions from kotlin.script.experimental.jvm package", level = DeprecationLevel.ERROR) open class BasicJvmScriptEvaluator : kotlin.script.experimental.jvm.BasicJvmScriptEvaluator() diff --git a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt index 5c0e8f70610..517e603f1c2 100644 --- a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt +++ b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt @@ -13,9 +13,9 @@ import java.io.PrintStream import kotlin.script.experimental.api.* import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost -import kotlin.script.experimental.jvmhost.baseClassLoader import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate -import kotlin.script.experimental.jvmhost.jvm +import kotlin.script.experimental.jvm.baseClassLoader +import kotlin.script.experimental.jvm.jvm fun evalFile(scriptFile: File): ResultWithDiagnostics {