From b471ed1bbabffcd8181787c5fe30815d39bdc0f0 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 19 Dec 2016 15:36:59 +0300 Subject: [PATCH] Run kapt with daemon Original commit: 69d1ee7b11200428f187d9329d2f0c16becfeabf --- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 2cfb0394f2d..c31cd3dfcf5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.daemon.common.CompilerId import org.jetbrains.kotlin.daemon.common.isDaemonEnabled import org.jetbrains.kotlin.jps.build.KotlinBuilder import java.io.ByteArrayOutputStream @@ -138,10 +139,11 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { if (jpsDaemonConnection == null) { val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, environment.messageCollector) val compilerPath = File(libPath, "kotlin-compiler.jar") + val compilerId = CompilerId.makeCompilerId(compilerPath) val flagFile = File.createTempFile("kotlin-compiler-jps-session-", "-is-running").apply { deleteOnExit() } - newDaemonConnection(compilerPath, flagFile, environment) + newDaemonConnection(compilerId, flagFile, environment) } return jpsDaemonConnection!! }