Avoid processing incremental changes after first build for JVM

2017-12-06 15:51:52 +03:00
parent 91bb57c5a3
commit d0ca0dca2b
1 changed files with 2 additions and 2 deletions
@@ -156,11 +156,11 @@ class IncrementalJvmCompilerRunner(
            dirtyFiles.addAll(dirtyFilesFromFqNames)
        }

-        val lastBuildInfo = BuildInfo.read(lastBuildInfoFile)
+        val lastBuildInfo = BuildInfo.read(lastBuildInfoFile) ?: return CompilationMode.Rebuild { "No information on previous build" }
        reporter.report { "Last Kotlin Build info -- $lastBuildInfo" }

        val changesFromFriend by lazy {
-            val myLastTS = lastBuildInfo?.startTS ?: return@lazy ChangesEither.Unknown()
+            val myLastTS = lastBuildInfo.startTS 
            val storage = friendBuildHistoryFile?.let { BuildDiffsStorage.readFromFile(it, reporter) } ?: return@lazy ChangesEither.Unknown()

            val (prevDiffs, newDiffs) = storage.buildDiffs.partition { it.ts < myLastTS }