From a78dc66267e59b95d5f386bf6341ae64cbcb5e4f Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Wed, 5 Feb 2020 09:14:23 -0500
Subject: [PATCH] Update dotty 0.22.0-RC1

---
 .circleci/config.yml | 8 ++++----
 .travis.yml          | 6 +++---
 build.sbt            | 2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6522d0cb6..4b60b0d3a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -91,7 +91,7 @@ workflows:
       - scala_job:
           name: dotty-0.21
           java_version: jdk8
-          scala_version: 0.21.0-RC1
+          scala_version: 0.22.0-RC1
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
@@ -103,7 +103,7 @@ workflows:
       - scala_job:
           name: jdk11_dotty
           java_version: jdk11
-          scala_version: 0.21.0-RC1
+          scala_version: 0.22.0-RC1
       - scala_job:
           name: jdk13_2.12
           java_version: jdk13
@@ -115,7 +115,7 @@ workflows:
       - scala_job:
           name: jdk13_dotty
           java_version: jdk13
-          scala_version: 0.21.0-RC1
+          scala_version: 0.22.0-RC1
       - scala_job:
           name: jdk14_2.12
           java_version: jdk14
@@ -127,7 +127,7 @@ workflows:
       - scala_job:
           name: jdk14_dotty
           java_version: jdk14
-          scala_version: 0.21.0-RC1
+          scala_version: 0.22.0-RC1
       - scalajs_job:
           name: sjs0.6_2.12
           scala_version: 2.12.10
diff --git a/.travis.yml b/.travis.yml
index 1e6bfec48..12c66e18d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
-  - 0.21.0-RC1
+  - 0.22.0-RC1
   - 2.12.10
   - 2.13.1
 
@@ -18,9 +18,9 @@ env:
 
 matrix:
   exclude:
-    - scala: 0.21.0-RC1
+    - scala: 0.22.0-RC1
       env: SCALAJS_VERSION=0.6.32    ADOPTOPENJDK=8
-    - scala: 0.21.0-RC1
+    - scala: 0.22.0-RC1
       env: SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8
 
 install:
diff --git a/build.sbt b/build.sbt
index 555155c57..12c7078bb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -161,6 +161,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
     }
   )
   .jsSettings(
+    // The config for Travis has an exclude, but sbt-travisci doesn't catch it.
+    crossScalaVersions -= "0.22.0-RC1",
     // Scala.js cannot run forked tests
     fork in Test := false
   )