@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.script.util.classpathFromClass
2626import org.jetbrains.kotlin.script.util.classpathFromClassloader
2727import org.jetbrains.kotlin.script.util.classpathFromClasspathProperty
2828import org.jetbrains.kotlin.script.util.manifestClassPath
29- import org.jetbrains.kotlin.utils.PathUtil.*
29+ import org.jetbrains.kotlin.utils.PathUtil
3030import java.io.File
3131import java.io.FileNotFoundException
3232import javax.script.Bindings
@@ -61,6 +61,9 @@ class KotlinJsr223JvmDaemonLocalEvalScriptEngineFactory : KotlinJsr223JvmScriptE
6161 )
6262}
6363
64+ private const val KOTLIN_COMPILER_JAR = " kotlin-compiler.jar"
65+ private const val KOTLIN_JAVA_STDLIB_JAR = " kotlin-stdlib.jar"
66+ private const val KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = " kotlin-script-runtime.jar"
6467
6568private fun File.existsOrNull (): File ? = existsAndCheckOrNull { true }
6669private inline fun File.existsAndCheckOrNull (check : (File .() -> Boolean )): File ? = if (exists() && check()) this else null
@@ -103,15 +106,13 @@ private val kotlinCompilerJar: File by lazy {
103106private val kotlinStdlibJar: File ? by lazy {
104107 System .getProperty(" kotlin.java.runtime.jar" )?.let (::File )?.existsOrNull()
105108 ? : kotlinCompilerJar.let { File (it.parentFile, KOTLIN_JAVA_STDLIB_JAR ) }.existsOrNull()
106- ? : getResourcePathForClass(JvmStatic ::class .java).existsOrNull()
109+ ? : PathUtil . getResourcePathForClass(JvmStatic ::class .java).existsOrNull()
107110}
108111
109112private val kotlinScriptRuntimeJar: File ? by lazy {
110113 System .getProperty(" kotlin.script.runtime.jar" )?.let (::File )?.existsOrNull()
111114 ? : kotlinCompilerJar.let { File (it.parentFile, KOTLIN_JAVA_SCRIPT_RUNTIME_JAR ) }.existsOrNull()
112- ? : getResourcePathForClass(ScriptTemplateWithArgs ::class .java).existsOrNull()
115+ ? : PathUtil . getResourcePathForClass(ScriptTemplateWithArgs ::class .java).existsOrNull()
113116}
114117
115118private val kotlinScriptStandardJars by lazy { listOf (kotlinStdlibJar, kotlinScriptRuntimeJar) }
116-
117-
0 commit comments