add Scala 3.0.0-RC2 and JDK 16, drop RC1 and 15

Author: SethTisue

.circleci/config.yml

@@ -7,9 +7,6 @@ executors:
   scala_jdk11_executor:
     docker:
       - image: circleci/openjdk:11-jdk
-  scala_jdk15_executor:
-    docker:
-      - image: circleci/openjdk:15-buster
   scala_jdk16_executor:
     docker:
       - image: circleci/openjdk:16-buster
@@ -119,13 +116,13 @@ workflows:
           java_version: jdk8
           scala_version: 2.13.5
       - scala_job:
-          name: 3.0.0-RC1
+          name: 3.0.0-RC2
           java_version: jdk8
-          scala_version: 3.0.0-RC1
+          scala_version: 3.0.0-RC2
       - scala_job:
-          name: 3.0.0-M3
+          name: 3.0.0-RC1
           java_version: jdk8
-          scala_version: 3.0.0-M3
+          scala_version: 3.0.0-RC1
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
@@ -137,19 +134,7 @@ workflows:
       - scala_job:
           name: jdk11_3.0
           java_version: jdk11
-          scala_version: 3.0.0-RC1
-      - scala_job:
-          name: jdk15_2.12
-          java_version: jdk15
-          scala_version: 2.12.13
-      - scala_job:
-          name: jdk15_2.13
-          java_version: jdk15
-          scala_version: 2.13.5
-      - scala_job:
-          name: jdk15_3.0
-          java_version: jdk15
-          scala_version: 3.0.0-RC1
+          scala_version: 3.0.0-RC2
       - scala_job:
           name: jdk16_2.12
           java_version: jdk16
@@ -161,7 +146,7 @@ workflows:
       - scala_job:
           name: jdk16_3.0
           java_version: jdk16
-          scala_version: 3.0.0-RC1
+          scala_version: 3.0.0-RC2
       - scalajs_job:
           name: sjs1.0_2.12
           scala_version: 2.12.13

.travis.yml

@@ -5,8 +5,8 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
+  - 3.0.0-RC2
   - 3.0.0-RC1
-  - 3.0.0-M3
   - 2.12.13
   - 2.13.5
 
@@ -15,14 +15,14 @@ env:
   - SCALAJS_VERSION=1.5.0     ADOPTOPENJDK=8
   - SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
   - SCALAJS_VERSION=          ADOPTOPENJDK=11
-  - SCALAJS_VERSION=          ADOPTOPENJDK=15
+  - SCALAJS_VERSION=          ADOPTOPENJDK=16
 
 jobs:
   exclude:
-    - scala: 3.0.0-M3
-      env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
     - scala: 3.0.0-RC1
       env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
+    - scala: 3.0.0-RC2
+      env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
 
 install:
   - git fetch --tags # get all tags for sbt-dynver

build.sbt

@@ -74,8 +74,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
         exclude[DirectMissingMethodProblem]("scala.xml.Utility.escapeText"),
         // New MiMa checks for generic signature changes
         exclude[IncompatibleSignatureProblem]("*"),
-        // afaict this is just a JDK 8 vs 15 difference, producing a false positive when
-        // we compare classes built on JDK 15 (which we only do on CI, not at release time)
+        // afaict this is just a JDK 8 vs 16 difference, producing a false positive when
+        // we compare classes built on JDK 16 (which we only do on CI, not at release time)
         // to previous-version artifacts that were built on 8.  see scala/scala-xml#501
         exclude[DirectMissingMethodProblem]("scala.xml.include.sax.XIncluder.declaration"),
       )