From b58dd0467307f017a8f53cd5c31522791706538d Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 28 Apr 2022 08:46:34 -0700
Subject: [PATCH 1/4] Update scala3-library, ... to 3.1.2

---
 .circleci/config.yml     | 18 +++++++++---------
 .github/workflows/ci.yml |  2 +-
 build.sbt                |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 520b63d1..0f90879e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,21 +92,21 @@ workflows:
   build:
     jobs:
       - scala_job:
-          name: 2.12.15
+          name: 2.12
           java_version: jdk8
           scala_version: 2.12.15
       - scala_job:
-          name: 2.13.8
+          name: 2.13
           java_version: jdk8
           scala_version: 2.13.8
       - scala_job:
-          name: 3.0.2
+          name: 3.0
           java_version: jdk8
           scala_version: 3.0.2
       - scala_job:
-          name: 3.1.0
+          name: 3.1
           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
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ce10f23..b78666a0 100644
--- a/.github/workflows/ci.yml
+++ b/.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
diff --git a/build.sbt b/build.sbt
index 38ff4a4c..493e00d1 100644
--- a/build.sbt
+++ b/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

From 9a374d3c40633dfc029921ede55ce852ef89a704 Mon Sep 17 00:00:00 2001
From: Scala Steward <me@scala-steward.org>
Date: Tue, 5 Apr 2022 01:15:45 +0200
Subject: [PATCH 2/4] Update sbt-scalajs, scalajs-compiler, ... to 1.10.0

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index a4607946..da96b0c8 100644
--- a/project/plugins.sbt
+++ b/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")

From 9ca8ef09751ca20fa4006b80391783e876f8c465 Mon Sep 17 00:00:00 2001
From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Thu, 28 Apr 2022 21:48:58 +0200
Subject: [PATCH 3/4] Disable MiMA

---
 build.sbt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 493e00d1..94249744 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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._

From 1b662cac7046d25a6d3f182968c45cda404fa797 Mon Sep 17 00:00:00 2001
From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Fri, 29 Apr 2022 00:02:45 +0200
Subject: [PATCH 4/4] Revert circleCI job names

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0f90879e..f0f2de05 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,19 +92,19 @@ workflows:
   build:
     jobs:
       - scala_job:
-          name: 2.12
+          name: 2.12.15
           java_version: jdk8
           scala_version: 2.12.15
       - scala_job:
-          name: 2.13
+          name: 2.13.8
           java_version: jdk8
           scala_version: 2.13.8
       - scala_job:
-          name: 3.0
+          name: 3.0.2
           java_version: jdk8
           scala_version: 3.0.2
       - scala_job:
-          name: 3.1
+          name: 3.1.0
           java_version: jdk8
           scala_version: 3.1.2
       - scala_job: