Sitelet https://github.com/Free2MoveApp/sttp/commit/4ff8b26988563706639fa30954811077940a3369
Skip to content

Commit 4ff8b26

Browse files
author
Adam Warski
committed
Updating dependencies
1 parent 539d4d3 commit 4ff8b26

6 files changed

Lines changed: 20 additions & 28 deletions

File tree

‎async-http-client-backend/fs2/src/test/scala/com/softwaremill/sttp/asynchttpclient/fs2/AsyncHttpClientFs2HttpStreamingTest.scala‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@ package com.softwaremill.sttp.asynchttpclient.fs2
22

33
import java.nio.ByteBuffer
44

5-
import cats.effect.IO
5+
import cats.effect.{ContextShift, IO, Timer}
66
import cats.instances.string._
77
import com.softwaremill.sttp.SttpBackend
88
import com.softwaremill.sttp.testing.streaming.StreamingTest
99
import com.softwaremill.sttp.testing.ConvertToFuture
1010
import fs2.{Chunk, Stream, text}
11-
import scala.concurrent.Future
11+
12+
import scala.concurrent.{Future, ExecutionContext}
1213

1314
class AsyncHttpClientFs2HttpStreamingTest extends StreamingTest[IO, Stream[IO, ByteBuffer]] {
1415

16+
private implicit val cs: ContextShift[IO] = IO.contextShift(ExecutionContext.Implicits.global)
17+
private implicit val t: Timer[IO] = IO.timer(ExecutionContext.Implicits.global)
18+
1519
override implicit val backend: SttpBackend[IO, Stream[IO, ByteBuffer]] = AsyncHttpClientFs2Backend[IO]()
1620

1721
override implicit val convertToFuture: ConvertToFuture[IO] =

‎async-http-client-backend/fs2/src/test/scala/com/softwaremill/sttp/asynchttpclient/fs2/AsyncHttpClientFs2HttpTest.scala‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package com.softwaremill.sttp.asynchttpclient.fs2
22

3-
import cats.effect.IO
3+
import cats.effect.{ContextShift, IO, Timer}
44
import com.softwaremill.sttp.SttpBackend
55
import com.softwaremill.sttp.testing.{ConvertToFuture, HttpTest}
66

7-
import scala.concurrent.Future
7+
import scala.concurrent.{ExecutionContext, Future}
88

99
class AsyncHttpClientFs2HttpTest extends HttpTest[IO] {
1010

11+
private implicit val cs: ContextShift[IO] = IO.contextShift(ExecutionContext.Implicits.global)
12+
private implicit val t: Timer[IO] = IO.timer(ExecutionContext.Implicits.global)
13+
1114
override implicit val backend: SttpBackend[IO, Nothing] = AsyncHttpClientFs2Backend()
1215
override implicit val convertToFuture: ConvertToFuture[IO] = new ConvertToFuture[IO] {
1316
override def toFuture[T](value: IO[T]): Future[T] = value.unsafeToFuture()

‎build.sbt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ def testServerSettings(config: Configuration) = Seq(
104104
})
105105
)
106106

107-
val akkaHttp = "com.typesafe.akka" %% "akka-http" % "10.1.3"
108-
val akkaStreams = "com.typesafe.akka" %% "akka-stream" % "2.5.13"
107+
val akkaHttp = "com.typesafe.akka" %% "akka-http" % "10.1.4"
108+
val akkaStreams = "com.typesafe.akka" %% "akka-stream" % "2.5.16"
109109

110110
val scalaTestVersion = "3.0.5"
111111
val scalaTest = "org.scalatest" %% "scalatest" % scalaTestVersion
@@ -225,7 +225,7 @@ lazy val cats = crossProject(JSPlatform, JVMPlatform)
225225
.settings(
226226
name := "cats",
227227
publishArtifact in Test := true,
228-
libraryDependencies ++= Seq("org.typelevel" %%% "cats-effect" % "1.0.0-RC2")
228+
libraryDependencies ++= Seq("org.typelevel" %%% "cats-effect" % "1.0.0-RC3")
229229
)
230230
lazy val catsJS = cats.js.dependsOn(coreJS % "compile->compile;test->test")
231231
lazy val catsJVM = cats.jvm.dependsOn(coreJVM % "compile->compile;test->test")
@@ -250,7 +250,7 @@ lazy val scalaz: Project = (project in file("implementations/scalaz"))
250250
.settings(
251251
name := "scalaz",
252252
publishArtifact in Test := true,
253-
libraryDependencies ++= Seq("org.scalaz" %% "scalaz-concurrent" % "7.2.25")
253+
libraryDependencies ++= Seq("org.scalaz" %% "scalaz-concurrent" % "7.2.26")
254254
)
255255
.dependsOn(coreJVM % "compile->compile;test->test")
256256

@@ -308,7 +308,7 @@ lazy val asyncHttpClientFs2Backend: Project =
308308
asyncHttpClientBackendProject("fs2")
309309
.settings(
310310
libraryDependencies ++= Seq(
311-
"com.github.zainab-ali" %% "fs2-reactive-streams" % "0.6.0"
311+
"com.github.zainab-ali" %% "fs2-reactive-streams" % "0.7.0"
312312
)
313313
)
314314
.dependsOn(catsJVM % "compile->compile;test->test")
@@ -360,7 +360,7 @@ lazy val json4s: Project = (project in file("json/json4s"))
360360
.settings(
361361
name := "json4s",
362362
libraryDependencies ++= Seq(
363-
"org.json4s" %% "json4s-native" % "3.5.4",
363+
"org.json4s" %% "json4s-native" % "3.6.0",
364364
"org.scalatest" %% "scalatest" % scalaTestVersion % "test"
365365
)
366366
)
@@ -377,7 +377,7 @@ lazy val sprayJson: Project = (project in file("json/spray-json"))
377377
)
378378
.dependsOn(coreJVM)
379379

