Setup JDK roots and initialize JDK_HOME in common core environment

#KT-20167 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2017-09-12 11:34:07 +03:00
parent 6d26d1fb67
commit 6a1b6d10d8
11 changed files with 77 additions and 59 deletions
@@ -50,7 +50,6 @@ open class KotlinJvmReplService(
) : ReplCompileAction, ReplCheckAction, CreateReplStageStateAction {
protected val configuration = CompilerConfiguration().apply {
addJvmClasspathRoots(PathUtil.getJdkClassesRootsFromCurrentJre())
addJvmClasspathRoots(PathUtil.kotlinPathsForCompiler.let { listOf(it.stdlibPath, it.reflectPath, it.scriptRuntimePath) })
addJvmClasspathRoots(templateClasspath)
put(CommonConfigurationKeys.MODULE_NAME, "kotlin-script")