From 7ef23da289e455cfa5250b64d099dac4841d8438 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Wed, 23 Sep 2015 14:48:37 +0300
Subject: [PATCH] Clean all storages if incremental compilation is off

---
 .../kotlin/jps/build/KotlinBuilder.kt          | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

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 c7b0ddaf97f..50e458a4355 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -134,13 +134,17 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
 
         val dataManager = projectDescriptor.dataManager
 
-        if (IncrementalCompilation.isEnabled() &&
-            chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }
-        ) {
-            LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join())
-            val incrementalCaches = getIncrementalCaches(chunk, context)
-            incrementalCaches.values().forEach(StorageOwner::clean)
-            return CHUNK_REBUILD_REQUIRED
+        if (!IncrementalCompilation.isEnabled()) {
+            dataManager.clean()
+            dataManager.flush(true)
+        }
+        else {
+            if (chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }) {
+                LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join())
+                val incrementalCaches = getIncrementalCaches(chunk, context)
+                incrementalCaches.values().forEach(StorageOwner::clean)
+                return CHUNK_REBUILD_REQUIRED
+            }
         }
 
         if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles()