Reorganize dependencies around kotlin-compiler.jar

#KT-26807 Fixed
2018-12-12 11:51:25 +03:00
parent 30c769c19a
commit d5ebe2e66a
18 changed files with 98 additions and 31 deletions
@@ -70,7 +70,8 @@ class KotlinConsoleKeeper(val project: Project) {
            //paramList.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005")

            val kotlinPaths = PathUtil.kotlinPathsForIdeaPlugin
-            val replClassPath = listOf(kotlinPaths.compilerPath, kotlinPaths.reflectPath, kotlinPaths.stdlibPath, kotlinPaths.scriptRuntimePath)
+            val replClassPath =
+                (kotlinPaths.compilerClasspath + kotlinPaths.compilerPath)
                    .joinToString(File.pathSeparator) { it.absolutePath }

            paramList.add("-cp")