From 491ce29b34da8b3e8b6ed8803201a4be8b845a4a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 10 Mar 2024 20:47:36 +0000 Subject: [PATCH 1/2] Update scala-compiler, scala-library, ... to 2.13.13 --- project/BuildHelper.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index 3b6070660..86a360d83 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -9,7 +9,7 @@ import scalafix.sbt.ScalafixPlugin.autoImport.* object BuildHelper { val Scala212: String = "2.12.18" - val Scala213: String = "2.13.12" + val Scala213: String = "2.13.13" val Scala3: String = "3.3.3" private val stdOptions = Seq( From 8ee80f250d84a5c21d292c92562c3b2b2f931e35 Mon Sep 17 00:00:00 2001 From: jules Ivanic Date: Sat, 13 Apr 2024 13:44:18 +0800 Subject: [PATCH 2/2] Fix compilation --- macros/shared/src/main/scala-2/zio/prelude/Macros.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/macros/shared/src/main/scala-2/zio/prelude/Macros.scala b/macros/shared/src/main/scala-2/zio/prelude/Macros.scala index a4b5dd8db..b875f23c3 100644 --- a/macros/shared/src/main/scala-2/zio/prelude/Macros.scala +++ b/macros/shared/src/main/scala-2/zio/prelude/Macros.scala @@ -100,17 +100,17 @@ private[prelude] class Macros(val c: whitebox.Context) extends Liftables { quotedAssertion match { case Some(quotedAssertion) => expr.tree match { - case Literal(Constant(value)) => + case Literal(Constant(value0)) => val (assertion, code) = getAssertion[T, A](quotedAssertion) - assertion.apply(value.asInstanceOf[A]) match { + assertion.apply(value0.asInstanceOf[A]) match { case Left(error) => val message = s""" |$assertionErrorHeader |${"\u001b[2m"}assertion = ${Console.RESET + Console.YELLOW}$code${Console.RESET} | - |${error.render(value.toString)} + |${error.render(value0.toString)} |""".stripMargin c.abort(c.enclosingPosition, message)