From ba5795519bf0e1e25239514b16dccf1be02c0c72 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Thu, 25 Oct 2018 06:00:03 +0300
Subject: [PATCH] Minor: move compile iteration result to daemon common

The class is used on both server and client, but it was defined in
server module.
Gradle plugin worked, because all classes are present in kotlin compiler
embeddable, but the code was red in IDE (which is correct because
Gradle plugin does not depend on daemon server module).
---
 .../daemon/common/CompileIterationResult.kt   | 20 +++++++++++++++++++
 .../kotlin/daemon/report/RemoteICReporter.kt  | 15 +++-----------
 .../GradleCompilationResults.kt               |  2 +-
 3 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileIterationResult.kt

diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileIterationResult.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileIterationResult.kt
new file mode 100644
index 00000000000..eeeaa4bf0c9
--- /dev/null
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileIterationResult.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.daemon.common
+
+import java.io.File
+import java.io.Serializable
+
+class CompileIterationResult(
+    @Suppress("unused") // used in Gradle
+        val sourceFiles: Iterable<File>,
+    @Suppress("unused") // used in Gradle
+        val exitCode: String
+) : Serializable {
+    companion object {
+        const val serialVersionUID: Long = 0
+    }
+}
\ No newline at end of file
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt
index b0862a62de5..3efae0f592e 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.daemon.common.*
 import org.jetbrains.kotlin.incremental.ICReporter
 import java.io.File
-import java.io.Serializable
 
 internal class RemoteICReporter(
         private val servicesFacade: CompilerServicesFacadeBase,
@@ -39,18 +38,10 @@ internal class RemoteICReporter(
 
     override fun reportCompileIteration(sourceFiles: Collection<File>, exitCode: ExitCode) {
         if (shouldReportCompileIteration) {
-            compilationResults.add(CompilationResultCategory.IC_COMPILE_ITERATION.code, CompileIterationResult(sourceFiles, exitCode.toString()))
+            compilationResults.add(CompilationResultCategory.IC_COMPILE_ITERATION.code,
+                                   CompileIterationResult(sourceFiles, exitCode.toString())
+            )
         }
     }
 }
 
-class CompileIterationResult(
-        @Suppress("unused") // used in Gradle
-        val sourceFiles: Iterable<File>,
-        @Suppress("unused") // used in Gradle
-        val exitCode: String
-) : Serializable {
-    companion object {
-        const val serialVersionUID: Long = 0
-    }
-}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt
index 46745fbafec..c89d24949fe 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.daemon.common.CompilationResultCategory
 import org.jetbrains.kotlin.daemon.common.CompilationResults
 import org.jetbrains.kotlin.daemon.common.LoopbackNetworkInterface
 import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT
-import org.jetbrains.kotlin.daemon.report.CompileIterationResult
+import org.jetbrains.kotlin.daemon.common.CompileIterationResult
 import org.jetbrains.kotlin.gradle.plugin.kotlinDebug
 import org.jetbrains.kotlin.gradle.utils.pathsAsStringRelativeTo
 import java.io.Serializable