From fed7f6a309fea76d7cbefe47aac2821534d14589 Mon Sep 17 00:00:00 2001
From: Scala Steward <me@scala-steward.org>
Date: Mon, 18 Oct 2021 15:10:54 +0200
Subject: [PATCH 1/2] Update scala3-library, ... to 3.1.0

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b6a7658b..98d4999a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -99,7 +99,7 @@ workflows:
       - scala_job:
           name: 3.0.2
           java_version: jdk8
-          scala_version: 3.0.2
+          scala_version: 3.1.0
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
@@ -111,7 +111,7 @@ workflows:
       - scala_job:
           name: jdk11_3.0
           java_version: jdk11
-          scala_version: 3.0.2
+          scala_version: 3.1.0
       - scala_job:
           name: jdk17_2.12
           java_version: jdk17
@@ -123,7 +123,7 @@ workflows:
       - scala_job:
           name: jdk17_3.0
           java_version: jdk17
-          scala_version: 3.0.2
+          scala_version: 3.1.0
       - scalajs_job:
           name: sjs1.0_2.12
           scala_version: 2.12.15
@@ -132,7 +132,7 @@ workflows:
           scala_version: 2.13.6
       - scalajs_job:
           name: sjs1.0_3
-          scala_version: 3.0.2
+          scala_version: 3.1.0
       - scalanative_job:
           name: native0.4_2.12
           scala_version: 2.12.15
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a06efc26..1e53757e 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.6, 3.0.2]
+        scala: [2.12.15, 2.13.6, 3.1.0]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
diff --git a/build.sbt b/build.sbt
index a0212a32..5880d1a0 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.6", "2.12.15", "3.0.2"),
+    crossScalaVersions := Seq("2.13.6", "2.12.15", "3.0.2", "3.1.0"),
     scalaVersion := "2.12.15",
 
     scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {

From c8aca30855f934d66aa0ab1dcd7d5ffbf58e89c5 Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Tue, 2 Nov 2021 21:32:23 -0400
Subject: [PATCH 2/2] Add 3.1.0 to build but disable publish

---
 .circleci/config.yml     | 15 +++++++++++++++
 .github/workflows/ci.yml |  2 +-
 build.sbt                |  6 ++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 98d4999a..b490dc56 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -99,6 +99,10 @@ workflows:
       - scala_job:
           name: 3.0.2
           java_version: jdk8
+          scala_version: 3.0.2
+      - scala_job:
+          name: 3.1.0
+          java_version: jdk8
           scala_version: 3.1.0
       - scala_job:
           name: jdk11_2.12
@@ -111,6 +115,10 @@ workflows:
       - scala_job:
           name: jdk11_3.0
           java_version: jdk11
+          scala_version: 3.0.2
+      - scala_job:
+          name: jdk11_3.1
+          java_version: jdk11
           scala_version: 3.1.0
       - scala_job:
           name: jdk17_2.12
@@ -123,6 +131,10 @@ workflows:
       - scala_job:
           name: jdk17_3.0
           java_version: jdk17
+          scala_version: 3.0.2
+      - scala_job:
+          name: jdk17_3.1
+          java_version: jdk17
           scala_version: 3.1.0
       - scalajs_job:
           name: sjs1.0_2.12
@@ -132,6 +144,9 @@ workflows:
           scala_version: 2.13.6
       - scalajs_job:
           name: sjs1.0_3
+          scala_version: 3.0.2
+      - scalajs_job:
+          name: sjs1.0_3.1
           scala_version: 3.1.0
       - scalanative_job:
           name: native0.4_2.12
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e53757e..b12acfcb 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.6, 3.1.0]
+        scala: [2.12.15, 2.13.6, 3.0.2, 3.1.0]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
diff --git a/build.sbt b/build.sbt
index 5880d1a0..8c019f4b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -38,6 +38,12 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     crossScalaVersions := Seq("2.13.6", "2.12.15", "3.0.2", "3.1.0"),
     scalaVersion := "2.12.15",
 
+    // Don't publish for Scala 3.1 or later, only from 3.0
+    publish / skip := (CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((3, x)) if x > 0 => true
+      case _                     => false
+    }),
+
     scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _)) =>
         Seq("-language:Scala2")