From 82502e1a8b1c28b8b55937fa5887be1fb40b9e13 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 28 Jul 2017 19:26:35 +0300 Subject: [PATCH] Fix compilation of kotlin-script-util Compilation was broken in 46a01ec --- .../jsr223/KotlinJsr223ScriptEngineFactoryExamples.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineFactoryExamples.kt b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineFactoryExamples.kt index 115c9555465..cb0054ded24 100644 --- a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineFactoryExamples.kt +++ b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineFactoryExamples.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.script.util.classpathFromClass import org.jetbrains.kotlin.script.util.classpathFromClassloader import org.jetbrains.kotlin.script.util.classpathFromClasspathProperty import org.jetbrains.kotlin.script.util.manifestClassPath -import org.jetbrains.kotlin.utils.PathUtil.* +import org.jetbrains.kotlin.utils.PathUtil import java.io.File import java.io.FileNotFoundException import javax.script.Bindings @@ -61,6 +61,9 @@ class KotlinJsr223JvmDaemonLocalEvalScriptEngineFactory : KotlinJsr223JvmScriptE ) } +private const val KOTLIN_COMPILER_JAR = "kotlin-compiler.jar" +private const val KOTLIN_JAVA_STDLIB_JAR = "kotlin-stdlib.jar" +private const val KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar" private fun File.existsOrNull(): File? = existsAndCheckOrNull { true } private inline fun File.existsAndCheckOrNull(check: (File.() -> Boolean)): File? = if (exists() && check()) this else null @@ -103,15 +106,13 @@ private val kotlinCompilerJar: File by lazy { private val kotlinStdlibJar: File? by lazy { System.getProperty("kotlin.java.runtime.jar")?.let(::File)?.existsOrNull() ?: kotlinCompilerJar.let { File(it.parentFile, KOTLIN_JAVA_STDLIB_JAR) }.existsOrNull() - ?: getResourcePathForClass(JvmStatic::class.java).existsOrNull() + ?: PathUtil.getResourcePathForClass(JvmStatic::class.java).existsOrNull() } private val kotlinScriptRuntimeJar: File? by lazy { 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() + ?: PathUtil.getResourcePathForClass(ScriptTemplateWithArgs::class.java).existsOrNull() } private val kotlinScriptStandardJars by lazy { listOf(kotlinStdlibJar, kotlinScriptRuntimeJar) } - -