Skip to content

Backport "Scala 2.13.16 (was .15)" to Scala 3.3 LTS #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 19, 2025
Merged

Backport "Scala 2.13.16 (was .15)" to Scala 3.3 LTS #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
124aeff
Scala 2.13.16 (was .15)
SethTisue Jan 16, 2025
43346dc
Silence deprecations about AnyRefMap in scalajs-ir.
sjrd Jan 16, 2025
225615a
Upgrade to mtags 1.4.2, which supports Scala 2.13.16.
sjrd Jan 16, 2025
04179fe
Silence deprecations about AnyRefMap in a test
SethTisue Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion community-build/community-projects/stdLib213
Open in desktop
Submodule stdLib213 updated 1443 files
15 changes: 11 additions & 4 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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._
Expand Down Expand Up @@ -1182,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",
Expand All @@ -1192,7 +1199,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"),
Expand Down
2 changes: 1 addition & 1 deletion tests/patmat/i7186.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, " "))

Expand Down
Loading