Merge pull request #1382 from adpi2/fix-library-changed

Fix #1140: overcompilation when using a class directory as a library
sbt · Aug 7, 2024 · 9ea1a49 · 9ea1a49
2 parents 41aeab1 + 3962050
commit 9ea1a49
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala b/internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala
@@ -786,12 +786,11 @@ object IncrementalCommon {
 
       def isLibraryChanged(file: VirtualFileRef): Boolean = {
         def compareOriginClassFile(className: String, classpathEntry: VirtualFileRef): Boolean = {
-          if (
-            classpathEntry.id.endsWith(".jar") &&
-            (converter.toPath(classpathEntry).toString != converter.toPath(file).toString)
-          )
-            invalidateBinary(s"${className} is now provided by ${classpathEntry}")
-          else compareStamps(file, classpathEntry)
+          if (classpathEntry.id.endsWith(".jar")) compareStamps(file, classpathEntry)
+          else {
+            val resolved = Locate.classFile(converter.toPath(classpathEntry), className)
+            compareStamps(file, converter.toVirtualFile(resolved))
+          }
         }
 
         val classNames = previousRelations.libraryClassNames(file)