Switch global scope to parent scope in ZIOConcurrent

zio · Feb 17, 2024 · a169b1f · a169b1f
1 parent b49e9d2
commit a169b1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -51,7 +51,7 @@ lazy val root = project
  unusedCompileDependenciesFilter -= moduleFilter("org.scala-js", "scalajs-library")
  )
 
-val zioVersion = "2.0.16"
+val zioVersion = "2.0.21"
 val catsVersion = "2.9.0"
 val catsEffectVersion = "3.4.8"
 val catsMtlVersion = "1.3.0"

diff --git a/zio-interop-cats/shared/src/main/scala/zio/interop/cats.scala b/zio-interop-cats/shared/src/main/scala/zio/interop/cats.scala
@@ -27,7 +27,6 @@ import zio.{ Fiber, Ref as ZRef }
 import zio.*
 import zio.Clock.{ currentTime, nanoTime }
 import zio.Duration
-import zio.internal.FiberScope
 import zio.internal.stacktracer.{ InteropTracer, Tracer as CoreTracer }
 
 import java.util.concurrent.atomic.AtomicBoolean
@@ -421,9 +420,9 @@ private abstract class ZioConcurrent[R, E, E1]
  val raceIndicator = new AtomicBoolean(true)
 
  val leftFiber =
- ZIO.unsafe.makeChildFiber(trace, left, parentFiber, parentRuntimeFlags, FiberScope.global)(Unsafe.unsafe)
+ ZIO.unsafe.makeChildFiber(trace, left, parentFiber, parentRuntimeFlags, parentFiber.scope)(Unsafe.unsafe)
  val rightFiber =
- ZIO.unsafe.makeChildFiber(trace, right, parentFiber, parentRuntimeFlags, FiberScope.global)(Unsafe.unsafe)
+ ZIO.unsafe.makeChildFiber(trace, right, parentFiber, parentRuntimeFlags, parentFiber.scope)(Unsafe.unsafe)
 
  val startLeftFiber = leftFiber.startSuspended()(Unsafe.unsafe)
  val startRightFiber = rightFiber.startSuspended()(Unsafe.unsafe)