Merge branch 'series/2.x' into update/scala-compiler-2.13.13

zio · Apr 13, 2024 · b2b68de · b2b68de
2 parents 491ce29 + 8cdeb94
commit b2b68de
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.17"
+version = "3.8.1"
 maxColumn = 120
 align.preset = most
 continuationIndent.defnSite = 2

diff --git a/core/shared/src/main/scala/zio/prelude/fx/ZPure.scala b/core/shared/src/main/scala/zio/prelude/fx/ZPure.scala
@@ -388,7 +388,7 @@ sealed trait ZPure[+W, -S1, +S2, -R, +E, +A] { self =>
   final def none[B](implicit ev: A <:< Option[B]): ZPure[W, S1, S2, R, Option[E], Unit] =
     self.foldM(
       e => ZPure.fail(Some(e)),
-      a => a.fold[ZPure[W, S2, S2, R, Option[E], Unit]](ZPure.succeed(()))(_ => ZPure.fail(None))
+      a => a.fold[ZPure[W, S2, S2, R, Option[E], Unit]](ZPure.unit)(_ => ZPure.fail(None))
     )
 
   /**
@@ -972,6 +972,8 @@ sealed trait ZPure[+W, -S1, +S2, -R, +E, +A] { self =>
 }
 
 object ZPure {
+  private val succeedUnit: ZPure[Nothing, Any, Nothing, Any, Nothing, Unit]            = Succeed(())
+  private val succeedNone: ZPure[Nothing, Any, Nothing, Any, Nothing, Option[Nothing]] = Succeed(None)
 
   /**
    * Constructs a computation, catching any `Throwable` that is thrown.
@@ -1164,7 +1166,7 @@ object ZPure {
    * Constructs a computation that succeeds with the `None` value.
    */
   def none[S]: ZPure[Nothing, S, S, Any, Nothing, Option[Nothing]] =
-    succeed(None)
+    succeedNone
 
   /**
    * Accesses the specified service in the environment of the computation.
@@ -1209,7 +1211,7 @@ object ZPure {
    * state through unchanged.
    */
   def unit[S]: ZPure[Nothing, S, S, Any, Nothing, Unit] =
-    succeed(())
+    succeedUnit
 
   /**
    * The moral equivalent of `if (!p) exp`

diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -8,7 +8,7 @@ import sbtcrossproject.CrossPlugin.autoImport.*
 import scalafix.sbt.ScalafixPlugin.autoImport.*
 
 object BuildHelper {
-  val Scala212: String = "2.12.18"
+  val Scala212: String = "2.12.19"
   val Scala213: String = "2.13.13"
   val Scala3: String   = "3.3.3"
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 addSbtPlugin("ch.epfl.scala"                     % "sbt-bloop"                     % "1.5.15")
 addSbtPlugin("ch.epfl.scala"                     % "sbt-scalafix"                  % "0.11.0")
-addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"                 % "0.11.0")
+addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"                 % "0.12.0")
 addSbtPlugin("com.github.sbt"                    % "sbt-unidoc"                    % "0.5.0")
 addSbtPlugin("com.github.sbt"                    % "sbt-ci-release"                % "1.5.12")
 addSbtPlugin("com.github.cb372"                  % "sbt-explicit-dependencies"     % "0.3.1")
@@ -9,7 +9,7 @@ addSbtPlugin("com.typesafe"                      % "sbt-mima-plugin"
 addSbtPlugin("de.heikoseeberger"                 % "sbt-header"                    % "5.10.0")
 addSbtPlugin("org.portable-scala"                % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject"      % "1.3.2")
-addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.15.0")
+addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.16.0")
 addSbtPlugin("org.scala-native"                  % "sbt-scala-native"              % "0.4.15")
 addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                      % "2.3.8")
 addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"                  % "2.5.0")