From ba786ee7e257a07e87ac443f25947f35ba2c6fce Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Tue, 11 Jul 2017 09:00:38 +0200
Subject: [PATCH] Rolling back commits related to Unit -> Void? confersion in
 RMI interface

since it breaks the compatibility and doesn't actually help - the problem
with NoClassDef Unit is apparently elsewhere.

Original commit: fc12f37105fcdf3fbf871d83667e905a228ad554
---
 .../kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt
index 183c4bd11ac..3410543678a 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt
@@ -32,10 +32,9 @@ internal class JpsCompilerServicesFacadeImpl(
                                          port),
         JpsCompilerServicesFacade {
 
-    override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?): Void? {
+    override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?) {
         env.messageCollector.reportFromDaemon(
                 { outFile, srcFiles -> env.outputItemsCollector.add(srcFiles, outFile) },
                 category, severity, message, attachment)
-        return null
     }
 }
\ No newline at end of file