Skip to content

Commit

Permalink
Updated for Scala 3
Browse files Browse the repository at this point in the history
  • Loading branch information
djspiewak committed May 23, 2021
1 parent 6f696ef commit 3a4b010
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.0.0-RC3, 2.12.13, 2.13.5]
scala: [3.0.0, 2.12.13, 2.13.6]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -49,6 +49,6 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Check that workflows are up to date
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck'

- run: sbt ++${{ matrix.scala }} ci
- run: sbt --client '++${{ matrix.scala }}; ci'
15 changes: 7 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ThisBuild / organization := "com.codecommit"
ThisBuild / publishGithubUser := "djspiewak"
ThisBuild / publishFullName := "Daniel Spiewak"

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

ThisBuild / githubWorkflowTargetBranches := Seq("series/0.x")

Expand All @@ -34,7 +34,7 @@ ThisBuild / scmInfo := Some(
url("https://github.com/djspiewak/cats-effect-testing"),
"[email protected]:djspiewak/cats-effect-testing.git"))

val CatsEffectVersion = "2.5.0"
val CatsEffectVersion = "2.5.1"

lazy val root = project
.in(file("."))
Expand All @@ -46,15 +46,14 @@ lazy val specs2 = project
.settings(
name := "cats-effect-testing-specs2",

libraryDependencies += "org.specs2" %% "specs2-core" % "4.10.6",
libraryDependencies += ("org.specs2" %% "specs2-core" % "4.12.0").cross(CrossVersion.for3Use2_13),

mimaPreviousArtifacts := {
if (isDotty.value)
Set()
else
mimaPreviousArtifacts.value
})
.settings(dottyLibrarySettings)
.settings(libraryDependencies += "org.typelevel" %% "cats-effect" % CatsEffectVersion)

lazy val `scalatest-scalacheck` = project
Expand All @@ -64,7 +63,7 @@ lazy val `scalatest-scalacheck` = project

libraryDependencies ++= Seq(
"org.typelevel" %% "cats-effect" % CatsEffectVersion,
"org.scalatestplus" %% "scalacheck-1-15" % "3.2.8.0",
"org.scalatestplus" %% "scalacheck-1-15" % "3.2.9.0",
"org.scalacheck" %% "scalacheck" % "1.15.3"),

mimaPreviousArtifacts := mimaPreviousArtifacts.value - ("com.codecommit" %% name.value % "0.3.0")
Expand All @@ -77,7 +76,7 @@ lazy val scalatest = project

libraryDependencies ++= Seq(
"org.typelevel" %% "cats-effect" % CatsEffectVersion,
"org.scalatest" %% "scalatest" % "3.2.8"),
"org.scalatest" %% "scalatest" % "3.2.9"),

mimaPreviousArtifacts := mimaPreviousArtifacts.value -- Seq(
"com.codecommit" %% name.value % "0.1.0",
Expand All @@ -93,7 +92,7 @@ lazy val utest = project
libraryDependencies ++= Seq(
"org.typelevel" %% "cats-effect" % CatsEffectVersion,
"org.typelevel" %% "cats-effect-laws" % CatsEffectVersion,
"com.lihaoyi" %% "utest" % "0.7.9"))
"com.lihaoyi" %% "utest" % "0.7.10"))

lazy val minitest = project
.in(file("minitest"))
Expand All @@ -104,6 +103,6 @@ lazy val minitest = project
libraryDependencies ++= Seq(
"org.typelevel" %% "cats-effect" % CatsEffectVersion,
"org.typelevel" %% "cats-effect-laws" % CatsEffectVersion,
"io.monix" %% "minitest" % "2.9.5"),
"io.monix" %% "minitest" % "2.9.6"),

mimaPreviousArtifacts := mimaPreviousArtifacts.value - ("com.codecommit" %% name.value % "0.1.0"))
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.9
sbt.version=1.5.1
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.20.4")
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.21.0")

0 comments on commit 3a4b010

Please sign in to comment.