Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scala3-library to 3.1.3 #154

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 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.13.8, 3.1.2, 2.12.14]
scala: [2.13.8, 3.1.3, 2.12.14]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -116,12 +116,12 @@ jobs:
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (3.1.2)
- name: Inflate target directories (3.1.3)
run: |
tar xf targets.tar
rm targets.tar
Expand Down Expand Up @@ -162,12 +162,12 @@ jobs:
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (3.1.2)
- name: Inflate target directories (3.1.3)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
21 changes: 13 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Global / excludeLintKeys += scmInfo
val Scala213 = "2.13.8"
ThisBuild / spiewakMainBranches := Seq("main")

ThisBuild / crossScalaVersions := Seq(Scala213, "3.1.2", "2.12.14")
ThisBuild / crossScalaVersions := Seq(Scala213, "3.1.3", "2.12.14")
ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head
ThisBuild / initialCommands := """
|import cats._, data._, syntax.all._
Expand All @@ -34,9 +34,11 @@ ThisBuild / initialCommands := """
ThisBuild / testFrameworks += new TestFramework("munit.Framework")
ThisBuild / Test / parallelExecution := false

def dep(org: String, prefix: String, version: String)(modules: String*)(testModules: String*) =
def dep(org: String, prefix: String, version: String)(modules: String*)(
testModules: String*
) =
modules.map(m => org %% (prefix ++ m) % version) ++
testModules.map(m => org %% (prefix ++ m) % version % Test)
testModules.map(m => org %% (prefix ++ m) % version % Test)

lazy val root = project
.in(file("."))
Expand All @@ -50,11 +52,14 @@ lazy val core = project
scalafmtOnCompile := true,
libraryDependencies ++=
dep("org.typelevel", "cats-", "2.7.0")("core")() ++
dep("org.typelevel", "cats-effect", "3.3.11")("")("-laws", "-testkit") ++
dep("co.fs2", "fs2-", "3.2.7")("core")() ++
dep("org.scalameta", "munit", "0.7.29")()("", "-scalacheck") ++
dep("org.typelevel", "", "1.0.7")()("munit-cats-effect-3") ++
dep("org.typelevel", "scalacheck-effect", "1.0.3")()("", "-munit")
dep("org.typelevel", "cats-effect", "3.3.11")("")(
"-laws",
"-testkit"
) ++
dep("co.fs2", "fs2-", "3.2.7")("core")() ++
dep("org.scalameta", "munit", "0.7.29")()("", "-scalacheck") ++
dep("org.typelevel", "", "1.0.7")()("munit-cats-effect-3") ++
dep("org.typelevel", "scalacheck-effect", "1.0.3")()("", "-munit")
)

lazy val docs = project
Expand Down