diff --git a/build.sbt b/build.sbt index b589d9da..ea6cd578 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ lazy val root = project unusedCompileDependenciesFilter -= moduleFilter("org.scala-js", "scalajs-library") ) -val zioVersion = "1.0.0-RC20" +val zioVersion = "1.0.0-RC21" lazy val interopCats = crossProject(JSPlatform, JVMPlatform) .in(file("interop-cats")) .enablePlugins(BuildInfoPlugin) diff --git a/interop-cats/shared/src/main/scala/zio/interop/cats.scala b/interop-cats/shared/src/main/scala/zio/interop/cats.scala index 60cb110c..b50f4ada 100644 --- a/interop-cats/shared/src/main/scala/zio/interop/cats.scala +++ b/interop-cats/shared/src/main/scala/zio/interop/cats.scala @@ -201,8 +201,7 @@ private class CatsConcurrentEffect[R](rts: Runtime[R]) _ => fa ) .interruptible - .forkWithErrorHandler(_ => ZIO.unit) - .tap(ZIO.disown) + .forkDaemon .map(_.interrupt.unit) } } diff --git a/interop-cats/shared/src/test/scala/zio/stream/interop/catzSpecZStreamBase.scala b/interop-cats/shared/src/test/scala/zio/stream/interop/catzSpecZStreamBase.scala index 502a5b96..bf05b4bb 100644 --- a/interop-cats/shared/src/test/scala/zio/stream/interop/catzSpecZStreamBase.scala +++ b/interop-cats/shared/src/test/scala/zio/stream/interop/catzSpecZStreamBase.scala @@ -7,13 +7,15 @@ import org.scalacheck.{ Arbitrary, Cogen, Gen } import zio.interop.catz.taskEffectInstance import zio.interop.catzSpecBase import zio.stream._ -import zio.ZIO +import zio.{ Chunk, ZIO } private[interop] trait catzSpecZStreamBase extends catzSpecBase with catzSpecZStreamBaseLowPriority with GenStreamInteropCats { + implicit def chunkEq[A](implicit ev: Eq[A]): Eq[Chunk[A]] = (x: Chunk[A], y: Chunk[A]) => x.corresponds(y)(ev.eqv) + implicit def zstreamEqStream[E: Eq, A: Eq](implicit tc: TestContext): Eq[Stream[E, A]] = Eq.by(_.either) implicit def zstreamEqUStream[A: Eq](implicit tc: TestContext): Eq[Stream[Nothing, A]] =