380-
lazy val braveVersion = "5.1.2"
380+
lazy val braveVersion = "5.2.0"
381381

382382
lazy val braveBackend: Project = (project in file("metrics/brave-backend"))
383383
.settings(commonJvmSettings: _*)

‎metrics/brave-backend/src/main/scala/com/softwaremill/sttp/brave/BraveBackend.scala‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import brave.propagation.{Propagation, TraceContext}
55
import brave.{Span, Tracing}
66
import com.softwaremill.sttp.brave.BraveBackend._
77
import com.softwaremill.sttp.{FollowRedirectsBackend, MonadError, Request, Response, SttpBackend}
8-
import zipkin2.Endpoint
98

109
import scala.language.higherKinds
1110

@@ -115,14 +114,4 @@ object SttpHttpClientAdapter extends HttpClientAdapter[AnyRequest, AnyResponse]
115114
request.headers.find(_._1.equalsIgnoreCase(name)).map(_._2).orNull
116115

117116
override def statusCode(response: AnyResponse): Integer = response.code
118-
119-
override def parseServerAddress(req: AnyRequest, builder: Endpoint.Builder): Boolean = {
120-
121-
if (builder.parseIp(req.uri.host)) {
122-
req.uri.port.foreach(builder.port(_))
123-
true
124-
} else {
125-
false
126-
}
127-
}
128117
}

‎metrics/brave-backend/src/test/scala/com/softwaremill/sttp/brave/BraveBackendTest.scala‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@ class BraveBackendTest extends FlatSpec with Matchers with BeforeAndAfter {
7979
t.reportsClientKindToZipkin()
8080
}
8181

82-
it should "reportsServerAddress" in {
83-
t.reportsServerAddress()
84-
}
85-
8682
it should "defaultSpanNameIsMethodName" in {
8783
t.defaultSpanNameIsMethodName()
8884
}

‎project/plugins.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ addSbtPlugin("com.updateimpact" % "updateimpact-sbt-plugin" % "2.1.3")
22

33
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.2.0"
44
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
66
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.5.0")
77
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.8")
88

9-
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill" % "1.3.8")
9+
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill" % "1.3.11")

0 commit comments

Comments
 (0)