use Scala 2.13.13 stdlib (was .12)

isaacl · Jul 1, 2024 · cc2dd1e · cc2dd1e
1 parent 1efbb92
commit cc2dd1e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/community-build/community-projects/stdLib213 b/community-build/community-projects/stdLib213
diff --git a/project/Build.scala b/project/Build.scala
@@ -144,8 +144,8 @@ object Build {
    *  scala-library.
    */
   def stdlibVersion(implicit mode: Mode): String = mode match {
-    case NonBootstrapped => "2.13.12"
-    case Bootstrapped => "2.13.12"
+    case NonBootstrapped => "2.13.13"
+    case Bootstrapped => "2.13.13"
   }
 
   /** Version of the scala-library for which we will generate TASTy.
@@ -155,7 +155,7 @@ object Build {
    *  We can use nightly versions to tests the future compatibility in development.
    *  Nightly versions: https://scala-ci.typesafe.com/ui/native/scala-integration/org/scala-lang
    */
-  val stdlibBootstrappedVersion = "2.13.12"
+  val stdlibBootstrappedVersion = "2.13.13"
 
   val dottyOrganization = "org.scala-lang"
   val dottyGithubUrl = "https://github.com/scala/scala3"
@@ -1361,7 +1361,7 @@ object Build {
           .exclude("org.eclipse.lsp4j","org.eclipse.lsp4j.jsonrpc"),
         "org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.20.1",
       ),
-      libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.12" % mtagsVersion % SourceDeps),
+      libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.13" % mtagsVersion % SourceDeps),
       ivyConfigurations += SourceDeps.hide,
       transitiveClassifiers := Seq("sources"),
       scalacOptions ++= Seq("-source", "3.3"), // To avoid fatal migration warnings

diff --git a/project/Scala2LibraryBootstrappedMiMaFilters.scala b/project/Scala2LibraryBootstrappedMiMaFilters.scala
@@ -78,9 +78,6 @@ object Scala2LibraryBootstrappedMiMaFilters {
         "scala.collection.IterableOnceOps#Maximized.this", // New in 2.13.11: private inner class
         "scala.util.Properties.<clinit>",
         "scala.util.Sorting.scala$util$Sorting$$mergeSort$default$5",
-        // New in 2.13.12 -- can be removed once scala/scala#10549 lands in 2.13.13
-        // and we take the upgrade here
-        "scala.collection.immutable.MapNodeRemoveAllSetNodeIterator.next",
       ).map(ProblemFilters.exclude[DirectMissingMethodProblem])
     }
   )