Skip to content

Commit 82502e1

Browse files
committed
Fix compilation of kotlin-script-util
Compilation was broken in 46a01ec
1 parent 527ccaf commit 82502e1

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineFactoryExamples.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.script.util.classpathFromClass
2626
import org.jetbrains.kotlin.script.util.classpathFromClassloader
2727
import org.jetbrains.kotlin.script.util.classpathFromClasspathProperty
2828
import org.jetbrains.kotlin.script.util.manifestClassPath
29-
import org.jetbrains.kotlin.utils.PathUtil.*
29+
import org.jetbrains.kotlin.utils.PathUtil
3030
import java.io.File
3131
import java.io.FileNotFoundException
3232
import 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

6568
private fun File.existsOrNull(): File? = existsAndCheckOrNull { true }
6669
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 {
103106
private 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

109112
private 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

115118
private val kotlinScriptStandardJars by lazy { listOf(kotlinStdlibJar, kotlinScriptRuntimeJar) }
116-
117-

0 commit comments

Comments
 (0)