Merge branch 'main' into drop-scala-3.0

Author: SethTisue

.circleci/config.yml

@@ -20,7 +20,7 @@ commands:
     parameters:
       scala_version:
         type: string
-        default: 2.12.15
+        default: 2.12.16
       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.15
+        default: 2.12.16
         type: string
       java_version:
         description: "Java version"
@@ -61,7 +61,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.15
+        default: 2.12.16
         type: string
     steps:
       - checkout
@@ -75,7 +75,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.15
+        default: 2.12.16
         type: string
     steps:
       - checkout
@@ -92,9 +92,9 @@ workflows:
   build:
     jobs:
       - scala_job:
-          name: 2.12.15
+          name: 2.12.16
           java_version: jdk8
-          scala_version: 2.12.15
+          scala_version: 2.12.16
       - scala_job:
           name: 2.13.8
           java_version: jdk8
@@ -106,7 +106,7 @@ workflows:
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
-          scala_version: 2.12.15
+          scala_version: 2.12.16
       - 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.15
+          scala_version: 2.12.16
       - 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.15
+          scala_version: 2.12.16
       - scalajs_job:
           name: sjs1.0_2.13
           scala_version: 2.13.8
@@ -138,7 +138,7 @@ workflows:
           scala_version: 3.1.3
       - scalanative_job:
           name: native0.4_2.12
-          scala_version: 2.12.15
+          scala_version: 2.12.16
       - scalanative_job:
           name: native0.4_2.13
           scala_version: 2.13.8

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [8, 11, 17]
-        scala: [2.12.15, 2.13.8, 3.1.3]
+        scala: [2.12.16, 2.13.8, 3.1.3]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

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.8", "2.12.15", "3.1.3"),
-    scalaVersion := "2.12.15",
+    crossScalaVersions := Seq("2.13.8", "2.12.16", "3.1.3"),
+    scalaVersion := "2.12.16",
 
     // Don't publish for Scala 3.1 or later, only from 3.0
     publish / skip := (CrossVersion.partialVersion(scalaVersion.value) match {

project/plugins.sbt

@@ -2,5 +2,5 @@ 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-native" % "sbt-scala-native" % "0.4.4")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")