From d19a92bab54fc714e64493fbb9947dfd5318c453 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Thu, 29 Dec 2016 22:43:00 +0300
Subject: [PATCH] Make ICReporter interface

---
 .../src/org/jetbrains/kotlin/incremental/ICReporter.kt    | 8 ++++----
 .../kotlin/incremental/IncrementalJvmCompilerRunner.kt    | 2 +-
 .../KotlinStandaloneIncrementalCompilationTest.kt         | 2 +-
 .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt b/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt
index a96a53603e3..a4e2d769e84 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt
@@ -19,14 +19,14 @@ package org.jetbrains.kotlin.incremental
 import org.jetbrains.kotlin.cli.common.ExitCode
 import java.io.File
 
-abstract class ICReporter {
-    abstract fun report(message: ()->String)
+interface ICReporter {
+    fun report(message: ()->String)
 
     // used in Gradle plugin
     @Suppress("unused")
-    open fun reportCompileIteration(sourceFiles: Iterable<File>, exitCode: ExitCode) {}
+    fun reportCompileIteration(sourceFiles: Iterable<File>, exitCode: ExitCode) {}
 
-    open fun pathsAsString(files: Iterable<File>): String =
+    fun pathsAsString(files: Iterable<File>): String =
             files.map { it.canonicalPath }.joinToString()
 
     fun pathsAsString(vararg files: File): String =
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
index b8ad107fa38..ea562e88cf5 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
@@ -66,7 +66,7 @@ fun makeIncrementally(
     }
 }
 
-private object EmptyICReporter : ICReporter() {
+private object EmptyICReporter : ICReporter {
     override fun report(message: ()->String) {
     }
 }
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt
index 747ae2e24b1..15fa455f04e 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt
@@ -124,7 +124,7 @@ class KotlinStandaloneIncrementalCompilationTest : TestWithWorkingDir() {
         val compiledSources = arrayListOf<File>()
         var resultExitCode = ExitCode.OK
 
-        val reporter = object : ICReporter() {
+        val reporter = object : ICReporter {
             override fun report(message: ()->String) {
             }
 
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index 239a0b8f472..1ffb30d7557 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -782,7 +782,7 @@ private fun CompilationResult.doProcessChanges(
     }
 }
 
-private class JpsICReporter : ICReporter() {
+private class JpsICReporter : ICReporter {
     override fun report(message: ()->String) {
         if (KotlinBuilder.LOG.isDebugEnabled) {
             KotlinBuilder.LOG.debug(message())