From a66fc1b038c6bfde4e1133a2e8ab33c7a1c40303 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 17 Oct 2024 11:52:13 +0200 Subject: [PATCH 1/2] Update sbt-scoverage to 2.2.1 (#894) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 859ab410..fc471523 100644 --- 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) From 900b1d5e70f6c4b884de6aae22848bb5a50742ec Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 17 Oct 2024 12:10:35 +0200 Subject: [PATCH 2/2] Update scala-library to 2.13.15 (#893) * Update scala-library to 2.13.15 * Fix compilation errors in tests --------- Co-authored-by: Michael Nedokushev --- build.sbt | 2 +- .../zio/telemetry/opentelemetry/tracing/TracingTest.scala | 2 +- .../scala/zio/telemetry/opentracing/OpenTracingTest.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 2fb9aa20..19488647 100644 --- 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 index 55f107f6..027ef7cb 100644 --- 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 index 92f7ee71..85b43b05 100644 --- 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))