diff --git a/community-build/community-projects/stdLib213 b/community-build/community-projects/stdLib213 index b6f70d2347f2..3f6bdaeafde1 160000 --- a/community-build/community-projects/stdLib213 +++ b/community-build/community-projects/stdLib213 @@ -1 +1 @@ -Subproject commit b6f70d2347f2857695e5c0fe544b0f921544b02a +Subproject commit 3f6bdaeafde17d790023cc3f299b81eaaf876ca3 diff --git a/project/Build.scala b/project/Build.scala index 7dfbb1cd3226..0c80fdd4450e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -208,8 +208,8 @@ object Build { * scala-library. */ def stdlibVersion(implicit mode: Mode): String = mode match { - case NonBootstrapped => "2.13.15" - case Bootstrapped => "2.13.15" + case NonBootstrapped => "2.13.16" + case Bootstrapped => "2.13.16" } /** Version of the scala-library for which we will generate TASTy. @@ -219,7 +219,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.15" + val stdlibBootstrappedVersion = "2.13.16" val dottyOrganization = "org.scala-lang" val dottyGithubUrl = "https://github.com/scala/scala3" @@ -739,6 +739,13 @@ object Build { // Use source 3.3 to avoid fatal migration warnings on scalajs-ir scalacOptions ++= Seq("-source", "3.3"), + /* Ignore a deprecation warning about AnyRefMap in scalajs-ir. The latter + * cross-compiles for 2.12, and therefore AnyRefMap remains useful there + * for performance reasons. + * The build of Scala.js core does the same thing. + */ + scalacOptions += "-Wconf:cat=deprecation&origin=scala\\.collection\\.mutable\\.AnyRefMap.*:s", + // Generate compiler.properties, used by sbt (Compile / resourceGenerators) += Def.task { import java.util._ @@ -1479,7 +1486,7 @@ object Build { BuildInfoPlugin.buildInfoDefaultSettings lazy val presentationCompilerSettings = { - val mtagsVersion = "1.4.1" + val mtagsVersion = "1.4.2" Seq( libraryDependencies ++= Seq( "org.lz4" % "lz4-java" % "1.8.0", @@ -1489,7 +1496,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.15" % mtagsVersion % SourceDeps), + libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.16" % mtagsVersion % SourceDeps), ivyConfigurations += SourceDeps.hide, transitiveClassifiers := Seq("sources"), scalacOptions ++= Seq("-source", "3.3"), // To avoid fatal migration warnings diff --git a/tests/patmat/i7186.scala b/tests/patmat/i7186.scala index d828cc78b070..f398eb39da77 100644 --- a/tests/patmat/i7186.scala +++ b/tests/patmat/i7186.scala @@ -92,7 +92,7 @@ object printMips { def apply(nodes: List[Assembler]): Unit = { var symbCount = 0L - val symbols = new scala.collection.mutable.AnyRefMap[Scoped,Long]() + val symbols = new scala.collection.mutable.HashMap[Scoped,Long]() print(mipsNode(nodes, " "))