From adda8af5c64c402af2a1359619365ed7916c2390 Mon Sep 17 00:00:00 2001 From: softwaremill-ci Date: Fri, 3 Jan 2025 01:41:15 +0100 Subject: [PATCH 1/6] Update jsoniter-scala-core, ... to 2.33.0 (#2386) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 20d08fd8c..d4fc0c671 100644 --- a/build.sbt +++ b/build.sbt @@ -129,7 +129,7 @@ val testServerSettings = Seq( val circeVersion: String = "0.14.10" -val jsoniterVersion = "2.32.0" +val jsoniterVersion = "2.33.0" val play29JsonVersion = "2.10.6" From 5ce99076005daed6cb5cda4b3b9e146f5704186b Mon Sep 17 00:00:00 2001 From: softwaremill-ci Date: Fri, 3 Jan 2025 17:24:41 +0100 Subject: [PATCH 2/6] Update client4:circe, client4:core, ... to 4.0.0-M22 (#2384) Co-authored-by: scala-steward --- .../client4/examples/GetAndParseJsonOrFailMonixCirce.scala | 4 ++-- .../examples/PostSerializeJsonMonixHttpClientCirce.scala | 4 ++-- .../main/scala/sttp/client4/examples/WebSocketMonix.scala | 2 +- .../sttp/client4/examples/GetAndParseJsonZioCirce.scala | 4 ++-- .../client4/examples/GetRawResponseBodySynchronous.scala | 2 +- .../main/scala/sttp/client4/examples/LogRequestsSlf4j.scala | 4 ++-- .../scala/sttp/client4/examples/PostFormSynchronous.scala | 2 +- .../src/main/scala/sttp/client4/examples/RetryZio.scala | 2 +- .../src/main/scala/sttp/client4/examples/StreamFs2.scala | 2 +- .../src/main/scala/sttp/client4/examples/StreamZio.scala | 2 +- .../examples/TestEndpointMultipleQueryParameters.scala | 2 +- .../main/scala/sttp/client4/examples/WebSocketPekko.scala | 2 +- .../scala/sttp/client4/examples/WebSocketStreamFs2.scala | 2 +- .../scala/sttp/client4/examples/WebSocketSynchronous.scala | 2 +- .../main/scala/sttp/client4/examples/WebSocketTesting.scala | 2 +- .../src/main/scala/sttp/client4/examples/WebSocketZio.scala | 2 +- .../client4/examples/getAndParseJsonPekkoHttpJson4s.scala | 4 ++-- .../src/main/scala/sttp/client4/examples/wsOxExample.scala | 2 +- examples/src/main/scala/sttp/client4/examples/x.scala | 6 +++--- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/examples-ce2/src/main/scala/sttp/client4/examples/GetAndParseJsonOrFailMonixCirce.scala b/examples-ce2/src/main/scala/sttp/client4/examples/GetAndParseJsonOrFailMonixCirce.scala index 675d84b58..13840f194 100644 --- a/examples-ce2/src/main/scala/sttp/client4/examples/GetAndParseJsonOrFailMonixCirce.scala +++ b/examples-ce2/src/main/scala/sttp/client4/examples/GetAndParseJsonOrFailMonixCirce.scala @@ -1,8 +1,8 @@ // {cat=JSON; effects=Monix; backend=HttpClient}: Receive & parse JSON using circe //> using scala 2.13 -//> using dep com.softwaremill.sttp.client4::monix:4.0.0-M20 -//> using dep com.softwaremill.sttp.client4::circe:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::monix:4.0.0-M22 +//> using dep com.softwaremill.sttp.client4::circe:4.0.0-M22 //> using dep io.circe::circe-generic:0.14.10 package sttp.client4.examples diff --git a/examples-ce2/src/main/scala/sttp/client4/examples/PostSerializeJsonMonixHttpClientCirce.scala b/examples-ce2/src/main/scala/sttp/client4/examples/PostSerializeJsonMonixHttpClientCirce.scala index 59a72eceb..6282b9921 100644 --- a/examples-ce2/src/main/scala/sttp/client4/examples/PostSerializeJsonMonixHttpClientCirce.scala +++ b/examples-ce2/src/main/scala/sttp/client4/examples/PostSerializeJsonMonixHttpClientCirce.scala @@ -1,8 +1,8 @@ // {cat=Hello, World!; effects=Monix; backend=HttpClient}: Post JSON data //> using scala 2.13 -//> using dep com.softwaremill.sttp.client4::monix:4.0.0-M20 -//> using dep com.softwaremill.sttp.client4::circe:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::monix:4.0.0-M22 +//> using dep com.softwaremill.sttp.client4::circe:4.0.0-M22 //> using dep io.circe::circe-generic:0.14.10 package sttp.client4.examples diff --git a/examples-ce2/src/main/scala/sttp/client4/examples/WebSocketMonix.scala b/examples-ce2/src/main/scala/sttp/client4/examples/WebSocketMonix.scala index 7ecd3a585..67445c0d7 100644 --- a/examples-ce2/src/main/scala/sttp/client4/examples/WebSocketMonix.scala +++ b/examples-ce2/src/main/scala/sttp/client4/examples/WebSocketMonix.scala @@ -1,7 +1,7 @@ // {cat=WebSocket; effects=Monix; backend=HttpClient}: Connect to & interact with a WebSocket //> using scala 2.13 -//> using dep com.softwaremill.sttp.client4::monix:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::monix:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/GetAndParseJsonZioCirce.scala b/examples/src/main/scala/sttp/client4/examples/GetAndParseJsonZioCirce.scala index 432fccab6..aa387042e 100644 --- a/examples/src/main/scala/sttp/client4/examples/GetAndParseJsonZioCirce.scala +++ b/examples/src/main/scala/sttp/client4/examples/GetAndParseJsonZioCirce.scala @@ -1,7 +1,7 @@ // {cat=JSON; effects=ZIO; backend=HttpClient}: Receive & parse JSON using circe -//> using dep com.softwaremill.sttp.client4::circe:4.0.0-M20 -//> using dep com.softwaremill.sttp.client4::zio:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::circe:4.0.0-M22 +//> using dep com.softwaremill.sttp.client4::zio:4.0.0-M22 //> using dep io.circe::circe-generic:0.14.10 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/GetRawResponseBodySynchronous.scala b/examples/src/main/scala/sttp/client4/examples/GetRawResponseBodySynchronous.scala index ad7df403b..1e885b9b1 100644 --- a/examples/src/main/scala/sttp/client4/examples/GetRawResponseBodySynchronous.scala +++ b/examples/src/main/scala/sttp/client4/examples/GetRawResponseBodySynchronous.scala @@ -1,6 +1,6 @@ // {cat=Other; effects=Direct; backend=HttpClient}: Handle the body by both parsing it to JSON and returning the raw string -//> using dep com.softwaremill.sttp.client4::circe:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::circe:4.0.0-M22 //> using dep io.circe::circe-generic:0.14.10 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/LogRequestsSlf4j.scala b/examples/src/main/scala/sttp/client4/examples/LogRequestsSlf4j.scala index 155ea04d8..e0b80b636 100644 --- a/examples/src/main/scala/sttp/client4/examples/LogRequestsSlf4j.scala +++ b/examples/src/main/scala/sttp/client4/examples/LogRequestsSlf4j.scala @@ -1,7 +1,7 @@ // {cat=Logging; effects=Direct; backend=HttpClient}: Add a logging backend wrapper, which uses slf4j -//> using dep com.softwaremill.sttp.client4::circe:4.0.0-M20 -//> using dep com.softwaremill.sttp.client4::slf4j-backend:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::circe:4.0.0-M22 +//> using dep com.softwaremill.sttp.client4::slf4j-backend:4.0.0-M22 //> using dep io.circe::circe-generic:0.14.10 //> using dep ch.qos.logback:logback-classic:1.5.15 diff --git a/examples/src/main/scala/sttp/client4/examples/PostFormSynchronous.scala b/examples/src/main/scala/sttp/client4/examples/PostFormSynchronous.scala index d8eee71d5..7b34eb78b 100644 --- a/examples/src/main/scala/sttp/client4/examples/PostFormSynchronous.scala +++ b/examples/src/main/scala/sttp/client4/examples/PostFormSynchronous.scala @@ -1,6 +1,6 @@ // {cat=Hello, World!; effects=Direct; backend=HttpClient}: Post form data -//> using dep com.softwaremill.sttp.client4::core:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::core:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/RetryZio.scala b/examples/src/main/scala/sttp/client4/examples/RetryZio.scala index 3457f49c9..a24ec2a9f 100644 --- a/examples/src/main/scala/sttp/client4/examples/RetryZio.scala +++ b/examples/src/main/scala/sttp/client4/examples/RetryZio.scala @@ -1,6 +1,6 @@ // {cat=Resilience; effects=ZIO; backend=HttpClient}: Retry sending a request -//> using dep com.softwaremill.sttp.client4::zio:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::zio:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/StreamFs2.scala b/examples/src/main/scala/sttp/client4/examples/StreamFs2.scala index 0af4bb4ea..7042f8e9b 100644 --- a/examples/src/main/scala/sttp/client4/examples/StreamFs2.scala +++ b/examples/src/main/scala/sttp/client4/examples/StreamFs2.scala @@ -1,6 +1,6 @@ // {cat=Streaming; effects=cats-effect; backend=HttpClient}: Stream request & response bodies using fs2 -//> using dep com.softwaremill.sttp.client4::fs2:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::fs2:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/StreamZio.scala b/examples/src/main/scala/sttp/client4/examples/StreamZio.scala index 684a72b46..b8a26c9b4 100644 --- a/examples/src/main/scala/sttp/client4/examples/StreamZio.scala +++ b/examples/src/main/scala/sttp/client4/examples/StreamZio.scala @@ -1,6 +1,6 @@ // {cat=Streaming; effects=ZIO; backend=HttpClient}: Stream request & response bodies using ZIO-Streams -//> using dep com.softwaremill.sttp.client4::zio:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::zio:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/TestEndpointMultipleQueryParameters.scala b/examples/src/main/scala/sttp/client4/examples/TestEndpointMultipleQueryParameters.scala index ff83bb172..c8fdfaff0 100644 --- a/examples/src/main/scala/sttp/client4/examples/TestEndpointMultipleQueryParameters.scala +++ b/examples/src/main/scala/sttp/client4/examples/TestEndpointMultipleQueryParameters.scala @@ -1,6 +1,6 @@ // {cat=Testing}: Create a backend stub which simulates interactions using multiple query parameters -//> using dep com.softwaremill.sttp.client4::core:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::core:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/WebSocketPekko.scala b/examples/src/main/scala/sttp/client4/examples/WebSocketPekko.scala index cf43ef811..d63b210c6 100644 --- a/examples/src/main/scala/sttp/client4/examples/WebSocketPekko.scala +++ b/examples/src/main/scala/sttp/client4/examples/WebSocketPekko.scala @@ -1,6 +1,6 @@ // {cat=WebSocket; effects=Future; backend=Pekko}: Connect to & interact with a WebSocket -//> using dep com.softwaremill.sttp.client4::pekko-http-backend:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::pekko-http-backend:4.0.0-M22 //> using dep org.apache.pekko::pekko-stream:1.1.2 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/WebSocketStreamFs2.scala b/examples/src/main/scala/sttp/client4/examples/WebSocketStreamFs2.scala index f4e41a66f..6dc4039bd 100644 --- a/examples/src/main/scala/sttp/client4/examples/WebSocketStreamFs2.scala +++ b/examples/src/main/scala/sttp/client4/examples/WebSocketStreamFs2.scala @@ -1,6 +1,6 @@ // {cat=WebSocket; effects=cats-effect; backend=HttpClient}: Connect to & interact with a WebSocket, using fs2 streaming -//> using dep com.softwaremill.sttp.client4::fs2:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::fs2:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/WebSocketSynchronous.scala b/examples/src/main/scala/sttp/client4/examples/WebSocketSynchronous.scala index af68070d4..b158d6b7f 100644 --- a/examples/src/main/scala/sttp/client4/examples/WebSocketSynchronous.scala +++ b/examples/src/main/scala/sttp/client4/examples/WebSocketSynchronous.scala @@ -1,6 +1,6 @@ // {cat=WebSocket; effects=Direct; backend=HttpClient}: Connect to & interact with a WebSocket -//> using dep com.softwaremill.sttp.client4::core:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::core:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/WebSocketTesting.scala b/examples/src/main/scala/sttp/client4/examples/WebSocketTesting.scala index 87b19f82d..c9ddeb5a4 100644 --- a/examples/src/main/scala/sttp/client4/examples/WebSocketTesting.scala +++ b/examples/src/main/scala/sttp/client4/examples/WebSocketTesting.scala @@ -1,6 +1,6 @@ // {cat=Testing; effects=cats-effect; backend=HttpClient}: Create a backend stub which simulates interactions with a WebSocket -//> using dep com.softwaremill.sttp.client4::fs2:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::fs2:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/WebSocketZio.scala b/examples/src/main/scala/sttp/client4/examples/WebSocketZio.scala index d21ddf6ec..88c97af6b 100644 --- a/examples/src/main/scala/sttp/client4/examples/WebSocketZio.scala +++ b/examples/src/main/scala/sttp/client4/examples/WebSocketZio.scala @@ -1,6 +1,6 @@ // {cat=WebSocket; effects=ZIO; backend=HttpClient}: Connect to & interact with a WebSocket -//> using dep com.softwaremill.sttp.client4::zio:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::zio:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/getAndParseJsonPekkoHttpJson4s.scala b/examples/src/main/scala/sttp/client4/examples/getAndParseJsonPekkoHttpJson4s.scala index 7633c43a6..525dc3bd2 100644 --- a/examples/src/main/scala/sttp/client4/examples/getAndParseJsonPekkoHttpJson4s.scala +++ b/examples/src/main/scala/sttp/client4/examples/getAndParseJsonPekkoHttpJson4s.scala @@ -1,7 +1,7 @@ // {cat=JSON; effects=Future; backend=Pekko}: Receive & parse JSON using json4s -//> using dep com.softwaremill.sttp.client4::json4s:4.0.0-M20 -//> using dep com.softwaremill.sttp.client4::pekko-http-backend:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::json4s:4.0.0-M22 +//> using dep com.softwaremill.sttp.client4::pekko-http-backend:4.0.0-M22 //> using dep org.json4s::json4s-native:4.0.7 //> using dep org.apache.pekko::pekko-stream:1.1.2 diff --git a/examples/src/main/scala/sttp/client4/examples/wsOxExample.scala b/examples/src/main/scala/sttp/client4/examples/wsOxExample.scala index f89563555..d4e7bfa42 100644 --- a/examples/src/main/scala/sttp/client4/examples/wsOxExample.scala +++ b/examples/src/main/scala/sttp/client4/examples/wsOxExample.scala @@ -1,6 +1,6 @@ // {cat=WebSocket; effects=Direct; backend=HttpClient}: Connect to & interact with a WebSocket, using Ox channels for streaming -//> using dep com.softwaremill.sttp.client4::ox:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::ox:4.0.0-M22 package sttp.client4.examples diff --git a/examples/src/main/scala/sttp/client4/examples/x.scala b/examples/src/main/scala/sttp/client4/examples/x.scala index 42d8bc22d..89c7f552f 100644 --- a/examples/src/main/scala/sttp/client4/examples/x.scala +++ b/examples/src/main/scala/sttp/client4/examples/x.scala @@ -1,4 +1,4 @@ -//> using dep com.softwaremill.sttp.client4::core:4.0.0-M20 +//> using dep com.softwaremill.sttp.client4::core:4.0.0-M22 import sttp.client4.* @@ -14,7 +14,7 @@ import sttp.client4.* val response = request.send(backend) // response.header(...): Option[String] - println(response.header("Content-Length")) + println(response.header("Content-Length")) - // response.body: by default read into an Either[String, String] to indicate failure or success + // response.body: by default read into an Either[String, String] to indicate failure or success println(response.body) From 26ec8ec284d4312e8ffa50c0bb8f5f72782f5697 Mon Sep 17 00:00:00 2001 From: softwaremill-ci Date: Sat, 4 Jan 2025 01:41:46 +0100 Subject: [PATCH 3/6] Update resilience4j-circuitbreaker, ... to 2.3.0 (#2387) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d4fc0c671..7be7d00a0 100644 --- a/build.sbt +++ b/build.sbt @@ -169,7 +169,7 @@ val logback = "ch.qos.logback" % "logback-classic" % "1.5.14" val jaegerClientVersion = "1.8.1" val braveOpentracingVersion = "1.0.1" val zipkinSenderOkHttpVersion = "3.4.3" -val resilience4jVersion = "2.2.0" +val resilience4jVersion = "2.3.0" val http4s_ce2_version = "0.22.15" val http4s_ce3_version = "0.23.30" From f8c4664244cb2a4e4a494959252e43ff7b4369c4 Mon Sep 17 00:00:00 2001 From: softwaremill-ci Date: Wed, 8 Jan 2025 01:40:53 +0100 Subject: [PATCH 4/6] Update zio-json to 0.7.4 (#2391) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 7be7d00a0..b154a466d 100644 --- a/build.sbt +++ b/build.sbt @@ -764,7 +764,7 @@ lazy val zioJson = (projectMatrix in file("json/zio-json")) .settings( name := "zio-json", libraryDependencies ++= Seq( - "dev.zio" %%% "zio-json" % "0.7.3", + "dev.zio" %%% "zio-json" % "0.7.4", "com.softwaremill.sttp.shared" %%% "zio" % sttpSharedVersion ), scalaTest From 4f84905dd752b080b2912a4cc7037ca8a50b733c Mon Sep 17 00:00:00 2001 From: softwaremill-ci Date: Wed, 8 Jan 2025 12:50:32 +0100 Subject: [PATCH 5/6] Update logback-classic to 1.5.16 (#2388) Co-authored-by: scala-steward --- .../src/main/scala/sttp/client4/examples/LogRequestsSlf4j.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/src/main/scala/sttp/client4/examples/LogRequestsSlf4j.scala b/examples/src/main/scala/sttp/client4/examples/LogRequestsSlf4j.scala index e0b80b636..4363a9584 100644 --- a/examples/src/main/scala/sttp/client4/examples/LogRequestsSlf4j.scala +++ b/examples/src/main/scala/sttp/client4/examples/LogRequestsSlf4j.scala @@ -3,7 +3,7 @@ //> using dep com.softwaremill.sttp.client4::circe:4.0.0-M22 //> using dep com.softwaremill.sttp.client4::slf4j-backend:4.0.0-M22 //> using dep io.circe::circe-generic:0.14.10 -//> using dep ch.qos.logback:logback-classic:1.5.15 +//> using dep ch.qos.logback:logback-classic:1.5.16 package sttp.client4.examples From af5f7ace12865541ddd5b55ebc8161228fbb8093 Mon Sep 17 00:00:00 2001 From: softwaremill-ci Date: Wed, 8 Jan 2025 13:01:04 +0100 Subject: [PATCH 6/6] Update zio-opentelemetry to 3.1.1 (#2389) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b154a466d..acb055793 100644 --- a/build.sbt +++ b/build.sbt @@ -915,7 +915,7 @@ lazy val openTelemetryTracingZioBackend = (projectMatrix in file("observability/ .settings( name := "opentelemetry-tracing-zio-backend", libraryDependencies ++= Seq( - "dev.zio" %% "zio-opentelemetry" % "3.1.0", + "dev.zio" %% "zio-opentelemetry" % "3.1.1", "io.opentelemetry.semconv" % "opentelemetry-semconv" % "1.26.0-alpha", "io.opentelemetry" % "opentelemetry-api" % openTelemetryVersion, "io.opentelemetry" % "opentelemetry-sdk-testing" % openTelemetryVersion % Test