Update For Scala 3.0.0-M1

Author: isomarcte

.circleci/config.yml

@@ -89,9 +89,9 @@ workflows:
           java_version: jdk8
           scala_version: 2.13.3
       - scala_job:
-          name: dotty-0.27.0-RC1
+          name: 3.0.0-M2
           java_version: jdk8
-          scala_version: 0.27.0-RC1
+          scala_version: 3.0.0-M2
       - scala_job:
           name: jdk11_2.12
           java_version: jdk11
@@ -101,9 +101,9 @@ workflows:
           java_version: jdk11
           scala_version: 2.13.3
       - scala_job:
-          name: jdk11_dotty
+          name: jdk11_3.0
           java_version: jdk11
-          scala_version: 0.27.0-RC1
+          scala_version: 3.0.0-M2
       - scala_job:
           name: jdk13_2.12
           java_version: jdk13
@@ -113,9 +113,9 @@ workflows:
           java_version: jdk13
           scala_version: 2.13.3
       - scala_job:
-          name: jdk13_dotty
+          name: jdk13_3.0
           java_version: jdk13
-          scala_version: 0.27.0-RC1
+          scala_version: 3.0.0-M2
       - scala_job:
           name: jdk14_2.12
           java_version: jdk14
@@ -125,9 +125,17 @@ workflows:
           java_version: jdk14
           scala_version: 2.13.3
       - scala_job:
-          name: jdk14_dotty
+          name: jdk14_3.0
           java_version: jdk14
-          scala_version: 0.27.0-RC1
+          scala_version: 3.0.0-M2
+      - scalajs_job:
+          name: sjs0.6_2.12
+          scala_version: 2.12.10
+          scalajs_version: 0.6.33
+      - scalajs_job:
+          name: sjs0.6_2.13
+          scala_version: 2.13.1
+          scalajs_version: 0.6.33
       - scalajs_job:
           name: sjs1.0_2.12
           scala_version: 2.12.12

.travis.yml

@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
-  - 0.27.0-RC1
+  - 3.0.0-M2
   - 2.12.12
   - 2.13.3
 
@@ -17,8 +17,10 @@ env:
 
 matrix:
   exclude:
-    - scala: 0.27.0-RC1
-      env: SCALAJS_VERSION=1.3.1    ADOPTOPENJDK=8
+    - scala: 3.0.0-M1
+      env: SCALAJS_VERSION=0.6.33   ADOPTOPENJDK=8
+    - scala: 3.0.0-M1
+      env: SCALAJS_VERSION=1.0.1    ADOPTOPENJDK=8
 
 install:
   - git fetch --tags # get all tags for sbt-dynver

build.sbt

@@ -6,8 +6,7 @@ lazy val configSettings: Seq[Setting[_]] = Seq(
       val sv = scalaVersion.value
       Seq(
         CrossVersion.partialVersion(sv) match {
-          case Some((2, 13)) => file(dir.getPath ++ "-2.13+")
-          case Some((0, _))  => file(dir.getPath ++ "-2.13+")
+          case Some((major, minor)) if major > 2 || (major == 2 && minor >= 13)  => file(dir.getPath ++ "-2.13+")
           case _             => file(dir.getPath ++ "-2.13-")
         },
         CrossVersion.partialVersion(sv) match {
@@ -165,7 +164,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
   )
   .jsSettings(
     // The config for Travis has an exclude, but sbt-travisci doesn't catch it.
-    crossScalaVersions -= "0.27.0-RC1",
+    crossScalaVersions -= "3.0.0-M2",
     // Scala.js cannot run forked tests
     fork in Test := false
   )