From 124aefff890a052c3d804047b2bc2df69fe6f000 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 15 Jan 2025 18:47:19 -0800 Subject: [PATCH 1/4] Scala 2.13.16 (was .15) --- community-build/community-projects/stdLib213 | 2 +- project/Build.scala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 1174895d8d2e..eeaf8a37cd0b 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -124,8 +124,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" } val dottyOrganization = "org.scala-lang" @@ -1192,7 +1192,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"), Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Ysafe-init"), From 43346dc526c4ffb778eecfe134b24f9c5aa9989c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Thu, 16 Jan 2025 09:57:11 +0100 Subject: [PATCH 2/4] Silence deprecations about AnyRefMap in scalajs-ir. --- project/Build.scala | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/project/Build.scala b/project/Build.scala index eeaf8a37cd0b..f82ea0361133 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -589,6 +589,13 @@ object Build { // Settings shared between scala3-compiler and scala3-compiler-bootstrapped lazy val commonDottyCompilerSettings = Seq( + /* 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._ From 225615a3395d0b7b2f0df202d5abf6dad160abd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Thu, 16 Jan 2025 10:49:41 +0100 Subject: [PATCH 3/4] Upgrade to mtags 1.4.2, which supports Scala 2.13.16. --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index f82ea0361133..d5d3b87f7836 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1189,7 +1189,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", From 04179fe0ea94c256e019e465e40891db49dd7e12 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 16 Jan 2025 13:38:22 -0800 Subject: [PATCH 4/4] Silence deprecations about AnyRefMap in a test --- tests/patmat/i7186.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, " "))