Skip to content

Commit

Permalink
Upgrade to Scala 3
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist committed May 14, 2021
1 parent 83afe82 commit 3a95d07
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 20 deletions.
20 changes: 5 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.13, 2.13.5, 3.0.0-RC2, 3.0.0-RC3]
scala: [2.12.13, 2.13.5, 3.0.0]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.0.0-RC3]
scala: [3.0.0]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -119,22 +119,12 @@ jobs:
tar xf targets.tar
rm targets.tar
- 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
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ThisBuild / developers ++= List(
Developer("nequissimus", "Tim Steinbach", "@nequissimus", url("https://github.com/nequissimus"))
)

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

ThisBuild / spiewakCiReleaseSnapshots := true

Expand Down Expand Up @@ -66,7 +66,7 @@ lazy val testKit = crossProject(JVMPlatform, JSPlatform)
.settings(
libraryDependencies ++= Seq(
"org.scalacheck" %%% "scalacheck" % "1.15.4",
"org.scalameta" %%% "munit-scalacheck" % "0.7.25" % Test
"org.scalameta" %%% "munit-scalacheck" % "0.7.26" % Test
)
)
.jvmSettings(
Expand Down Expand Up @@ -112,14 +112,14 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
.settings(dottyLibrarySettings)
.settings(dottyJsSettings(ThisBuild / crossScalaVersions))
.settings(
libraryDependencies += "org.typelevel" %%% "literally" % "1.0.1"
libraryDependencies += "org.typelevel" %%% "literally" % "1.0.2"
)
.jvmSettings(
libraryDependencies += "org.typelevel" %%% "cats-effect" % "3.1.0"
libraryDependencies += "org.typelevel" %%% "cats-effect" % "3.1.1"
)
.settings(
libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-core" % "2.6.0",
"org.typelevel" %%% "cats-core" % "2.6.1",
"org.scalacheck" %%% "scalacheck" % "1.15.4" % Test
)
)
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.20")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")

0 comments on commit 3a95d07

Please sign in to comment.