Merge remote-tracking branch 'origin/master' into docs

# Conflicts: # examples/src/main/scala/sttp/client4/examples/x.scala
softwaremill · Jan 8, 2025 · 7d83b17 · 7d83b17
2 parents 260127d + af5f7ac
commit 7d83b17
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 26 deletions.
diff --git 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"
 
@@ -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"
 
@@ -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
@@ -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

diff --git 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/...ples-ce2/src/main/scala/sttp/client4/examples/PostSerializeJsonMonixHttpClientCirce.scala b/...ples-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
@@ -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/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
@@ -1,9 +1,9 @@
 // {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
+//> using dep ch.qos.logback:logback-classic:1.5.16
 
 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
@@ -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
@@ -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/json/GetAndParseJsonZioCirce.scala b/examples/src/main/scala/sttp/client4/examples/json/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.json

diff --git a/examples/src/main/scala/sttp/client4/examples/json/getAndParseJsonPekkoHttpJson4s.scala b/examples/src/main/scala/sttp/client4/examples/json/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/resilience/RetryZio.scala b/examples/src/main/scala/sttp/client4/examples/resilience/RetryZio.scala
@@ -1,6 +1,6 @@
 // {cat=Resilience; effects=ZIO; backend=HttpClient}: Retry sending a request using ZIO's retries
 
-//> 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.resilience
 

diff --git a/...es/src/main/scala/sttp/client4/examples/testing/TestEndpointMultipleQueryParameters.scala b/...es/src/main/scala/sttp/client4/examples/testing/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.testing
 

diff --git a/examples/src/main/scala/sttp/client4/examples/testing/WebSocketTesting.scala b/examples/src/main/scala/sttp/client4/examples/testing/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.testing
 

diff --git a/examples/src/main/scala/sttp/client4/examples/ws/WebSocketPekko.scala b/examples/src/main/scala/sttp/client4/examples/ws/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.ws

diff --git a/examples/src/main/scala/sttp/client4/examples/ws/WebSocketStreamFs2.scala b/examples/src/main/scala/sttp/client4/examples/ws/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.ws
 

diff --git a/examples/src/main/scala/sttp/client4/examples/ws/WebSocketSynchronous.scala b/examples/src/main/scala/sttp/client4/examples/ws/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.ws
 

diff --git a/examples/src/main/scala/sttp/client4/examples/ws/WebSocketZio.scala b/examples/src/main/scala/sttp/client4/examples/ws/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.ws