Skip to content

Commit

Permalink
Merge branch 'master' into scalafmt-3.0.0-RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
ruippeixotog committed Apr 21, 2021
2 parents fd8e5de + ce323f1 commit af8d93e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
- scala: '2.13'
scala-version: 2.13.5
- scala: '3.0'
scala-version: 3.0.0-RC1
scala-version: 3.0.0-RC2

steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion modules/cats-effect/build.sbt
Expand Up @@ -6,7 +6,7 @@ name := "pureconfig-cats-effect"
crossScalaVersions := Seq(scala212, scala213)

libraryDependencies ++= Seq(
"org.typelevel" %% "cats-effect" % "3.0.2"
"org.typelevel" %% "cats-effect" % "3.1.0"
)

developers := List(Developer("keirlawson", "Keir Lawson", "keirlawson@gmail.com", url("https://github.com/keirlawson")))
Expand Down
4 changes: 2 additions & 2 deletions modules/cats/build.sbt
Expand Up @@ -6,8 +6,8 @@ name := "pureconfig-cats"
crossScalaVersions := Seq(scala212, scala213)

libraryDependencies ++= Seq(
"org.typelevel" %% "cats-core" % "2.5.0",
"org.typelevel" %% "cats-laws" % "2.5.0" % "test",
"org.typelevel" %% "cats-core" % "2.6.0",
"org.typelevel" %% "cats-laws" % "2.6.0" % "test",
"org.typelevel" %% "discipline-scalatest" % "2.1.3" % "test"
)

Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Expand Up @@ -5,13 +5,13 @@ object Dependencies {
object Version {
val scala212 = "2.12.12"
val scala213 = "2.13.5"
val scala30 = "3.0.0-RC1"
val scala30 = "3.0.0-RC2"

val shapeless = "2.3.4"
val typesafeConfig = "1.4.1"

val scalaTest = "3.2.6"
val scalaTestPlusScalaCheck = "3.2.7.0"
val scalaTest = "3.2.7"
val scalaTestPlusScalaCheck = "3.2.8.0"

val scalaCheck = "1.15.3"
val scalaCheckShapeless = "1.2.5"
Expand Down

0 comments on commit af8d93e

Please sign in to comment.