From f024f14c1ea5135f25b1a4b6070d0ff03d173b73 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 17 Jan 2017 19:10:55 +0300 Subject: [PATCH] Fix passing friend paths from Gradle to Kotlin daemon when compiling with IC --- .../src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt index 9345057d217..c2b9f6c7f55 100644 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt +++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt @@ -41,6 +41,7 @@ import org.jetbrains.kotlin.daemon.incremental.* import org.jetbrains.kotlin.daemon.report.* import org.jetbrains.kotlin.incremental.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents +import org.jetbrains.kotlin.modules.Module import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.utils.addToStdlib.check import org.jetbrains.kotlin.utils.stackTraceStr @@ -417,6 +418,7 @@ class CompileServiceImpl( } val javaSourceRoots = parsedModule.modules.flatMapTo(HashSet()) { it.getJavaSourceRoots().map { File(it.path) } } val allKotlinFiles = parsedModule.modules.flatMap { it.getSourceFiles().map(::File) } + k2jvmArgs.friendPaths = parsedModule.modules.flatMap(Module::getFriendPaths).toTypedArray() val changedFiles = if (incrementalCompilationOptions.areFileChangesKnown) { ChangedFiles.Known(incrementalCompilationOptions.modifiedFiles!!, incrementalCompilationOptions.deletedFiles!!)