Revert cast logger fix error attempt.

tofu-tf · Nov 22, 2023 · 49b3eb4 · 49b3eb4
1 parent e88a1c9
commit 49b3eb4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -3,10 +3,8 @@ import sbt.ModuleID
 import org.typelevel.scalacoptions.{ScalacOption, ScalaVersion, ScalacOptions}
 import scala.Ordering.Implicits._
 
-ThisBuild / useLog4J := false
-
 lazy val defaultSettings = Seq(
-  scalaVersion       := Version.scala3,
+  scalaVersion       := Version.scala213,
   scalacWarningConfig,
   Test / tpolecatExcludeOptions += ScalacOptions.warnNonUnitStatement,
   Compile / doc / tpolecatExcludeOptions ++= Set(ScalacOptions.fatalWarnings, ScalacOptions.warnError),

diff --git a/modules/interop/zio2/logging/src/test/scala-2/tofu/logging/zlogs/ZLogsSpec.scala b/modules/interop/zio2/logging/src/test/scala-2/tofu/logging/zlogs/ZLogsSpec.scala
@@ -50,7 +50,8 @@ case object ZLogsSpec extends ZIOSpecDefault {
           testCount
         )
       }.provide(
-        Runtime.removeDefaultLoggers >>> TofuZLogger.addToRuntime,
+        Runtime.removeDefaultLoggers,
+        TofuZLogger.addToRuntime,
         LogAppender.layer(loggerName)
       ),
       test("TofuZLogger uses user-defined logger name") {
@@ -69,7 +70,8 @@ case object ZLogsSpec extends ZIOSpecDefault {
           }
         ) @@ ZLogAnnotation.loggerName(myLoggerName)
       }.provide(
-        Runtime.removeDefaultLoggers >>> TofuZLogger.addToRuntime,
+        Runtime.removeDefaultLoggers,
+        TofuZLogger.addToRuntime,
         LogAppender.layer(myLoggerName)
       ),
       test("ZLogs") {

diff --git a/modules/kernel/src/main/scala-2/tofu/internal/Interop.scala b/modules/kernel/src/main/scala-2/tofu/internal/Interop.scala
@@ -10,7 +10,9 @@ class Interop(val c: blackbox.Context) {
   protected def tc[F[_]](implicit wttu: WTTU[F]) = wttu.tpe.typeConstructor
   protected def t[A](implicit wttu: WTT[A])      = wttu.tpe
 
-  protected def delegateParamTree[N](ps: collection.Seq[collection.Seq[Tree]])(ts: collection.Seq[Type])(implicit N: WTT[N]): Tree = {
+  protected def delegateParamTree[N](
+      ps: collection.Seq[collection.Seq[Tree]]
+  )(ts: collection.Seq[Type])(implicit N: WTT[N]): Tree = {
     val s   = N.tpe.decls.head.asTerm.name.decodedName.toString
     val exp = c.parse(s)