diff options
-rw-r--r-- | build.sbt | 8 | ||||
-rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/UriInterpolator.scala | 15 | ||||
-rw-r--r-- | okhttp-backend/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala | 7 | ||||
-rw-r--r-- | project/plugins.sbt | 2 |
4 files changed, 20 insertions, 12 deletions
@@ -4,7 +4,7 @@ val commonSettings = Seq( crossScalaVersions := Seq(scalaVersion.value, "2.11.11"), scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-Xlint"), scalafmtOnCompile := true, - scalafmtVersion := "1.1.0", + scalafmtVersion := "1.2.0", // publishing publishTo := Some( if (isSnapshot.value) @@ -86,7 +86,7 @@ lazy val asyncHttpClientBackend: Project = (project in file( .settings( name := "async-http-client-backend", libraryDependencies ++= Seq( - "org.asynchttpclient" % "async-http-client" % "2.0.35" + "org.asynchttpclient" % "async-http-client" % "2.0.37" ) ) dependsOn core @@ -103,7 +103,7 @@ lazy val asyncHttpClientScalazBackend: Project = (project in file( .settings( name := "async-http-client-backend-scalaz", libraryDependencies ++= Seq( - "org.scalaz" %% "scalaz-concurrent" % "7.2.14" + "org.scalaz" %% "scalaz-concurrent" % "7.2.15" ) ) dependsOn asyncHttpClientBackend @@ -170,7 +170,7 @@ lazy val tests: Project = (project in file("tests")) libraryDependencies ++= Seq( akkaHttp, scalaTest, - "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0", + "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2", "com.github.pathikrit" %% "better-files" % "2.17.1", "ch.qos.logback" % "logback-classic" % "1.2.3" ).map(_ % "test"), diff --git a/core/src/main/scala/com/softwaremill/sttp/UriInterpolator.scala b/core/src/main/scala/com/softwaremill/sttp/UriInterpolator.scala index a99bab8..f1e6beb 100644 --- a/core/src/main/scala/com/softwaremill/sttp/UriInterpolator.scala +++ b/core/src/main/scala/com/softwaremill/sttp/UriInterpolator.scala @@ -248,7 +248,8 @@ object UriInterpolator { object UriBuilder { case object Scheme extends UriBuilder { - override def fromTokens(u: Uri, t: Vector[Token]): (Uri, Vector[Token]) = { + override def fromTokens(u: Uri, + t: Vector[Token]): (Uri, Vector[Token]) = { split(t, Set[Token](SchemeEnd)) match { case Left(tt) => (u.scheme("http"), tt) case Right((schemeTokens, _, otherTokens)) => @@ -259,7 +260,8 @@ object UriInterpolator { } case object UserInfo extends UriBuilder { - override def fromTokens(u: Uri, t: Vector[Token]): (Uri, Vector[Token]) = { + override def fromTokens(u: Uri, + t: Vector[Token]): (Uri, Vector[Token]) = { split(t, Set[Token](AtInAuthority)) match { case Left(tt) => (u, tt) case Right((uiTokens, _, otherTokens)) => @@ -293,7 +295,8 @@ object UriInterpolator { } case object HostPort extends UriBuilder { - override def fromTokens(u: Uri, t: Vector[Token]): (Uri, Vector[Token]) = { + override def fromTokens(u: Uri, + t: Vector[Token]): (Uri, Vector[Token]) = { split(t, Set[Token](PathStart, QueryStart, FragmentStart)) match { case Left(tt) => (hostPortFromTokens(u, tt), Vector.empty) @@ -386,7 +389,8 @@ object UriInterpolator { } case object Fragment extends UriBuilder { - override def fromTokens(u: Uri, t: Vector[Token]): (Uri, Vector[Token]) = { + override def fromTokens(u: Uri, + t: Vector[Token]): (Uri, Vector[Token]) = { t match { case FragmentStart +: tt => (u.fragment(tokensToStringOpt(tt)), Vector.empty) @@ -484,7 +488,8 @@ object UriInterpolator { * These empty string tokens need to be removed so that e.g. extra key-value * mappings are not generated. */ - private def removeEmptyTokensAroundExp(tokens: Vector[Token]): Vector[Token] = { + private def removeEmptyTokensAroundExp( + tokens: Vector[Token]): Vector[Token] = { def doRemove(t: Vector[Token], acc: Vector[Token]): Vector[Token] = t match { case StringToken("") +: (e: ExpressionToken) +: tail => diff --git a/okhttp-backend/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala b/okhttp-backend/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala index ead1bde..116878f 100644 --- a/okhttp-backend/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala +++ b/okhttp-backend/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala @@ -29,7 +29,9 @@ import scala.util.{Failure, Try} abstract class OkHttpBackend[R[_], S](client: OkHttpClient, closeClient: Boolean) extends SttpBackend[R, S] { - private[okhttp] def convertRequest[T](request: Request[T, S]): OkHttpRequest = { + + private[okhttp] def convertRequest[T]( + request: Request[T, S]): OkHttpRequest = { val builder = new OkHttpRequest.Builder() .url(request.uri.toString) @@ -50,7 +52,8 @@ abstract class OkHttpBackend[R[_], S](client: OkHttpClient, builder.build() } - private def bodyToOkHttp[T](body: RequestBody[S]): Option[OkHttpRequestBody] = { + private def bodyToOkHttp[T]( + body: RequestBody[S]): Option[OkHttpRequestBody] = { body match { case NoBody => None case StringBody(b, _, _) => diff --git a/project/plugins.sbt b/project/plugins.sbt index 1e7fee6..e842d0f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.12") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0") |