Upgrade to Scala 3 (#222)

typelevel · May 14, 2021 · 09ca465 · 09ca465
1 parent 8bdf606
commit 09ca465
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.0.0-RC2, 3.0.0-RC3, 2.11.12, 2.12.13, 2.13.5]
+        scala: [3.0.0, 2.11.12, 2.12.13, 2.13.5]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -102,22 +102,12 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (3.0.0-RC2)
+      - name: Download target directories (3.0.0)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.0.0-${{ matrix.java }}
 
-      - name: Inflate target directories (3.0.0-RC2)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
-      - name: Download target directories (3.0.0-RC3)
-        uses: actions/download-artifact@v2
-        with:
-          name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }}
-
-      - name: Inflate target directories (3.0.0-RC3)
+      - name: Inflate target directories (3.0.0)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -14,7 +14,7 @@ ThisBuild / organizationName := "Typelevel"
 ThisBuild / publishGithubUser := "johnynek"
 ThisBuild / publishFullName := "P. Oscar Boykin"
 
-ThisBuild / crossScalaVersions := List("3.0.0-RC2", "3.0.0-RC3", "2.11.12", "2.12.13", "2.13.5")
+ThisBuild / crossScalaVersions := List("3.0.0", "2.11.12", "2.12.13", "2.13.5")
 
 ThisBuild / spiewakCiReleaseSnapshots := true
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,10 +2,10 @@ import sbt._
 import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 
 object Dependencies {
-  lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % "2.6.0")
+  lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % "2.6.1")
   lazy val cats211 = Def.setting("org.typelevel" %%% "cats-core" % "2.0.0")
-  lazy val munit = Def.setting("org.scalameta" %%% "munit" % "0.7.25")
-  lazy val munitScalacheck = Def.setting("org.scalameta" %%% "munit-scalacheck" % "0.7.25")
+  lazy val munit = Def.setting("org.scalameta" %%% "munit" % "0.7.26")
+  lazy val munitScalacheck = Def.setting("org.scalameta" %%% "munit-scalacheck" % "0.7.26")
   lazy val fastParse = "com.lihaoyi" %% "fastparse" % "2.3.2"
   lazy val parsley = "org.http4s" %% "parsley" % "1.5.0-M3"
   lazy val jawnAst = "org.typelevel" %% "jawn-ast" % "1.1.2"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -13,3 +13,4 @@ addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.6.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")