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

Fix runtime compatibility with the obsolete script jvm eval config options...

Browse Source 
also switch mainKtsTest to the mew option
This commit is contained in:
Ilya Chernikov
2019-04-18 13:01:50 +02:00
parent 00c3550191
commit 9900ac2462
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/obsoleteJvmScriptEvaluation.kt
+7 -4
View File
@@ -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()
libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt
+2 -2
View File
@@ -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<EvaluationResult> {