From 846ee6f36d152ecc4a10af9b47f26c37a9f0ff65 Mon Sep 17 00:00:00 2001 From: Aaron Williams <44978471+awilliamsOM1@users.noreply.github.com> Date: Tue, 7 Nov 2023 18:41:22 -0500 Subject: [PATCH 1/2] Upgraded circe to 0.14.6 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index eb8aa34f96..546b210ea8 100644 --- a/build.sbt +++ b/build.sbt @@ -120,7 +120,7 @@ val testServerSettings = Seq( ) val circeVersion: Option[(Long, Long)] => String = { _ => - "0.14.5" + "0.14.6" } val jsoniterVersion = "2.22.1" From a9f070bd71a1d552419a301ff959a20ee8b8ec4e Mon Sep 17 00:00:00 2001 From: Aaron Williams <44978471+awilliamsOM1@users.noreply.github.com> Date: Tue, 7 Nov 2023 22:44:42 -0500 Subject: [PATCH 2/2] Minor reformatting by scalfmt --- .../scala/sttp/client3/pekkohttp/PekkoHttpBackend.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pekko-http-backend/src/main/scala/sttp/client3/pekkohttp/PekkoHttpBackend.scala b/pekko-http-backend/src/main/scala/sttp/client3/pekkohttp/PekkoHttpBackend.scala index d0c9ad5c7f..10ee803d3c 100644 --- a/pekko-http-backend/src/main/scala/sttp/client3/pekkohttp/PekkoHttpBackend.scala +++ b/pekko-http-backend/src/main/scala/sttp/client3/pekkohttp/PekkoHttpBackend.scala @@ -46,9 +46,9 @@ class PekkoHttpBackend private ( .withUpdatedConnectionSettings(_.withConnectingTimeout(opts.connectionTimeout)) override def send[T, R >: PE](r: Request[T, R]): Future[Response[T]] = - adjustExceptions(r) { - if (r.isWebSocket) sendWebSocket(r) else sendRegular(r) - } + adjustExceptions(r) { + if (r.isWebSocket) sendWebSocket(r) else sendRegular(r) + } private def sendRegular[T, R >: PE](r: Request[T, R]): Future[Response[T]] = Future