Merge pull request #470 from isomarcte/scala-3.0.0-M2

Update For Scala 3.0.0-M2
scala · Nov 26, 2020 · e82941b · e82941b
2 parents 30b11a2 + 5733660
commit e82941b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 45 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,12 +7,9 @@ executors:
   scala_jdk11_executor:
     docker:
       - image: circleci/openjdk:11-jdk
-  scala_jdk13_executor:
+  scala_jdk15_executor:
     docker:
-      - image: circleci/openjdk:13.0.1-jdk-buster
-  scala_jdk14_executor:
-    docker:
-      - image: circleci/openjdk:14-ea-26-jdk-buster
+      - image: circleci/openjdk:15-buster
 
 commands:
   sbt_cmd:
@@ -85,54 +82,42 @@ workflows:
           java_version: jdk8
           scala_version: 2.12.12
       - scala_job:
-          name: 2.13.3
+          name: 2.13.4
           java_version: jdk8
-          scala_version: 2.13.3
+          scala_version: 2.13.4
       - 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
           scala_version: 2.12.12
       - scala_job:
           name: jdk11_2.13
           java_version: jdk11
-          scala_version: 2.13.3
+          scala_version: 2.13.4
       - scala_job:
-          name: jdk11_dotty
+          name: jdk11_3.0
           java_version: jdk11
-          scala_version: 0.27.0-RC1
-      - scala_job:
-          name: jdk13_2.12
-          java_version: jdk13
-          scala_version: 2.12.12
-      - scala_job:
-          name: jdk13_2.13
-          java_version: jdk13
-          scala_version: 2.13.3
-      - scala_job:
-          name: jdk13_dotty
-          java_version: jdk13
-          scala_version: 0.27.0-RC1
+          scala_version: 3.0.0-M2
       - scala_job:
-          name: jdk14_2.12
-          java_version: jdk14
+          name: jdk15_2.12
+          java_version: jdk15
           scala_version: 2.12.12
       - scala_job:
-          name: jdk14_2.13
-          java_version: jdk14
-          scala_version: 2.13.3
+          name: jdk15_2.13
+          java_version: jdk15
+          scala_version: 2.13.4
       - scala_job:
-          name: jdk14_dotty
-          java_version: jdk14
-          scala_version: 0.27.0-RC1
+          name: jdk15_3.0
+          java_version: jdk15
+          scala_version: 3.0.0-M2
       - scalajs_job:
           name: sjs1.0_2.12
           scala_version: 2.12.12
           scalajs_version: 1.3.1
       - scalajs_job:
           name: sjs1.0_2.13
-          scala_version: 2.13.3
+          scala_version: 2.13.4
           scalajs_version: 1.3.1
diff --git a/.travis.yml b/.travis.yml
@@ -5,20 +5,15 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
-  - 0.27.0-RC1
+  - 3.0.0-M2
   - 2.12.12
-  - 2.13.3
+  - 2.13.4
 
 env:
   - SCALAJS_VERSION=         ADOPTOPENJDK=8
   - SCALAJS_VERSION=1.3.1    ADOPTOPENJDK=8
   - SCALAJS_VERSION=         ADOPTOPENJDK=11
-  - SCALAJS_VERSION=         ADOPTOPENJDK=13
-
-matrix:
-  exclude:
-    - scala: 0.27.0-RC1
-      env: SCALAJS_VERSION=1.3.1    ADOPTOPENJDK=8
+  - SCALAJS_VERSION=         ADOPTOPENJDK=15
 
 install:
   - git fetch --tags # get all tags for sbt-dynver

diff --git a/build.sbt b/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 {
@@ -46,7 +45,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
 
     scalaModuleMimaPreviousVersion := {
       if (isDotty.value) None // No such release yet
-      // else if (System.getenv("SCALAJS_VERSION") == "1.0.1") None
       else Some("1.3.0")
     },
     mimaBinaryIssueFilters ++= {
@@ -165,7 +163,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
   )