Skip to content

Commit 5bc04db

Browse files
Scala 2.13.16 (was .15) (#22386)
2 parents 1778a6e + aa8b23a commit 5bc04db

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed
Submodule stdLib213 updated 1443 files

project/Build.scala

+12-5
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ object Build {
208208
* scala-library.
209209
*/
210210
def stdlibVersion(implicit mode: Mode): String = mode match {
211-
case NonBootstrapped => "2.13.15"
212-
case Bootstrapped => "2.13.15"
211+
case NonBootstrapped => "2.13.16"
212+
case Bootstrapped => "2.13.16"
213213
}
214214

215215
/** Version of the scala-library for which we will generate TASTy.
@@ -219,7 +219,7 @@ object Build {
219219
* We can use nightly versions to tests the future compatibility in development.
220220
* Nightly versions: https://scala-ci.typesafe.com/ui/native/scala-integration/org/scala-lang
221221
*/
222-
val stdlibBootstrappedVersion = "2.13.15"
222+
val stdlibBootstrappedVersion = "2.13.16"
223223

224224
val dottyOrganization = "org.scala-lang"
225225
val dottyGithubUrl = "https://github.com/scala/scala3"
@@ -739,6 +739,13 @@ object Build {
739739
// Use source 3.3 to avoid fatal migration warnings on scalajs-ir
740740
scalacOptions ++= Seq("-source", "3.3"),
741741

742+
/* Ignore a deprecation warning about AnyRefMap in scalajs-ir. The latter
743+
* cross-compiles for 2.12, and therefore AnyRefMap remains useful there
744+
* for performance reasons.
745+
* The build of Scala.js core does the same thing.
746+
*/
747+
scalacOptions += "-Wconf:cat=deprecation&origin=scala\\.collection\\.mutable\\.AnyRefMap.*:s",
748+
742749
// Generate compiler.properties, used by sbt
743750
(Compile / resourceGenerators) += Def.task {
744751
import java.util._
@@ -1481,7 +1488,7 @@ object Build {
14811488
BuildInfoPlugin.buildInfoDefaultSettings
14821489

14831490
lazy val presentationCompilerSettings = {
1484-
val mtagsVersion = "1.4.1"
1491+
val mtagsVersion = "1.4.2"
14851492
Seq(
14861493
libraryDependencies ++= Seq(
14871494
"org.lz4" % "lz4-java" % "1.8.0",
@@ -1491,7 +1498,7 @@ object Build {
14911498
.exclude("org.eclipse.lsp4j","org.eclipse.lsp4j.jsonrpc"),
14921499
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.20.1",
14931500
),
1494-
libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.15" % mtagsVersion % SourceDeps),
1501+
libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.16" % mtagsVersion % SourceDeps),
14951502
ivyConfigurations += SourceDeps.hide,
14961503
transitiveClassifiers := Seq("sources"),
14971504
scalacOptions ++= Seq("-source", "3.3"), // To avoid fatal migration warnings

tests/patmat/i7186.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ object printMips {
9292

9393
def apply(nodes: List[Assembler]): Unit = {
9494
var symbCount = 0L
95-
val symbols = new scala.collection.mutable.AnyRefMap[Scoped,Long]()
95+
val symbols = new scala.collection.mutable.HashMap[Scoped,Long]()
9696

9797
print(mipsNode(nodes, " "))
9898

0 commit comments

Comments
 (0)