logging - 2.12 compilation fixes

tofu-tf · Apr 8, 2024 · 170ae10 · 170ae10
1 parent feb9ad0
commit 170ae10
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/modules/kernel/src/main/scala/tofu/common/Display.scala b/modules/kernel/src/main/scala/tofu/common/Display.scala
@@ -1,7 +1,7 @@
 package tofu.common
 import cats.{Eval, Show}
 import java.util.UUID
-import scala.collection.immutable.{BitSet, Queue, SortedMap, SortedSet}
+import scala.collection.immutable.{BitSet, Queue, Seq, SortedMap, SortedSet}
 import scala.concurrent.duration.Duration
 import scala.util.Try
 

diff --git a/modules/logging/structured/src/main/scala/tofu/logging/bi/LoggingBiCompanion.scala b/modules/logging/structured/src/main/scala/tofu/logging/bi/LoggingBiCompanion.scala
@@ -10,7 +10,7 @@ import tofu.syntax.functorbk._
 import tofu.syntax.monadic._
 
 trait LoggingBiCompanion[U[_[_, _]]] {
-  type Log[F[_, _]] = ServiceLogging[F[Nothing, _], U[({ type L[_, _] = Any })#L]]
+  type Log[F[_, _]] = ServiceLogging[F[Nothing, _], U[({ type L[a, b] = Any })#L]]
 
   implicit def toBiLogBiMidOps[F[+_, +_]](uf: U[F]): LogBiMidOps[U, F] = new LogBiMidOps(uf)
 

diff --git a/modules/logging/structured/src/main/scala/tofu/logging/builder/LoggingBiMidBuilder.scala b/modules/logging/structured/src/main/scala/tofu/logging/builder/LoggingBiMidBuilder.scala
@@ -11,7 +11,7 @@ import scala.collection.mutable.Buffer
 import scala.reflect.ClassTag
 
 trait BiBuilder[+T[_, _]] {
-  def prepare[Alg[_[_, _]]](implicit Alg: ClassTag[Alg[({ type L[_, _] = Any })#L]]): BiPrepared[Alg, T]
+  def prepare[Alg[_[_, _]]](implicit Alg: ClassTag[Alg[({ type L[a, b] = Any })#L]]): BiPrepared[Alg, T]
 }
 
 trait BiMethod[U[f[_, _]], Err, Res, +T[_, _]] {
@@ -42,7 +42,7 @@ abstract class LoggingBiMidBuilder extends BiBuilder[LoggingBiMid] {
       ok: Boolean
   ): F[Nothing, Unit]
 
-  def prepare[Alg[_[_, _]]](implicit Alg: ClassTag[Alg[({ type L[_, _] = Any })#L]]) =
+  def prepare[Alg[_[_, _]]](implicit Alg: ClassTag[Alg[({ type L[a, b] = Any })#L]]) =
     new PreparedImpl[Alg](Alg.runtimeClass)
 
   protected class MethodImpl[U[f[_, _]], Err: Loggable, Res: Loggable](

diff --git a/modules/logging/structured/src/main/scala/tofu/logging/builder/LoggingMidBuilder.scala b/modules/logging/structured/src/main/scala/tofu/logging/builder/LoggingMidBuilder.scala
@@ -92,7 +92,7 @@ object LoggingMidBuilder {
 
   class CustomLevelImpl(logLevel: Level) extends CustomLevel {
     override def onLog[F[_]](message: String, values: LoggedValue*)(implicit F: LoggingBase[F]): F[Unit] =
-      F.write(logLevel, message, values)
+      F.write(logLevel, message, values: _*)
   }
 }
 
@@ -162,6 +162,6 @@ object LoggingErrMidBuilder {
   class CustomLevelImpl[E](logLevel: Level, errorLogLevel: Level)(implicit val errLoggable: Loggable[E])
       extends LoggingMidBuilder.CustomLevelImpl(logLevel) with CustomLevel[E] {
     override def onFaultLog[F[_]](message: String, values: LoggedValue*)(implicit F: LoggingBase[F]): F[Unit] =
-      F.write(errorLogLevel, message, values)
+      F.write(errorLogLevel, message, values: _*)
   }
 }