Merge pull request #606 from smarter/bport-extraHash-fix

[1.2.x] Fix the extraHash used when reading a V1 file
sbt · Oct 11, 2018 · ea73630 · ea73630
2 parents b62282b + 71ce7ec
commit ea73630
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...rnal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufReaders.scala b/...rnal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufReaders.scala
@@ -542,8 +542,8 @@ final class ProtobufReaders(mapper: ReadMapper, currentVersion: schema.Version)
     val name = analyzedClass.name
     val api = mkLazy(analyzedClass.api.read(fromCompanions, ExpectedCompanionsInAnalyzedClass))
     val apiHash = analyzedClass.apiHash
-    // Default on api hash to avoid issues when comparing hashes from two different analysis formats
-    val extraHash = if (currentVersion == schema.Version.V1) apiHash else analyzedClass.extraHash
+    // Default to 0 to avoid issues when comparing hashes from two different analysis formats
+    val extraHash = if (currentVersion == schema.Version.V1) 0 else analyzedClass.extraHash
     val nameHashes = analyzedClass.nameHashes.toZincArray(fromNameHash)
     val hasMacro = analyzedClass.hasMacro
     AnalyzedClass.of(compilationTimestamp, name, api, apiHash, nameHashes, hasMacro, extraHash)