Skip to content

Commit

Permalink
Merge pull request #318 from typelevel/topic/rc1
Browse files Browse the repository at this point in the history
Scala 3.0.0-RC1
  • Loading branch information
larsrh authored Feb 17, 2021
2 parents 3c3c2f9 + 1bfc842 commit f467579
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .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-M2, 3.0.0-M3, 2.12.12, 2.13.3]
scala: [3.0.0-M3, 3.0.0-RC1, 2.12.12, 2.13.3]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ThisBuild / developers := List(
val Scala213 = "2.13.3"

ThisBuild / scalaVersion := crossScalaVersions.value.last
ThisBuild / crossScalaVersions := Seq("3.0.0-M2", "3.0.0-M3", "2.12.12", Scala213)
ThisBuild / crossScalaVersions := Seq("3.0.0-M3", "3.0.0-RC1", "2.12.12", Scala213)

ThisBuild / githubWorkflowBuildPreamble ++= Seq(
WorkflowStep.Use(
Expand Down Expand Up @@ -59,7 +59,7 @@ lazy val commonJsSettings = Seq(
doctestGenTests := Seq.empty
)

val CatsVersion = "2.4.1"
val CatsVersion = "2.4.2"

lazy val root = project
.in(file("."))
Expand Down Expand Up @@ -169,7 +169,7 @@ lazy val tests = crossProject(JSPlatform, JVMPlatform)
.settings(name := "cats-mtl-tests")
.settings(libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-testkit" % CatsVersion,
"org.typelevel" %%% "discipline-munit" % "1.0.5"))
"org.typelevel" %%% "discipline-munit" % "1.0.6"))
.jsSettings(commonJsSettings)
.jvmSettings(commonJvmSettings)
.jsSettings(Test / scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule)))
Expand Down

0 comments on commit f467579

Please sign in to comment.