Merge branch 'series/2.x' into update/zio-2.1.11

zio · Oct 17, 2024 · 9d36dfa · 9d36dfa
2 parents 1947bfa + 900b1d5
commit 9d36dfa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -61,7 +61,7 @@ inThisBuild(
     ),
     concurrentRestrictions += Tags.limit(missinglinkConflictsTag, 1),
     // TODO: remove once it is updated in zio-sbt
-    scala213          := "2.13.14"
+    scala213          := "2.13.15"
   )
 )
 

diff --git a/opentelemetry/src/test/scala/zio/telemetry/opentelemetry/tracing/TracingTest.scala b/opentelemetry/src/test/scala/zio/telemetry/opentelemetry/tracing/TracingTest.scala
@@ -360,7 +360,7 @@ object TracingTest extends ZIOSpecDefault {
             ref      <- Ref.make(false)
             scope    <- Scope.make
             resource  = ZIO.addFinalizer(ref.set(true))
-            _        <- scope.extend(tracing.span("Resource")(resource))
+            _        <- scope.extend[Any](tracing.span("Resource")(resource))
             released <- ref.get
           } yield assert(released)(isFalse)
         }

diff --git a/opentracing/src/test/scala/zio/telemetry/opentracing/OpenTracingTest.scala b/opentracing/src/test/scala/zio/telemetry/opentracing/OpenTracingTest.scala
@@ -189,7 +189,7 @@ object OpenTracingTest extends ZIOSpecDefault {
             val zio = for {
               _ <- tracing.log("message")
               _ <- TestClock.adjust(duration)
-              _ <- tracing.log(Map("msg" -> "message", "size" -> 1))
+              _ <- tracing.log(Map("msg" -> "message", "size" -> "1"))
             } yield ()
 
             for {
@@ -209,7 +209,7 @@ object OpenTracingTest extends ZIOSpecDefault {
 
               val expected = List(
                 0L    -> Map("event" -> "message"),
-                1000L -> Map[String, Any]("msg" -> "message", "size" -> 1)
+                1000L -> Map("msg" -> "message", "size" -> "1")
               )
 
               assert(tags)(equalTo(expected))

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,7 +6,7 @@ addSbtPlugin("ch.epfl.scala"                     % "sbt-bloop"                 %
 addSbtPlugin("org.typelevel"                     % "sbt-tpolecat"              % "0.5.2")
 addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"              % "2.5.2")
 addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                  % "2.6.1")
-addSbtPlugin("org.scoverage"                     % "sbt-scoverage"             % "2.2.0")
+addSbtPlugin("org.scoverage"                     % "sbt-scoverage"             % "2.2.1")
 addSbtPlugin("dev.zio"                           % "zio-sbt-ci"                % zioSbtVersion)
 addSbtPlugin("dev.zio"                           % "zio-sbt-ecosystem"         % zioSbtVersion)
 addSbtPlugin("dev.zio"                           % "zio-sbt-website"           % zioSbtVersion)