From ed7d31eb6c163ce43ada91f4496e6cd2ce365f6a Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Wed, 24 Aug 2016 16:18:04 +0300
Subject: [PATCH] Assume cache format is always up-to-date when compiling
 non-incrementally

---
 .../kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 d199d184eaf..67e1c827f85 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
@@ -163,9 +163,12 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
                dataContainerCacheVersion(taskBuildDirectory),
                gradleCacheVersion(taskBuildDirectory))
     }
-    val isCacheFormatUpToDate: Boolean by lazy {
-        cacheVersions.all { it.checkVersion() == CacheVersion.Action.DO_NOTHING }
-    }
+    val isCacheFormatUpToDate: Boolean
+        get() {
+            if (!incremental) return true
+
+            return cacheVersions.all { it.checkVersion() == CacheVersion.Action.DO_NOTHING }
+        }
 
     private var kaptAnnotationsFileUpdater: AnnotationFileUpdater? = null
     private val additionalClasspath = arrayListOf<File>()