From 8a5df120a50ac6d62944bd310f03a6fe956f925f Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Tue, 23 Aug 2016 15:58:09 +0300
Subject: [PATCH] Ensure java is forced to compile when kotlin is compiled
 incrementally

Previously java compilation was not forced when there were only
removed kotlin files.
---
 .../src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index d8978b69ff1..861e2eae229 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -414,11 +414,12 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
                                mapClassesFqNamesToFiles(caches.values, dirtyClassFqNames, logAction, ::projectRelativePath, excludes = sourcesToCompile)
 
             if (currentRemoved.any()) {
+                anyClassesCompiled = true
                 currentRemoved = listOf()
             }
         }
 
-        anyClassesCompiled = allGeneratedFiles.isNotEmpty()
+        anyClassesCompiled = anyClassesCompiled || allGeneratedFiles.isNotEmpty()
         processCompilerExitCode(exitCode)
     }