Skip to content

Commit 09ca465

Browse files
authored
Upgrade to Scala 3 (#222)
1 parent 8bdf606 commit 09ca465

File tree

4 files changed

+9
-18
lines changed

4 files changed

+9
-18
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
os: [ubuntu-latest]
29-
scala: [3.0.0-RC2, 3.0.0-RC3, 2.11.12, 2.12.13, 2.13.5]
29+
scala: [3.0.0, 2.11.12, 2.12.13, 2.13.5]
3030
java: [adopt@1.8]
3131
runs-on: ${{ matrix.os }}
3232
steps:
@@ -102,22 +102,12 @@ jobs:
102102
~/Library/Caches/Coursier/v1
103103
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
104104

105-
- name: Download target directories (3.0.0-RC2)
105+
- name: Download target directories (3.0.0)
106106
uses: actions/download-artifact@v2
107107
with:
108-
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
108+
name: target-${{ matrix.os }}-3.0.0-${{ matrix.java }}
109109

110-
- name: Inflate target directories (3.0.0-RC2)
111-
run: |
112-
tar xf targets.tar
113-
rm targets.tar
114-
115-
- name: Download target directories (3.0.0-RC3)
116-
uses: actions/download-artifact@v2
117-
with:
118-
name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }}
119-
120-
- name: Inflate target directories (3.0.0-RC3)
110+
- name: Inflate target directories (3.0.0)
121111
run: |
122112
tar xf targets.tar
123113
rm targets.tar

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ThisBuild / organizationName := "Typelevel"
1414
ThisBuild / publishGithubUser := "johnynek"
1515
ThisBuild / publishFullName := "P. Oscar Boykin"
1616

17-
ThisBuild / crossScalaVersions := List("3.0.0-RC2", "3.0.0-RC3", "2.11.12", "2.12.13", "2.13.5")
17+
ThisBuild / crossScalaVersions := List("3.0.0", "2.11.12", "2.12.13", "2.13.5")
1818

1919
ThisBuild / spiewakCiReleaseSnapshots := true
2020

project/Dependencies.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import sbt._
22
import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
33

44
object Dependencies {
5-
lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % "2.6.0")
5+
lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % "2.6.1")
66
lazy val cats211 = Def.setting("org.typelevel" %%% "cats-core" % "2.0.0")
7-
lazy val munit = Def.setting("org.scalameta" %%% "munit" % "0.7.25")
8-
lazy val munitScalacheck = Def.setting("org.scalameta" %%% "munit-scalacheck" % "0.7.25")
7+
lazy val munit = Def.setting("org.scalameta" %%% "munit" % "0.7.26")
8+
lazy val munitScalacheck = Def.setting("org.scalameta" %%% "munit-scalacheck" % "0.7.26")
99
lazy val fastParse = "com.lihaoyi" %% "fastparse" % "2.3.2"
1010
lazy val parsley = "org.http4s" %% "parsley" % "1.5.0-M3"
1111
lazy val jawnAst = "org.typelevel" %% "jawn-ast" % "1.1.2"

project/plugins.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.6.0")
1313
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
1414
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
1515
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0")
16+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")

0 commit comments

Comments
 (0)