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

Replace kotlin general runtime with script runtime in JSR223 sample factories, fixes tests

Browse Source
This commit is contained in:
Ilya Chernikov
2016-12-01 17:47:42 +01:00
parent 83420e26b6
commit c01959333a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineFactoryExamples.kt
+9 -4
View File
@@ -33,7 +33,7 @@ class KotlinJsr223JvmLocalScriptEngineFactory : KotlinJsr223JvmScriptEngineFacto
KotlinJsr223JvmLocalScriptEngine( KotlinJsr223JvmLocalScriptEngine(
Disposer.newDisposable(), Disposer.newDisposable(),
this, this,
listOf(kotlinRuntimeJar), listOf(kotlinScriptRuntimeJar),
"kotlin.script.templates.standard.ScriptTemplateWithBindings", "kotlin.script.templates.standard.ScriptTemplateWithBindings",
{ ctx -> arrayOf(ctx.getBindings(ScriptContext.ENGINE_SCOPE)) }, { ctx -> arrayOf(ctx.getBindings(ScriptContext.ENGINE_SCOPE)) },
arrayOf(Map::class.java) arrayOf(Map::class.java)
@@ -47,7 +47,7 @@ class KotlinJsr223JvmDaemonLocalEvalScriptEngineFactory : KotlinJsr223JvmScriptE
Disposer.newDisposable(), Disposer.newDisposable(),
this, this,
kotlinCompilerJar, kotlinCompilerJar,
listOf(kotlinRuntimeJar), listOf(kotlinScriptRuntimeJar),
"kotlin.script.templates.standard.ScriptTemplateWithBindings", "kotlin.script.templates.standard.ScriptTemplateWithBindings",
{ ctx -> arrayOf(ctx.getBindings(ScriptContext.ENGINE_SCOPE)) }, { ctx -> arrayOf(ctx.getBindings(ScriptContext.ENGINE_SCOPE)) },
arrayOf(Map::class.java) arrayOf(Map::class.java)
@@ -61,7 +61,7 @@ class KotlinJsr223JvmDaemonRemoteEvalScriptEngineFactory : KotlinJsr223JvmScript
Disposer.newDisposable(), Disposer.newDisposable(),
this, this,
kotlinCompilerJar, kotlinCompilerJar,
listOf(kotlinRuntimeJar), listOf(kotlinScriptRuntimeJar),
"kotlin.script.templates.standard.ScriptTemplateWithBindings", "kotlin.script.templates.standard.ScriptTemplateWithBindings",
::makeSerializableArgumentsForTemplateWithBindings, ::makeSerializableArgumentsForTemplateWithBindings,
arrayOf(Map::class.java) arrayOf(Map::class.java)
@@ -85,5 +85,10 @@ private val kotlinCompilerJar = System.getProperty("kotlin.compiler.jar")?.let(:
private val kotlinRuntimeJar = System.getProperty("kotlin.java.runtime.jar")?.let(::File)?.existsOrNull() private val kotlinRuntimeJar = System.getProperty("kotlin.java.runtime.jar")?.let(::File)?.existsOrNull()
?: kotlinCompilerJar.let { File(it.parentFile, KOTLIN_JAVA_RUNTIME_JAR) }.existsOrNull() ?: kotlinCompilerJar.let { File(it.parentFile, KOTLIN_JAVA_RUNTIME_JAR) }.existsOrNull()
?: getResourcePathForClass(ScriptTemplateWithArgs::class.java).existsOrNull() ?: getResourcePathForClass(JvmStatic::class.java).existsOrNull()
?: throw FileNotFoundException("Cannot find kotlin runtime jar, set kotlin.java.runtime.jar property to proper location") ?: throw FileNotFoundException("Cannot find kotlin runtime jar, set kotlin.java.runtime.jar property to proper location")
private val kotlinScriptRuntimeJar = System.getProperty("kotlin.script.runtime.jar")?.let(::File)?.existsOrNull()
?: kotlinCompilerJar.let { File(it.parentFile, KOTLIN_JAVA_SCRIPT_RUNTIME_JAR) }.existsOrNull()
?: getResourcePathForClass(ScriptTemplateWithArgs::class.java).existsOrNull()
?: throw FileNotFoundException("Cannot find kotlin script runtime jar, set kotlin.script.runtime.jar property to proper location")