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

Author: SethTisue

.circleci/config.yml

@@ -20,7 +20,7 @@ commands:
     parameters:
       scala_version:
         type: string
-        default: 2.12.16
+        default: 2.12.17
       sbt_tasks:
         type: string
         default: update compile test:compile test doc package osgiBundle
@@ -44,7 +44,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.16
+        default: 2.12.17
         type: string
       java_version:
         description: "Java version"
@@ -61,7 +61,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.16
+        default: 2.12.17
         type: string
     steps:
       - checkout
@@ -75,7 +75,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.16
+        default: 2.12.17
         type: string
     steps:
       - checkout
@@ -92,9 +92,9 @@ workflows:
   build:
     jobs:
       - scala_job:
-          name: 2.12.16
+          name: 2.12.17
           java_version: jdk8
-          scala_version: 2.12.16
+          scala_version: 2.12.17
       - scala_job:
           name: 2.13.10
           java_version: jdk8
@@ -106,7 +106,7 @@ workflows:
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
-          scala_version: 2.12.16
+          scala_version: 2.12.17
       - scala_job:
           name: jdk11_2.13
           java_version: jdk11
@@ -118,7 +118,7 @@ workflows:
       - scala_job:
           name: jdk17_2.12
           java_version: jdk17
-          scala_version: 2.12.16
+          scala_version: 2.12.17
       - scala_job:
           name: jdk17_2.13
           java_version: jdk17
@@ -129,7 +129,7 @@ workflows:
           scala_version: 3.1.3
       - scalajs_job:
           name: sjs1.0_2.12
-          scala_version: 2.12.16
+          scala_version: 2.12.17
       - scalajs_job:
           name: sjs1.0_2.13
           scala_version: 2.13.10
@@ -138,7 +138,7 @@ workflows:
           scala_version: 3.1.3
       - scalanative_job:
           name: native0.4_2.12
-          scala_version: 2.12.16
+          scala_version: 2.12.17
       - scalanative_job:
           name: native0.4_2.13
           scala_version: 2.13.10

build.sbt

@@ -35,8 +35,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(
     name    := "scala-xml",
     scalaModuleAutomaticModuleName := Some("scala.xml"),
-    crossScalaVersions := Seq("2.13.10", "2.12.16", "3.1.3"),
-    scalaVersion := "2.12.16",
+    crossScalaVersions := Seq("2.13.10", "2.12.17", "3.1.3"),
+    scalaVersion := "2.12.17",
 
     scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _)) =>

project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.1
+sbt.version=1.7.2

project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.0.1")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.7")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")