Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-ci-release-1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vigoo authored Aug 14, 2024
2 parents 0fcd084 + 4e43509 commit b81a451
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = 3.8.1
version = 3.8.3
runner.dialect = "scala213source3"
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ val scala212 = "2.12.18"
val scala213 = "2.13.12"
val scala3 = "3.3.3"

val zio2Version = "2.0.22"
val zio2Version = "2.1.7"

def scalacOptions212(jdk: Int) = Seq(
"-Ypartial-unification",
Expand Down Expand Up @@ -103,7 +103,7 @@ lazy val proxFS23 = Project("prox-fs2-3", file("prox-fs2-3"))
"dev.zio" %% "zio" % zio2Version % "test",
"dev.zio" %% "zio-test" % zio2Version % "test",
"dev.zio" %% "zio-test-sbt" % zio2Version % "test",
"dev.zio" %% "zio-interop-cats" % "23.1.0.2" % "test"
"dev.zio" %% "zio-interop-cats" % "23.1.0.3" % "test"
),
testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")
)
Expand All @@ -117,7 +117,7 @@ lazy val proxZStream2 = Project("prox-zstream-2", file("prox-zstream-2"))
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % zio2Version,
"dev.zio" %% "zio-streams" % zio2Version,
"dev.zio" %% "zio-prelude" % "1.0.0-RC23",
"dev.zio" %% "zio-prelude" % "1.0.0-RC28",
"dev.zio" %% "zio-test" % zio2Version % "test",
"dev.zio" %% "zio-test-sbt" % zio2Version % "test"
),
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.4")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.0")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
Expand Down

0 comments on commit b81a451

Please sign in to comment.