Merge pull request #181 from Kevin-Lee/task/180/support-scala-3.0.0-M2

Close #180 - Support Scala 3.0.0-M2
kevin-lee · Dec 2, 2020 · fa6f571 · fa6f571
2 parents c3d08d4 + e4ce027
commit fa6f571
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,6 +22,7 @@ jobs:
           - { 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" }
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,7 +59,8 @@ jobs:
           - { 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-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" }
 
     steps:
       - uses: actions/checkout@v2

diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ import just.semver.SemVer
 import SemVer.{Major, Minor}
 import microsites.ConfigYml
 
-val DottyVersion = "3.0.0-M1"
+val DottyVersions = Seq("3.0.0-M1", "3.0.0-M2")
 val ProjectScalaVersion = "2.13.3"
 
 val removeDottyIncompatible: ModuleID => Boolean =
@@ -14,9 +14,9 @@ val removeDottyIncompatible: ModuleID => Boolean =
     m.name == "kind-projector" ||
     m.name == "mdoc"
 
-val CrossScalaVersions: Seq[String] = Seq(
-  "2.10.7", "2.11.12", "2.12.12", "2.13.3", DottyVersion
-).distinct
+val CrossScalaVersions: Seq[String] = (Seq(
+  "2.10.7", "2.11.12", "2.12.12", "2.13.3"
+) ++ DottyVersions).distinct
 
 val GitHubUsername = "Kevin-Lee"
 val RepoName = "just-fp"