Merge pull request #620 from eed3si9n/bport/same-api

[1.2.x] ignore non-matching extra hash for classes
sbt · Nov 29, 2018 · 872952a · 872952a
2 parents 95be1e1 + 93200ad
commit 872952a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalNameHashing.scala b/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalNameHashing.scala
@@ -45,13 +45,13 @@ private final class IncrementalNameHashing(log: sbt.util.Logger, options: IncOpt
         if (isATrait && isBTrait) {
           Some(TraitPrivateMembersModified(className))
         } else {
-          // As we don't cover more cases here, we protect ourselves from a potential programming error
-          sys.error(
-            s"""A fatal error happened in `SameAPI`: different extra api hashes for no traits!
+          // if the extra hash does not match up, but the API is "same" we can ignore it.
+          // see also https://github.com/sbt/sbt/issues/4441
+          debug(s"""different extra api hashes for non-traits:
                |  `${a.name}`: ${a.extraHash()}
                |  `${b.name}`: ${b.extraHash()}
-             """.stripMargin
-          )
+             """.stripMargin)
+          None
         }
       }
     } else {