Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scalafmt-core to 3.0.5 #1118

Merged
merged 2 commits into from Oct 1, 2021
Merged

Update scalafmt-core to 3.0.5 #1118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc3ba92
Update scalafmt-core to 3.0.5
scala-steward Sep 25, 2021
4c6daaa
Reformat with scalafmt 3.0.5
scala-steward Sep 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
@@ -1,3 +1,3 @@
runner.dialect = scala3
version = 3.0.1
version = 3.0.5
maxColumn = 120
5 changes: 3 additions & 2 deletions core/src/test/scala/sttp/client3/testing/HttpTest.scala
View file
Open in desktop
Expand Up @@ -343,12 +343,13 @@ trait HttpTest[F[_]]
}

"decompress empty body using gzip" in {
val req = basicRequest.get(uri"$endpoint/compress-empty-gzip").response(asStringAlways).acceptEncoding("gzip")
val req = basicRequest.get(uri"$endpoint/compress-empty-gzip").response(asStringAlways).acceptEncoding("gzip")
req.send(backend).toFuture().map { resp => resp.body should be("") }
}

"decompress empty body using deflate" in {
val req = basicRequest.get(uri"$endpoint/compress-empty-deflate").response(asStringAlways).acceptEncoding("deflate")
val req =
basicRequest.get(uri"$endpoint/compress-empty-deflate").response(asStringAlways).acceptEncoding("deflate")
req.send(backend).toFuture().map { resp => resp.body should be("") }
}

Expand Down
10 changes: 9 additions & 1 deletion okhttp-backend/src/main/scala/sttp/client3/okhttp/OkHttpBackend.scala
View file
Open in desktop
Expand Up @@ -4,7 +4,15 @@ import java.io.{InputStream, UnsupportedEncodingException}
import java.util.concurrent.TimeUnit
import java.util.zip.{GZIPInputStream, InflaterInputStream}
import okhttp3.internal.http.HttpMethod
import okhttp3.{Authenticator, Credentials, OkHttpClient, Route, Request => OkHttpRequest, RequestBody => OkHttpRequestBody, Response => OkHttpResponse}
import okhttp3.{
Authenticator,
Credentials,
OkHttpClient,
Route,
Request => OkHttpRequest,
RequestBody => OkHttpRequestBody,
Response => OkHttpResponse
}
import sttp.capabilities.{Effect, Streams}
import sttp.client3.SttpBackendOptions.Proxy
import sttp.client3.SttpClientException.ReadException
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Expand Up @@ -12,4 +12,4 @@ addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-browser-tes
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.23")

addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.0")