zio · adamgfraser · Feb 22, 2023 · Nov 23, 2022 · Nov 23, 2022 · Feb 6, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -141,7 +141,7 @@ jobs:
         run: |
           sbt docs/mdoc
           sbt docs/unidoc
-    
+
       - name: Move Series 1.x Docs To 2.x Docs
         working-directory: ./
         run: |
@@ -161,17 +161,17 @@ jobs:
         with:
           name: website-artifact
           path: ./series/2.x/website/build
-          
+
       - name: Print All Generated Files
         run: find ./series/2.x/website/build -print
-  
+
   test:
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
-        scala: ['2.11.12', '2.12.17', '2.13.10', '3.2.0']
+        scala: ['2.11.12', '2.12.17', '2.13.10', '3.2.2']
         java: ['17']
         platform: ['JVM']
     steps:

diff --git a/build.sbt b/build.sbt
@@ -235,7 +235,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(stdSettings("zio"))
   .settings(crossProjectSettings)
   .settings(buildInfoSettings("zio"))
-  .settings(libraryDependencies += "dev.zio" %%% "izumi-reflect" % "2.2.2")
+  .settings(libraryDependencies += "dev.zio" %%% "izumi-reflect" % "2.2.5")
   .enablePlugins(BuildInfoPlugin)
   .settings(macroDefinitionSettings)
   .settings(

diff --git a/core-tests/shared/src/test/scala-3/zio/ExperimentalSpec.scala b/core-tests/shared/src/test/scala-3/zio/ExperimentalSpec.scala
@@ -1,6 +1,5 @@
 package zio
 
-import zio.Experimental._
 import zio.test._
 
 import scala.annotation.experimental
@@ -9,6 +8,8 @@ import scala.language.experimental.saferExceptions
 @experimental
 object ExperimentalSpec extends ZIOBaseSpec {
 
+  import zio.Experimental._
+
   val limit = 10e9
   class LimitExceeded extends Exception
   def f(x: Double): Double throws LimitExceeded =

diff --git a/core/js-jvm/src/main/scala/zio/UpdateRuntimeFlagsWithinPlatformSpecific.scala b/core/js-jvm/src/main/scala/zio/UpdateRuntimeFlagsWithinPlatformSpecific.scala
@@ -0,0 +1,9 @@
+package zio
+
+import java.util.function.IntFunction
+
+private[zio] trait UpdateRuntimeFlagsWithinPlatformSpecific {
+  // By the virtue of using IntFunction, it does not box.
+  // Soon available for Scala Native too: https://github.com/scala-native/scala-native/pull/3127
+  type RuntimeFlagsFunc[A] = IntFunction[A]
+}
diff --git a/core/native/src/main/scala/zio/UpdateRuntimeFlagsWithinPlatformSpecific.scala b/core/native/src/main/scala/zio/UpdateRuntimeFlagsWithinPlatformSpecific.scala
@@ -0,0 +1,8 @@
+package zio
+
+// This is split because `java.util.function.IntFunction` isn't available in Scala Native yet.
+// Once it's available, this should be merged together with the `js-jvm` variant back to `shared`.
+// https://github.com/scala-native/scala-native/pull/3127
+private[zio] trait UpdateRuntimeFlagsWithinPlatformSpecific {
+  type RuntimeFlagsFunc[A] = Int => A
+}
diff --git a/core/shared/src/main/scala/zio/ZIO.scala b/core/shared/src/main/scala/zio/ZIO.scala
@@ -5732,7 +5732,7 @@ object ZIO extends ZIOCompanionPlatformSpecific with ZIOCompanionVersionSpecific
 
     def scope(oldRuntimeFlags: RuntimeFlags): ZIO[R, E, A]
   }
-  private[zio] object UpdateRuntimeFlagsWithin {
+  private[zio] object UpdateRuntimeFlagsWithin extends UpdateRuntimeFlagsWithinPlatformSpecific {
     final case class Interruptible[R, E, A](trace: Trace, effect: ZIO[R, E, A])
         extends UpdateRuntimeFlagsWithin[R, E, A] {
       def update: RuntimeFlags.Patch = RuntimeFlags.enable(RuntimeFlag.Interruption)
@@ -5749,7 +5749,7 @@ object ZIO extends ZIOCompanionPlatformSpecific with ZIOCompanionVersionSpecific
         extends UpdateRuntimeFlagsWithin[R, E, A] {
       def scope(oldRuntimeFlags: RuntimeFlags): ZIO[R, E, A] = f(oldRuntimeFlags)
     }
-    final case class DynamicNoBox[R, E, A](trace: Trace, update: RuntimeFlags.Patch, f: IntFunction[ZIO[R, E, A]])
+    final case class DynamicNoBox[R, E, A](trace: Trace, update: RuntimeFlags.Patch, f: RuntimeFlagsFunc[ZIO[R, E, A]])
         extends UpdateRuntimeFlagsWithin[R, E, A] {
       def scope(oldRuntimeFlags: RuntimeFlags): ZIO[R, E, A] = f(oldRuntimeFlags)
     }

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -9,8 +9,8 @@ addSbtPlugin("com.typesafe"                      % "sbt-mima-plugin"
 addSbtPlugin("de.heikoseeberger"                 % "sbt-header"                    % "5.7.0")
 addSbtPlugin("org.portable-scala"                % "sbt-scala-native-crossproject" % "1.2.0")
 addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject"      % "1.2.0")
-addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.11.0")
-addSbtPlugin("org.scala-native"                  % "sbt-scala-native"              % "0.4.7")
+addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.12.0")
+addSbtPlugin("org.scala-native"                  % "sbt-scala-native"              % "0.4.9")
 addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                      % "2.3.2")
 addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"                  % "2.4.6")
 addSbtPlugin("pl.project13.scala"                % "sbt-jcstress"                  % "0.2.0")

diff --git a/test/jvm-native/src/main/scala/zio/test/TestDebug.scala b/test/jvm-native/src/main/scala/zio/test/TestDebug.scala
@@ -34,7 +34,7 @@ private[test] object TestDebug {
   }
 
   private def isBlank(input: String): Boolean =
-    input.chars().allMatch(Character.isWhitespace(_))
+    input.toCharArray.forall(Character.isWhitespace(_))
 
   def print(executionEvent: ExecutionEvent, lock: TestDebugFileLock) =
     executionEvent match {