From f3aa00fd600aed4b990f0999c05abec4fe00e203 Mon Sep 17 00:00:00 2001 From: Peter Kotula Date: Thu, 2 Mar 2023 18:38:27 +0100 Subject: [PATCH] fixes --- build.sbt | 4 ++-- project/MimaSettings.scala | 2 +- .../logging/slf4j/bridge/Slf4jBridgeExampleApp.scala | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index cebdf016..c81fb506 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import Versions._ import MimaSettings.mimaSettings import sbtcrossproject.CrossPlugin.autoImport.{ CrossType, crossProject } import zio.sbt.githubactions.Condition -import zio.sbt.githubactions.Step.{ SingleStep, StepSequence } +import zio.sbt.githubactions.Step.SingleStep enablePlugins(ZioSbtEcosystemPlugin, ZioSbtCiPlugin) @@ -90,7 +90,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform) .settings(enableZIO(enableStreaming = true)) .settings( libraryDependencies ++= Seq( - "dev.zio" %%% "zio-parser" % "0.1.8" + "dev.zio" %%% "zio-parser" % "0.1.8" ) ) .jvmSettings( diff --git a/project/MimaSettings.scala b/project/MimaSettings.scala index a71ebc47..efa89eaf 100644 --- a/project/MimaSettings.scala +++ b/project/MimaSettings.scala @@ -5,7 +5,7 @@ import sbt.Keys.{ name, organization } import sbt._ object MimaSettings { - lazy val bincompatVersionToCompare = "2.1.7" + lazy val bincompatVersionToCompare = "2.1.10" def mimaSettings(failOnProblem: Boolean) = Seq( diff --git a/slf4j2-bridge/src/test/scala/zio/logging/slf4j/bridge/Slf4jBridgeExampleApp.scala b/slf4j2-bridge/src/test/scala/zio/logging/slf4j/bridge/Slf4jBridgeExampleApp.scala index 9f930284..4f830538 100644 --- a/slf4j2-bridge/src/test/scala/zio/logging/slf4j/bridge/Slf4jBridgeExampleApp.scala +++ b/slf4j2-bridge/src/test/scala/zio/logging/slf4j/bridge/Slf4jBridgeExampleApp.scala @@ -1,6 +1,6 @@ package zio.logging.slf4j.bridge -import zio.logging.{ LogFilter, LogFormat, LoggerNameExtractor, consoleJson } +import zio.logging.{ ConsoleLoggerConfig, LogFilter, LogFormat, LoggerNameExtractor, consoleJsonLogger } import zio.{ ExitCode, LogLevel, Runtime, Scope, ZIO, ZIOAppArgs, ZIOAppDefault, ZLayer } object Slf4jBridgeExampleApp extends ZIOAppDefault { @@ -14,9 +14,11 @@ object Slf4jBridgeExampleApp extends ZIOAppDefault { ) override val bootstrap: ZLayer[ZIOAppArgs, Any, Any] = - Runtime.removeDefaultLoggers >>> consoleJson( - LogFormat.label("name", LoggerNameExtractor.loggerNameAnnotationOrTrace.toLogFormat()) + LogFormat.default, - logFilter + Runtime.removeDefaultLoggers >>> consoleJsonLogger( + ConsoleLoggerConfig( + LogFormat.label("name", LoggerNameExtractor.loggerNameAnnotationOrTrace.toLogFormat()) + LogFormat.default, + logFilter + ) ) >+> Slf4jBridge.initialize override def run: ZIO[Scope, Any, ExitCode] =