Skip to content

Commit

Permalink
Upgrade to Scala 3.0.0-RC3
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist committed Apr 22, 2021
1 parent 19bb74c commit 268d0c1
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
26 changes: 13 additions & 13 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: [3.0.0-RC1, 3.0.0-RC2, 2.12.13, 2.13.5]
scala: [3.0.0-RC2, 3.0.0-RC3, 2.12.13, 2.13.5]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -102,22 +102,22 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (3.0.0-RC1)
- name: Download target directories (3.0.0-RC2)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC1-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}

- name: Inflate target directories (3.0.0-RC1)
- name: Inflate target directories (3.0.0-RC2)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.0.0-RC2)
- name: Download target directories (3.0.0-RC3)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }}

- name: Inflate target directories (3.0.0-RC2)
- name: Inflate target directories (3.0.0-RC3)
run: |
tar xf targets.tar
rm targets.tar
Expand Down Expand Up @@ -158,22 +158,22 @@ jobs:
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
- name: Download target directories (3.0.0-RC1)
- name: Download target directories (3.0.0-RC2)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC1-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}

- name: Inflate target directories (3.0.0-RC1)
- name: Inflate target directories (3.0.0-RC2)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.0.0-RC2)
- name: Download target directories (3.0.0-RC3)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }}

- name: Inflate target directories (3.0.0-RC2)
- name: Inflate target directories (3.0.0-RC3)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
16 changes: 8 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ThisBuild / organizationName := "Functional Streams for Scala"
ThisBuild / homepage := Some(url("https://github.com/typelevel/fs2"))
ThisBuild / startYear := Some(2013)

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

ThisBuild / githubWorkflowJavaVersions := Seq("[email protected]")

Expand Down Expand Up @@ -164,13 +164,13 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
.settings(
name := "fs2-core",
libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-core" % "2.5.0",
"org.typelevel" %%% "cats-laws" % "2.5.0" % Test,
"org.typelevel" %%% "cats-effect" % "2.4.1",
"org.typelevel" %%% "cats-effect-laws" % "2.4.1" % Test,
"org.scodec" %%% "scodec-bits" % "1.1.25",
"org.typelevel" %%% "scalacheck-effect-munit" % "1.0.0" % Test,
"org.typelevel" %%% "munit-cats-effect-2" % "1.0.1" % Test
"org.typelevel" %%% "cats-core" % "2.6.0",
"org.typelevel" %%% "cats-laws" % "2.6.0" % Test,
"org.typelevel" %%% "cats-effect" % "2.5.0",
"org.typelevel" %%% "cats-effect-laws" % "2.5.0" % Test,
"org.scodec" %%% "scodec-bits" % "1.1.26",
"org.typelevel" %%% "scalacheck-effect-munit" % "1.0.1" % Test,
"org.typelevel" %%% "munit-cats-effect-2" % "1.0.2" % Test
),
Compile / unmanagedSourceDirectories ++= {
val major = if (isDotty.value) "-3" else "-2"
Expand Down

0 comments on commit 268d0c1

Please sign in to comment.