From 7bbbd354376e0c40163cebde12c840d2f5043b1e Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 28 Aug 2015 14:18:39 +0200 Subject: [PATCH] Refactoring after review Original commit: 9bee97e810fb7aedcda233391fb6d3d76ebe35ed --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index c5460c78d48..3f62f14e35b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.compilerRunner; -import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; @@ -136,9 +135,9 @@ public class KotlinCompilerRunner { // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler CompilerId compilerId = CompilerId.makeCompilerId(new File(libPath, "kotlin-compiler.jar")); DaemonOptions daemonOptions = RmiPackage.configureDaemonOptions(); - DaemonLaunchingOptions daemonLaunchingOptions = RmiPackage.configureDaemonLaunchingOptions(true); + DaemonJVMOptions daemonJVMOptions = RmiPackage.configureDaemonLaunchingOptions(true); // TODO: find proper stream to report daemon connection progress - CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonLaunchingOptions, daemonOptions, System.out, true, true); + CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, System.out, true, true); if (daemon != null) { Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, out); return res.toString();