From 0baf2dbfc57a539f563faff5b16dca5fba03294f Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 26 Feb 2019 15:38:01 +0100 Subject: [PATCH] Move scripting support classes to the scripting compiler impl module Original commit: a65dafc37d096aff094b953d5f2a47d6b795750a --- .../jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt index 6c736122f53..f603bec80e6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt @@ -26,6 +26,7 @@ import java.io.PrintStream import java.lang.ref.SoftReference import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR +import org.jetbrains.kotlin.utils.KotlinPathsFromBaseDirectory import org.jetbrains.kotlin.utils.SmartList object CompilerRunnerUtil { @@ -114,10 +115,9 @@ object CompilerRunnerUtil { environment: JpsCompilerEnvironment, fn: (ClassLoader) -> T ): T? { - val paths = SmartList() - val libPath = getLibPath(environment.kotlinPaths, environment.messageCollector) ?: return null - paths.add(File(libPath, "kotlin-compiler.jar")) + val kotlinPaths = KotlinPathsFromBaseDirectory(libPath) + val paths = kotlinPaths.classPath(KotlinPaths.ClassPaths.CompilerWithScripting).toMutableList() jdkToolsJar?.let { paths.add(it) } val classLoader = getOrCreateClassLoader(environment, paths)