From 5a92f39297a447ea2e8fc54e558b90b07cf3a58e Mon Sep 17 00:00:00 2001
From: Adam Fraser <adam.fraser@gmail.com>
Date: Wed, 23 Aug 2023 07:01:59 -0700
Subject: [PATCH 1/2] update to latest zio version

---
 build.sbt                                           |  2 +-
 .../src/test/scala/zio/interop/CatsSpecBase.scala   | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/build.sbt b/build.sbt
index 5f2947cf..563bf8d5 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.0.13"
+val zioVersion                 = "2.0.16"
 val catsVersion                = "2.9.0"
 val catsEffectVersion          = "3.4.8"
 val catsMtlVersion             = "1.3.0"
diff --git a/zio-interop-cats-tests/shared/src/test/scala/zio/interop/CatsSpecBase.scala b/zio-interop-cats-tests/shared/src/test/scala/zio/interop/CatsSpecBase.scala
index a3a86a7e..20116ec9 100644
--- a/zio-interop-cats-tests/shared/src/test/scala/zio/interop/CatsSpecBase.scala
+++ b/zio-interop-cats-tests/shared/src/test/scala/zio/interop/CatsSpecBase.scala
@@ -98,14 +98,11 @@ private[zio] trait CatsSpecBase
 
   implicit def runtime(implicit ticker: Ticker): Runtime[Any] = {
     val tickerExecutor = Executor.fromExecutionContext(ticker.ctx)
-    val fiberId        = Unsafe.unsafe(implicit u => FiberId.make(Trace.empty))
-    val fiberRefs      = FiberRefs(
-      Map(
-        FiberRef.overrideExecutor        -> ::(fiberId -> Some(tickerExecutor), Nil),
-        FiberRef.currentBlockingExecutor -> ::(fiberId -> tickerExecutor, Nil),
-        DefaultServices.currentServices  -> ::(fiberId -> DefaultServices.live.add[Clock](testClock), Nil)
-      )
-    )
+    val fiberId        = FiberId.make(Trace.empty)(Unsafe.unsafe)
+    val fiberRefs      = FiberRefs.empty
+      .updatedAs(fiberId)(FiberRef.overrideExecutor, Some(tickerExecutor))
+      .updatedAs(fiberId)(FiberRef.currentBlockingExecutor, tickerExecutor)
+      .updatedAs(fiberId)(DefaultServices.currentServices, DefaultServices.live.add[Clock](testClock))
     val runtimeFlags   = RuntimeFlags.default
     Runtime(ZEnvironment.empty, fiberRefs, runtimeFlags)
   }

From 173634bf9fec6ac0a4f1e85a4417825ba621289a Mon Sep 17 00:00:00 2001
From: Adam Fraser <adam.fraser@gmail.com>
Date: Wed, 23 Aug 2023 07:38:04 -0700
Subject: [PATCH 2/2] update scala 3 version

---
 .github/workflows/ci.yml  | 6 +++---
 project/BuildHelper.scala | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67e00468..22985df4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['adopt@1.8', 'adopt@1.11']
-        scala: ['2.12.17', '2.13.10', '3.2.1']
+        scala: ['2.12.17', '2.13.10', '3.3.0']
         platform: ['JVM', 'JS']
     steps:
       - name: Checkout current branch
@@ -45,10 +45,10 @@ jobs:
       - name: Cache scala dependencies
         uses: coursier/cache-action@v5
       - name: Run tests
-        if: matrix.scala != '3.2.1'
+        if: matrix.scala != '3.3.0'
         run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
       - name: Run dotty tests
-        if: matrix.scala == '3.2.1' && matrix.platform == 'JVM'
+        if: matrix.scala == '3.3.0' && matrix.platform == 'JVM'
         run: sbt ++${{ matrix.scala }}! testJVM
 
   ci:
diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
index 7a6fc88e..a50916a0 100644
--- a/project/BuildHelper.scala
+++ b/project/BuildHelper.scala
@@ -11,7 +11,7 @@ object BuildHelper {
 
   val Scala212 = "2.12.17"
   val Scala213 = "2.13.10"
-  val Scala3   = "3.2.1"
+  val Scala3   = "3.3.0"
 
   private val stdOptions = Seq(
     "-deprecation",
@@ -61,7 +61,7 @@ object BuildHelper {
 
   def extraOptions(scalaVersion: String, optimize: Boolean) =
     CrossVersion.partialVersion(scalaVersion) match {
-      case Some((3, 2))  =>
+      case Some((3, 3))  =>
         std3xOptions
       case Some((2, 13)) =>
         Seq(