Phiscally remove the ignored Scala 2 library-aux files instead of fil…

…tering them out in `Compile / sources` (not reliable, for some reasone the AnyRef.scala was still compiled) [Cherry-picked 2a142cd][modified]
scala · Jul 10, 2024 · 5d56503 · 5d56503
1 parent 7b225e6
commit 5d56503
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -1002,7 +1002,21 @@ object Build {
           IO.createDirectory(trgDir)
           IO.unzip(scalaLibrarySourcesJar, trgDir)
 
-          ((trgDir ** "*.scala") +++ (trgDir ** "*.java")).get.toSet
+          val (ignoredSources, sources) =
+            ((trgDir ** "*.scala") +++ (trgDir ** "*.java")).get.toSet
+              .partition{file =>
+                // sources from https://github.com/scala/scala/tree/2.13.x/src/library-aux
+                val path = file.getPath.replace('\\', '/')
+                path.endsWith("scala-library-src/scala/Any.scala") ||
+                path.endsWith("scala-library-src/scala/AnyVal.scala") ||
+                path.endsWith("scala-library-src/scala/AnyRef.scala") ||
+                path.endsWith("scala-library-src/scala/Nothing.scala") ||
+                path.endsWith("scala-library-src/scala/Null.scala") ||
+                path.endsWith("scala-library-src/scala/Singleton.scala")
+              }
+          // These sources should be never compiled, filtering them out was not working correctly sometimes
+          ignoredSources.foreach(_.delete())
+          sources
         } (Set(scalaLibrarySourcesJar)).toSeq
       }.taskValue,
       (Compile / sourceGenerators) += Def.task {

diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala
@@ -14,13 +14,12 @@ object MiMaFilters {
     ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.relaxedExtensionImports"),
     ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$relaxedExtensionImports$"),
     // end of New experimental features in 3.3.X
-
-    // New in 2.13.13
-    "scala.collection.mutable.ArrayBuffer.resizeUp", // private[mutable] def
-    // New in 2.13.14
-    "scala.util.Properties.consoleIsTerminal", // private[scala] lazy val
-    // end of new in Scala 2
-  )
+    ) ++ Seq(
+      // New in 2.13.13
+      "scala.collection.mutable.ArrayBuffer.resizeUp", // private[mutable] def
+      // New in 2.13.14
+      "scala.util.Properties.consoleIsTerminal", // private[scala] lazy val
+    ).map(ProblemFilters.exclude[DirectMissingMethodProblem])
   val TastyCore: Seq[ProblemFilter] = Seq(
   )
   val Interfaces: Seq[ProblemFilter] = Seq(