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

Move scripting support classes to the scripting compiler impl module

Browse Source 
Original commit: a65dafc37d
This commit is contained in:
Ilya Chernikov
2019-02-26 15:38:01 +01:00
parent e6fbfcb35b
commit 0baf2dbfc5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt
+3 -3
View File
@@ -26,6 +26,7 @@ import java.io.PrintStream
import java.lang.ref.SoftReference import java.lang.ref.SoftReference
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR
import org.jetbrains.kotlin.utils.KotlinPathsFromBaseDirectory
import org.jetbrains.kotlin.utils.SmartList import org.jetbrains.kotlin.utils.SmartList
object CompilerRunnerUtil { object CompilerRunnerUtil {
@@ -114,10 +115,9 @@ object CompilerRunnerUtil {
environment: JpsCompilerEnvironment, environment: JpsCompilerEnvironment,
fn: (ClassLoader) -> T fn: (ClassLoader) -> T
): T? { ): T? {
val paths = SmartList<File>()
val libPath = getLibPath(environment.kotlinPaths, environment.messageCollector) ?: return null 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) } jdkToolsJar?.let { paths.add(it) }
val classLoader = getOrCreateClassLoader(environment, paths) val classLoader = getOrCreateClassLoader(environment, paths)