upgrade zio version (#434)

zio · Apr 4, 2022 · 8a9d663 · 8a9d663
1 parent 8f6d45c
commit 8a9d663
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/build.sbt b/build.sbt
@@ -20,7 +20,7 @@ inThisBuild(
   )
 )
 
-val ZioVersion           = "2.0.0-RC3"
+val ZioVersion           = "2.0.0-RC4"
 val scalaJavaTimeVersion = "2.3.0"
 val slf4jVersion         = "1.7.35"
 

diff --git a/core/jvm/src/test/scala/zio/logging/LogFormatSpec.scala b/core/jvm/src/test/scala/zio/logging/LogFormatSpec.scala
@@ -5,7 +5,7 @@ import zio.{ Cause, FiberId, LogLevel, ZTraceElement }
 
 import LogFormat.{ level, line, _ }
 
-object LogFormatSpec extends DefaultRunnableSpec {
+object LogFormatSpec extends ZIOSpecDefault {
   val spec: ZSpec[Environment, Failure] = suite("LogFormatSpec")(
     test("line") {
       val format = line

diff --git a/core/shared/src/main/scala/zio/logging/LogFormat.scala b/core/shared/src/main/scala/zio/logging/LogFormat.scala
@@ -16,7 +16,7 @@
 package zio.logging
 
 import zio.logging.internal._
-import zio.{ Cause, FiberId, LogLevel, LogSpan, ZFiberRef, ZLogger, ZTraceElement }
+import zio.{ Cause, FiberId, FiberRef, LogLevel, LogSpan, ZLogger, ZTraceElement }
 
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
@@ -126,7 +126,7 @@ trait LogFormat { self =>
     logLevel: LogLevel,
     message: () => String,
     cause: Cause[Any],
-    context: Map[ZFiberRef.Runtime[_], AnyRef],
+    context: Map[FiberRef[_], Any],
     spans: List[LogSpan],
     annotations: Map[String, String]
   ) => {
@@ -166,7 +166,7 @@ object LogFormat {
       LogLevel,
       () => String,
       Cause[Any],
-      Map[ZFiberRef.Runtime[_], AnyRef],
+      Map[FiberRef[_], Any],
       List[LogSpan],
       Map[String, String]
     ) => Any
@@ -177,7 +177,7 @@ object LogFormat {
       logLevel: LogLevel,
       message: () => String,
       cause: Cause[Any],
-      context: Map[ZFiberRef.Runtime[_], AnyRef],
+      context: Map[FiberRef[_], Any],
       spans: List[LogSpan],
       annotations: Map[String, String]
     ) => {

diff --git a/core/shared/src/main/scala/zio/logging/package.scala b/core/shared/src/main/scala/zio/logging/package.scala
@@ -37,7 +37,7 @@ package object logging {
    * This code would add the structured log annotation [[LogAnnotation.UserId]]
    * to all log messages emitted by the `myResponseHandler(request)` effect.
    */
-  val logContext: FiberRef.Runtime[LogContext] =
+  val logContext: FiberRef[LogContext] =
     FiberRef.unsafeMake(LogContext.empty, identity, (old, newV) => old ++ newV)
 
   def console(

diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -26,7 +26,7 @@ object BuildHelper {
   val Scala213: String                      = versions("2.13")
   val ScalaDotty: String                    = versions("3.1")
 
-  val SilencerVersion = "1.7.7"
+  val SilencerVersion = "1.7.8"
 
   private val stdOptions = Seq(
     "-deprecation",

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -9,7 +9,7 @@ addSbtPlugin("com.typesafe"                      % "sbt-mima-plugin"
 addSbtPlugin("de.heikoseeberger"                 % "sbt-header"                    % "5.6.0")
 addSbtPlugin("org.portable-scala"                % "sbt-scala-native-crossproject" % "1.1.0")
 addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject"      % "1.1.0")
-addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.9.0")
+addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.8.0")
 addSbtPlugin("org.scala-native"                  % "sbt-scala-native"              % "0.4.1")
 addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                      % "2.2.24")
 addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"                  % "2.4.3")

diff --git a/slf4j/src/main/scala/zio/logging/slf4j/SLF4J.scala b/slf4j/src/main/scala/zio/logging/slf4j/SLF4J.scala
@@ -3,7 +3,7 @@ package zio.logging.backend
 import com.github.ghik.silencer.silent
 import org.slf4j.{ LoggerFactory, MDC }
 import zio.logging.LogFormat
-import zio.{ Cause, FiberId, LogLevel, LogSpan, RuntimeConfigAspect, ZFiberRef, ZLogger, ZTraceElement }
+import zio.{ Cause, FiberId, FiberRef, LogLevel, LogSpan, RuntimeConfigAspect, ZLogger, ZTraceElement }
 
 import scala.collection.JavaConverters._
 
@@ -42,7 +42,7 @@ object SLF4J {
         logLevel: LogLevel,
         message: () => String,
         cause: Cause[Any],
-        context: Map[ZFiberRef.Runtime[_], AnyRef],
+        context: Map[FiberRef[_], Any],
         spans: List[LogSpan],
         annotations: Map[String, String]
       ): Unit =