Refactor daemon interface

compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt

@@ -71,14 +71,14 @@ private object EmptyICReporter : ICReporter {
     }
 }
 
-private inline fun withIC(fn: ()->Unit) {
+inline fun <R> withIC(fn: ()->R): R {
     val isEnabledBackup = IncrementalCompilation.isEnabled()
     val isExperimentalBackup = IncrementalCompilation.isExperimental()
     IncrementalCompilation.setIsEnabled(true)
     IncrementalCompilation.setIsExperimental(true)
 
     try {
-        fn()
+        return fn()
     }
     finally {
         IncrementalCompilation.setIsEnabled(isEnabledBackup)

compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt

@@ -128,7 +128,7 @@ class KotlinStandaloneIncrementalCompilationTest : TestWithWorkingDir() {
             override fun report(message: ()->String) {
             }
 
-            override fun reportCompileIteration(sourceFiles: Iterable<File>, exitCode: ExitCode) {
+            override fun reportCompileIteration(sourceFiles: Collection<File>, exitCode: ExitCode) {
                 compiledSources.addAll(sourceFiles)
                 resultExitCode = exitCode
             }