diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index b97ffc1b32..2b15af1b85 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -11,3 +11,6 @@ aa1d709eba0652b405782a226fe4a73406dc192f e7ed7720a3ae4389c4b755b476e94bafb26ba694 # Scala Steward: Reformat with scalafmt 3.7.3 b364558c7d44d6c21f1532d618707cc7ca1e4148 + +# Scala Steward: Reformat with scalafmt 3.7.5 +5c45ddcfbb2db36c3f9ad3dd9468d4089bca7d3b diff --git a/.scalafmt.conf b/.scalafmt.conf index b71967b994..7f287242b2 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.4 +version = 3.7.5 maxColumn = 120 rewrite.rules = [RedundantBraces, RedundantParens, SortImports] runner.dialect = scala3 diff --git a/core/src/test/scala/sttp/client4/ToCurlConverterTest.scala b/core/src/test/scala/sttp/client4/ToCurlConverterTest.scala index 53c527e094..8098f61f8a 100644 --- a/core/src/test/scala/sttp/client4/ToCurlConverterTest.scala +++ b/core/src/test/scala/sttp/client4/ToCurlConverterTest.scala @@ -57,7 +57,10 @@ class ToCurlConverterTest extends AnyFlatSpec with Matchers with ToCurlConverter ) } it should "hide Accept-Encoding header when asked when converting request with custom sensitive header" in { - basicRequest.header("X-Auth", "xyzabc").get(localhost).toCurl(Set("X-Auth"), omitAcceptEncoding = true) shouldNot include( + basicRequest + .header("X-Auth", "xyzabc") + .get(localhost) + .toCurl(Set("X-Auth"), omitAcceptEncoding = true) shouldNot include( """--header 'Accept-Encoding: """ ) } diff --git a/effects/zio/src/main/scalajvm/sttp/client4/httpclient/zio/HttpClientZioBackend.scala b/effects/zio/src/main/scalajvm/sttp/client4/httpclient/zio/HttpClientZioBackend.scala index 2d9bb93efe..2bcc37f856 100644 --- a/effects/zio/src/main/scalajvm/sttp/client4/httpclient/zio/HttpClientZioBackend.scala +++ b/effects/zio/src/main/scalajvm/sttp/client4/httpclient/zio/HttpClientZioBackend.scala @@ -11,7 +11,7 @@ import sttp.client4.internal.httpclient.{BodyFromHttpClient, BodyToHttpClient, S import sttp.client4.internal.ws.SimpleQueue import sttp.client4.testing.WebSocketStreamBackendStub import sttp.client4.wrappers.FollowRedirectsBackend -import sttp.client4.{BackendOptions, GenericRequest, Response, WebSocketStreamBackend, wrappers} +import sttp.client4.{wrappers, BackendOptions, GenericRequest, Response, WebSocketStreamBackend} import sttp.monad.MonadError import zio.Chunk.ByteArray import zio._