Merge branch 'main' into update/scala-compiler-2.13.13

scala · Feb 29, 2024 · 6e2330f · 6e2330f
2 parents 501d510 + 85d2ab4
commit 6e2330f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -94,7 +94,7 @@ workflows:
       - scala_job:
           name: 2.12.x
           java_version: jdk8
-          scala_version: 2.12.18
+          scala_version: 2.12.19
       - scala_job:
           name: 2.13.x
           java_version: jdk8
@@ -106,7 +106,7 @@ workflows:
       - scala_job:
           name: jdk11_2.12.x
           java_version: jdk11
-          scala_version: 2.12.18
+          scala_version: 2.12.19
       - scala_job:
           name: jdk11_2.13.x
           java_version: jdk11
@@ -118,7 +118,7 @@ workflows:
       - scala_job:
           name: jdk17_2.12.x
           java_version: jdk17
-          scala_version: 2.12.18
+          scala_version: 2.12.19
       - scala_job:
           name: jdk17_2.13.x
           java_version: jdk17
@@ -129,7 +129,7 @@ workflows:
           scala_version: 3.3.1
       - scalajs_job:
           name: sjs1.0_2.12.x
-          scala_version: 2.12.18
+          scala_version: 2.12.19
       - scalajs_job:
           name: sjs1.0_2.13.x
           scala_version: 2.13.13
@@ -138,7 +138,7 @@ workflows:
           scala_version: 3.3.1
       - scalanative_job:
           name: native0.4_2.12.x
-          scala_version: 2.12.18
+          scala_version: 2.12.19
       - scalanative_job:
           name: native0.4_2.13.x
           scala_version: 2.13.13

diff --git a/build.sbt b/build.sbt
@@ -36,8 +36,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(
     name    := "scala-xml",
     scalaModuleAutomaticModuleName := Some("scala.xml"),
-    crossScalaVersions := Seq("2.13.13", "2.12.18", "3.3.1"),
-    scalaVersion := "2.12.18",
+    crossScalaVersions := Seq("2.13.13", "2.12.19", "3.3.1"),
+    scalaVersion := "2.12.19",
 
     scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _)) =>