Close #69 - Support Scala 3.0.0-RC1

kevin-lee · Mar 29, 2021 · 306462c · 306462c
1 parent 2c5949e
commit 306462c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,13 +10,14 @@ jobs:
     strategy:
       matrix:
         scala:
-          - { name: "Scala", version: "2.10.7", binary-version: "2.10", java-version: "8" }
-          - { name: "Scala", version: "2.11.12", binary-version: "2.11", java-version: "8" }
-          - { name: "Scala", version: "2.12.12", binary-version: "2.12", java-version: "11" }
-          - { name: "Scala", version: "2.13.3",  binary-version: "2.13", java-version: "11" }
-          - { name: "Scala 3", version: "3.0.0-M1", binary-version: "3.0.0-M1", java-version: "11" }
-          - { name: "Scala 3", version: "3.0.0-M2", binary-version: "3.0.0-M2", java-version: "11" }
-          - { name: "Scala 3", version: "3.0.0-M3", binary-version: "3.0.0-M3", java-version: "11" }
+          - { name: "Scala 2", version: "2.10.7",    binary-version: "2.10",      java-version: "8" }
+          - { name: "Scala 2", version: "2.11.12",   binary-version: "2.11",      java-version: "8" }
+          - { name: "Scala 2", version: "2.12.12",   binary-version: "2.12",      java-version: "11" }
+          - { name: "Scala 2", version: "2.13.3",    binary-version: "2.13",      java-version: "11" }
+          - { name: "Scala 3", version: "3.0.0-M1",  binary-version: "3.0.0-M1",  java-version: "11" }
+          - { name: "Scala 3", version: "3.0.0-M2",  binary-version: "3.0.0-M2",  java-version: "11" }
+          - { name: "Scala 3", version: "3.0.0-M3",  binary-version: "3.0.0-M3",  java-version: "11" }
+          - { name: "Scala 3", version: "3.0.0-RC1", binary-version: "3.0.0-RC1", java-version: "11" }
 
     steps:
       - uses: actions/checkout@v1

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,13 +40,14 @@ jobs:
     strategy:
       matrix:
         scala:
-          - { name: "Scala", version: "2.10.7", binary-version: "2.10", java-version: "8" }
-          - { name: "Scala", version: "2.11.12", binary-version: "2.11", java-version: "8" }
-          - { name: "Scala", version: "2.12.12", binary-version: "2.12", java-version: "11" }
-          - { name: "Scala", version: "2.13.3",  binary-version: "2.13", java-version: "11" }
-          - { name: "Scala 3", version: "3.0.0-M1", binary-version: "3.0.0-M1", java-version: "11" }
-          - { name: "Scala 3", version: "3.0.0-M2", binary-version: "3.0.0-M2", java-version: "11" }
-          - { name: "Scala 3", version: "3.0.0-M3", binary-version: "3.0.0-M3", java-version: "11" }
+          - { name: "Scala 2", version: "2.10.7",    binary-version: "2.10",      java-version: "8" }
+          - { name: "Scala 2", version: "2.11.12",   binary-version: "2.11",      java-version: "8" }
+          - { name: "Scala 2", version: "2.12.12",   binary-version: "2.12",      java-version: "11" }
+          - { name: "Scala 2", version: "2.13.3",    binary-version: "2.13",      java-version: "11" }
+          - { name: "Scala 3", version: "3.0.0-M1",  binary-version: "3.0.0-M1",  java-version: "11" }
+          - { name: "Scala 3", version: "3.0.0-M2",  binary-version: "3.0.0-M2",  java-version: "11" }
+          - { name: "Scala 3", version: "3.0.0-M3",  binary-version: "3.0.0-M3",  java-version: "11" }
+          - { name: "Scala 3", version: "3.0.0-RC1", binary-version: "3.0.0-RC1", java-version: "11" }
 
     steps:
       - uses: actions/checkout@v2

diff --git a/build.sbt b/build.sbt
@@ -11,8 +11,17 @@ val removeDottyIncompatible: ModuleID => Boolean =
       m.name == "kind-projector" ||
       m.name == "mdoc"
 
-val ProjectScalaVersion: String = "3.0.0-M3"
-val CrossScalaVersions: Seq[String] = Seq("2.10.7", "2.11.12", "2.12.12", "2.13.3", "3.0.0-M1", "3.0.0-M2", ProjectScalaVersion).distinct
+val ProjectScalaVersion: String = "3.0.0-RC1"
+val CrossScalaVersions: Seq[String] = Seq(
+  "2.10.7",
+  "2.11.12",
+  "2.12.12",
+  "2.13.3",
+  "3.0.0-M1",
+  "3.0.0-M2",
+  "3.0.0-M3",
+  ProjectScalaVersion,
+).distinct
 
 ThisBuild / scalaVersion := ProjectScalaVersion
 ThisBuild / organization := "io.kevinlee"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,4 +5,4 @@ addSbtPlugin("org.wartremover"   % "sbt-wartremover" % "2.4.10")
 addSbtPlugin("org.scoverage"     % "sbt-scoverage"   % "1.6.1")
 addSbtPlugin("org.scoverage"     % "sbt-coveralls"   % "1.2.7")
 addSbtPlugin("io.kevinlee"       % "sbt-devoops"     % "1.0.3")
-addSbtPlugin("ch.epfl.lamp"      % "sbt-dotty"       % "0.5.1")
+addSbtPlugin("ch.epfl.lamp"      % "sbt-dotty"       % "0.5.3")