Merge pull request #604 from catap/update

Author: SethTisue

.circleci/config.yml

@@ -106,7 +106,7 @@ workflows:
       - scala_job:
           name: 3.1.0
           java_version: jdk8
-          scala_version: 3.1.1
+          scala_version: 3.1.2
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
@@ -122,7 +122,7 @@ workflows:
       - scala_job:
           name: jdk11_3.1
           java_version: jdk11
-          scala_version: 3.1.1
+          scala_version: 3.1.2
       - scala_job:
           name: jdk17_2.12
           java_version: jdk17
@@ -138,7 +138,7 @@ workflows:
       - scala_job:
           name: jdk17_3.1
           java_version: jdk17
-          scala_version: 3.1.1
+          scala_version: 3.1.2
       - scalajs_job:
           name: sjs1.0_2.12
           scala_version: 2.12.15
@@ -150,7 +150,7 @@ workflows:
           scala_version: 3.0.2
       - scalajs_job:
           name: sjs1.0_3.1
-          scala_version: 3.1.1
+          scala_version: 3.1.2
       - scalanative_job:
           name: native0.4_2.12
           scala_version: 2.12.15
@@ -159,4 +159,4 @@ workflows:
           scala_version: 2.13.8
       - scalanative_job:
           name: native0.4_3
-          scala_version: 3.1.1
+          scala_version: 3.1.2

.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.0.2, 3.1.1]
+        scala: [2.12.15, 2.13.8, 3.0.2, 3.1.2]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

build.sbt

@@ -35,7 +35,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(
     name    := "scala-xml",
     scalaModuleAutomaticModuleName := Some("scala.xml"),
-    crossScalaVersions := Seq("2.13.8", "2.12.15", "3.0.2", "3.1.1"),
+    crossScalaVersions := Seq("2.13.8", "2.12.15", "3.0.2", "3.1.2"),
     scalaVersion := "2.12.15",
 
     // Don't publish for Scala 3.1 or later, only from 3.0
@@ -67,7 +67,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
           |additional information regarding copyright ownership.
           |""".stripMargin)),
 
-    versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
+    // should be reverted to Compatibility.BinaryAndSourceCompatible after 2.2.0 is released
+    versionPolicyIntention := Compatibility.None,
     // Note: See discussion on non-JVM Mima in https://github.com/scala/scala-xml/pull/517
     mimaBinaryIssueFilters ++= {
       import com.typesafe.tools.mima.core._

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.9.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")