From bf24db580870f23ef1a8493335b340ac43ba0e71 Mon Sep 17 00:00:00 2001 From: kyri-petrou <67301607+kyri-petrou@users.noreply.github.com> Date: Tue, 6 Aug 2024 18:24:32 +0300 Subject: [PATCH] Bump the ZIO version to 2.1.7 (#698) --- build.sbt | 2 +- .../shared/src/test/scala/zio/interop/ZioSpecBase.scala | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 7c38b9d4..8fe1ce71 100644 --- a/build.sbt +++ b/build.sbt @@ -51,7 +51,7 @@ lazy val root = project unusedCompileDependenciesFilter -= moduleFilter("org.scala-js", "scalajs-library") ) -val zioVersion = "2.1.1" +val zioVersion = "2.1.7" val catsVersion = "2.10.0" val catsEffectVersion = "3.5.4" val catsMtlVersion = "1.4.0" diff --git a/zio-interop-cats-tests/shared/src/test/scala/zio/interop/ZioSpecBase.scala b/zio-interop-cats-tests/shared/src/test/scala/zio/interop/ZioSpecBase.scala index 49aaf827..637e6a98 100644 --- a/zio-interop-cats-tests/shared/src/test/scala/zio/interop/ZioSpecBase.scala +++ b/zio-interop-cats-tests/shared/src/test/scala/zio/interop/ZioSpecBase.scala @@ -65,7 +65,11 @@ private[interop] trait ZioSpecBaseLowPriority { self: ZioSpecBase => } implicit def arbitraryZIO[R: Cogen: Tag, E: CanFail: Arbitrary: Cogen, A: Arbitrary: Cogen]: Arbitrary[ZIO[R, E, A]] = - Arbitrary(Gen.function1[ZEnvironment[R], IO[E, A]](arbitraryIO[E, A].arbitrary).map(ZIO.environment[R].flatMap)) + Arbitrary(Gen.function1[ZEnvironment[R], IO[E, A]](arbitraryIO[E, A].arbitrary).map { f => + // TODO: Remove this once it's fixed in ZIO + if (Tag[R] =:= Tag[Any]) f(ZEnvironment(()).asInstanceOf[ZEnvironment[R]]) + else ZIO.environment[R].flatMap(f) + }) implicit def arbitraryTask[A: Arbitrary: Cogen](implicit ticker: Ticker): Arbitrary[Task[A]] = { val arbIO = arbitraryIO[Throwable, A]