Skip to content

Commit 91e0cae

Browse files
Dependency updates (#2263)
* Update docker-java-core to 3.4.2 * Update sbt-pgp to 2.3.1 * Update zio to 2.1.16 * Update circe-core to 0.14.12 * Update sbt-scalajs to 1.18.2 * Update scala-collection-compat to 2.13.0 * Update sbt to 1.10.11 * Update sbt-mdoc to 2.6.5 * Update scalamock to 6.2.0 * Update slf4j-api to 2.0.17 * com.github.sbt sbt-pgp * Workaround Scala 3 bincompat failure with new zio * Fix Scala 2 bincompat --------- Co-authored-by: Kai <[email protected]>
1 parent 11269ab commit 91e0cae

File tree

8 files changed

+18
-14
lines changed

8 files changed

+18
-14
lines changed

fundamentals/fundamentals-bio/src/main/scala/izumi/functional/bio/impl/AsyncZio.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ open class AsyncZio[R] extends Async2[ZIO[R, +_, +_]] {
364364
.withIsInterruptedF(i => release(a, Exit.ZIOExit.toExit(e)(i)))
365365
.foldCauseZIO(
366366
cause2 => ZIO.refailCause(e.foldExit(_ ++ cause2, _ => cause2)),
367-
_ => ZIO.done(e),
367+
_ => e,
368368
)
369369
}
370370
}

fundamentals/fundamentals-bio/src/main/scala/izumi/functional/lifecycle/Lifecycle.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,10 @@ object Lifecycle extends LifecycleInstances {
936936
private def zioSucceedWorkaround[F[x] >: ZIO[Any, Nothing, x], A](a: A): F[A] = {
937937
zio.Exit.Success(a)
938938
}
939+
// Another workaround for a Scala 3 bincompat failure:
940+
// java.lang.NoClassDefFoundError: zio/CanFail.
941+
// Appeared in an update from zio 2.1.14 to 2.1.16
942+
private implicit def zioCanFailWorkaround[F[x] >: zio.CanFail[x], E]: F[E] = null
939943
}
940944

941945
private[izumi] sealed trait LifecycleInstances extends LifecycleCatsInstances {

fundamentals/fundamentals-bio/src/main/scala/zio/_izumicompat_/__ZIORaceCompat.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object __ZIORaceCompat {
1414
* the global scope instead of the scope of the parent fiber.
1515
*/
1616
final def raceFirst[R, E, A](self: ZIO[R, E, A], that: => ZIO[R, E, A])(implicit trace: Trace): ZIO[R, E, A] =
17-
this.race(self.exit, that.exit).flatMap(ZIO.done(_))
17+
this.race(self.exit, that.exit).flatMap(identity)
1818

1919
/**
2020
* An implementation of `race` that forks the left and right fibers in

project/Deps.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ object Izumi {
932932
pluginConflictRules = Map(assemblyPluginJvm.name -> true),
933933
appendPlugins = Defaults.SbtGenPlugins ++ Seq(
934934
SbtPlugin("com.eed3si9n", "sbt-assembly", PV.sbt_assembly),
935-
SbtPlugin("com.jsuereth", "sbt-pgp", PV.sbt_pgp),
935+
SbtPlugin("com.github.sbt", "sbt-pgp", PV.sbt_pgp),
936936
SbtPlugin("org.scoverage", "sbt-scoverage", PV.sbt_scoverage),
937937
SbtPlugin("com.github.sbt", "sbt-unidoc", PV.sbt_unidoc),
938938
SbtPlugin("com.github.sbt", "sbt-site", PV.sbt_site),

project/Versions.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ object V {
33
val izumi_reflect = "2.3.10"
44

55
// foundation
6-
val collection_compat = "2.12.0"
6+
val collection_compat = "2.13.0"
77

88
val kind_projector = "0.13.3"
99

@@ -15,13 +15,13 @@ object V {
1515
val discipline = "1.7.0"
1616
val discipline_scalatest = "2.3.0"
1717

18-
val zio = "2.1.14"
18+
val zio = "2.1.16"
1919
val zio_interop_cats = "23.1.0.4"
2020

2121
val monix = "3.4.0"
2222
val monix_bio = "1.2.0"
2323

24-
val circe = "0.14.10"
24+
val circe = "0.14.12"
2525
val circe_derivation = "0.13.0-M5"
2626
val pureconfig = "0.17.8"
2727
val magnolia = "1.1.10"
@@ -32,16 +32,16 @@ object V {
3232

3333
// java-only dependencies below
3434
val classgraph = "4.8.179"
35-
val slf4j = "2.0.16"
35+
val slf4j = "2.0.17"
3636
val typesafe_config = "1.4.0"
3737

3838
// good to drop - java
3939
val bytebuddy = "1.15.11"
40-
val docker_java = "3.4.1"
40+
val docker_java = "3.4.2"
4141

4242
// microsite-only
4343
val doobie = "1.0.0-RC2"
4444

4545
// test-only
46-
val scalamock = "6.1.1"
46+
val scalamock = "6.2.0"
4747
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.10.7
1+
sbt.version = 1.10.11

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ addSbtPlugin("io.7mind.izumi.sbt" % "sbt-izumi" % "0.0.104")
1919

2020
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % PV.sbt_assembly)
2121

22-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % PV.sbt_pgp)
22+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % PV.sbt_pgp)
2323

2424
addSbtPlugin("org.scoverage" % "sbt-scoverage" % PV.sbt_scoverage)
2525

project/project/PluginVersions.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
object PV {
2-
val scala_js_version = "1.18.1"
2+
val scala_js_version = "1.18.2"
33

4-
val sbt_mdoc = "2.6.2"
4+
val sbt_mdoc = "2.6.5"
55
val sbt_paradox_material_theme = "0.7.0"
66
val sbt_paradox = "0.10.7"
77
val sbt_ghpages = "0.8.0"
88
val sbt_site = "1.7.0"
99
val sbt_unidoc = "0.5.0"
1010
val sbt_scoverage = "2.3.1"
11-
val sbt_pgp = "2.1.1"
11+
val sbt_pgp = "2.3.1"
1212
val sbt_assembly = "0.14.9"
1313
}

0 commit comments

Comments
 (0)