Fix multiproject Gradle IC with daemon

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/IncrementalCompilationServicesFacade.kt

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.daemon.common
 
 import java.io.File
+import java.io.Serializable
 import java.rmi.Remote
 import java.rmi.RemoteException
 
@@ -53,4 +54,19 @@ interface IncrementalCompilationServicesFacade : Remote {
 
     @Throws(RemoteException::class)
     fun revert()
+
+    // ChangesRegistry
+    @Throws(RemoteException::class)
+    fun registerChanges(timestamp: Long, dirtyData: SimpleDirtyData)
+
+    @Throws(RemoteException::class)
+    fun unknownChanges(timestamp: Long)
+
+    @Throws(RemoteException::class)
+    fun getChanges(artifact: File, sinceTS: Long): Iterable<SimpleDirtyData>?
 }
+
+class SimpleDirtyData(
+        val dirtyLookupSymbols: List<String>,
+        val dirtyClassesFqNames: List<String>
+) : Serializable

compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt

@@ -36,7 +36,10 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.config.IncrementalCompilation
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.daemon.common.*
+import org.jetbrains.kotlin.daemon.incremental.*
 import org.jetbrains.kotlin.incremental.*
+import org.jetbrains.kotlin.incremental.multiproject.ArtifactChangesProvider
+import org.jetbrains.kotlin.incremental.multiproject.ChangesRegistry
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
 import org.jetbrains.kotlin.modules.Module
 import org.jetbrains.kotlin.name.FqName
@@ -355,12 +358,16 @@ class CompileServiceImpl(
                 ChangedFiles.Unknown()
             }
 
+            val artifactChanges = RemoteArtifactChangesProvider(servicesFacade)
+            val changesRegistry = RemoteChangesRegostry(servicesFacade)
+
             val workingDir = servicesFacade.workingDir()
             val versions = commonCacheVersions(workingDir) + standaloneCacheVersion(workingDir, forceEnable = true)
 
             try {
                 printStream.print(renderer.renderPreamble())
-                IncrementalJvmCompilerRunner(workingDir, javaSourceRoots, versions, reporter, annotationFileUpdater)
+                IncrementalJvmCompilerRunner(workingDir, javaSourceRoots, versions, reporter, annotationFileUpdater,
+                                             artifactChanges, changesRegistry)
                         .compile(allKotlinFiles, k2jvmArgs, messageCollector, { changedFiles })
             }
             finally {

compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/RemoteAnnotationsFileUpdater.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.daemon
+package org.jetbrains.kotlin.daemon.incremental
 
 import org.jetbrains.kotlin.annotation.AnnotationFileUpdater
 import org.jetbrains.kotlin.cli.common.ExitCode

compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/RemoteArtifactChangesProvider.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.daemon.incremental
+
+import org.jetbrains.kotlin.daemon.common.IncrementalCompilationServicesFacade
+import org.jetbrains.kotlin.incremental.DirtyData
+import org.jetbrains.kotlin.incremental.multiproject.ArtifactChangesProvider
+import java.io.File
+
+class RemoteArtifactChangesProvider(private val servicesFacade: IncrementalCompilationServicesFacade) : ArtifactChangesProvider {
+    override fun getChanges(artifact: File, sinceTS: Long): Iterable<DirtyData>? =
+            servicesFacade.getChanges(artifact, sinceTS)?.map { it.toDirtyData() }
+}

compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/RemoteChangesRegostry.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.daemon.incremental
+
+import org.jetbrains.kotlin.daemon.common.IncrementalCompilationServicesFacade
+import org.jetbrains.kotlin.incremental.DirtyData
+import org.jetbrains.kotlin.incremental.multiproject.ChangesRegistry
+
+internal class RemoteChangesRegostry(private val servicesFacade: IncrementalCompilationServicesFacade) : ChangesRegistry {
+    override fun unknownChanges(timestamp: Long) {
+        servicesFacade.unknownChanges(timestamp)
+    }
+
+    override fun registerChanges(timestamp: Long, dirtyData: DirtyData) {
+        servicesFacade.registerChanges(timestamp, dirtyData.toSimpleDirtyData())
+    }
+}

compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/RemoteICReporter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.daemon
+package org.jetbrains.kotlin.daemon.incremental
 
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.daemon.common.IncrementalCompilationServicesFacade

compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/dirtyDataUtils.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.daemon.incremental
+
+import org.jetbrains.kotlin.daemon.common.SimpleDirtyData
+import org.jetbrains.kotlin.incremental.DirtyData
+import org.jetbrains.kotlin.incremental.LookupSymbol
+import org.jetbrains.kotlin.name.FqName
+
+fun SimpleDirtyData.toDirtyData(): DirtyData {
+    val dirtyClassesFqNames = dirtyClassesFqNames.map(::FqName)
+    val dirtyLookupSymbols = dirtyLookupSymbols.map {
+        LookupSymbol(scope = it.substringBeforeLast("."), name = it.substringAfterLast("."))
+    }
+    return DirtyData(dirtyLookupSymbols, dirtyClassesFqNames)
+}
+
+fun DirtyData.toSimpleDirtyData(): SimpleDirtyData {
+    return SimpleDirtyData(dirtyClassesFqNames = dirtyClassesFqNames.map(FqName::asString),
+                           dirtyLookupSymbols = dirtyLookupSymbols.map { "${it.scope}.${it.name}" })
+}