Skip to content
This repository has been archived by the owner on Dec 31, 2020. It is now read-only.

Updates monix and circe to their latest versions #61

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import sbt._

object Dependencies {
object Version {
val circe = "0.9.3"
val circe = "0.12.3"

val monix = "3.0.0-RC1"
val monix = "3.1.0"

val okhttp = "3.11.0"
}
Expand All @@ -18,4 +18,4 @@ object Dependencies {
val okhttpMockwebserver = "com.squareup.okhttp3" % "mockwebserver" % Version.okhttp

val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
}
}
3 changes: 1 addition & 2 deletions request/src/test/scala/io/taig/communicator/CancelTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ class CancelTest extends Suite {
}

val request = builder.build()
val future = Request(request).parse[String].runAsync

val future = Request(request).parse[String].executeWithOptions(_.disableAutoCancelableRunLoops).runToFuture
future.cancel()

future.failed.map {
Expand Down
8 changes: 4 additions & 4 deletions request/src/test/scala/io/taig/communicator/ParserTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class ParserTest extends Suite {

val request = builder.build()

Request(request).parse[Array[Byte]].runAsync.map {
Request(request).parse[Array[Byte]].runToFuture.map {
_.body shouldBe "foobar".getBytes
}
}
Expand All @@ -23,7 +23,7 @@ class ParserTest extends Suite {

val request = builder.build()

Request(request).parse[String].runAsync.map {
Request(request).parse[String].runToFuture.map {
_.body shouldBe "foobar"
}
}
Expand All @@ -35,7 +35,7 @@ class ParserTest extends Suite {

val request = builder.build()

Request(request).parse[ResponseBody].runAsync.map {
Request(request).parse[ResponseBody].runToFuture.map {
_.body.string shouldBe "foobar"
}
}
Expand All @@ -49,7 +49,7 @@ class ParserTest extends Suite {

val request = builder.build()

Request(request).parse(parser).runAsync.map {
Request(request).parse(parser).runToFuture.map {
_.body shouldBe "FOOBAR"
}
}
Expand Down
10 changes: 5 additions & 5 deletions request/src/test/scala/io/taig/communicator/RequestTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class RequestTest extends Suite {

val request = builder.build()

Request(request).parse[String].runAsync.map {
Request(request).parse[String].runToFuture.map {
_.body shouldBe "foobar"
}
}
Expand All @@ -23,7 +23,7 @@ class RequestTest extends Suite {

val request = builder.build()

Request(request).runAsync.map {
Request(request).runToFuture.map {
_.code shouldBe 201
}
}
Expand All @@ -35,7 +35,7 @@ class RequestTest extends Suite {

val request = builder.build()

Request(request).unsafeToTask.runAsync.map {
Request(request).unsafeToTask.runToFuture.map {
_.wrapped.body.string shouldBe "foobar"
}
}
Expand All @@ -47,7 +47,7 @@ class RequestTest extends Suite {

val request = builder.build()

Request(request).runAsync.map {
Request(request).runToFuture.map {
_.code shouldBe 200
}
}
Expand All @@ -61,7 +61,7 @@ class RequestTest extends Suite {
.post(RequestBody.create(MediaType.parse("text/plain"), "foobar"))
.build()

Request(request).runAsync.map {
Request(request).runToFuture.map {
_.code shouldBe 200
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class ResponseTest extends Suite {

val request = builder.build()

Request(request).parse[String].runAsync.map {
Request(request).parse[String].runToFuture.map {
_.toString should fullyMatch regex """
|>>> http://localhost:\d+/
|\[No headers\]
Expand All @@ -29,7 +29,7 @@ class ResponseTest extends Suite {

val request = builder.build()

Request(request).parse[String].runAsync.map { response ⇒
Request(request).parse[String].runToFuture.map { response ⇒
response.code shouldBe response.wrapped.code()
response.message.orNull shouldBe response.wrapped.message()
response.headers shouldBe response.wrapped.headers()
Expand Down Expand Up @@ -61,7 +61,7 @@ class ResponseTest extends Suite {

val request = builder.build()

Request(request).parse[String].runAsync.map {
Request(request).parse[String].runToFuture.map {
case Response(code, body) ⇒
code shouldBe 201
body shouldBe "foobar"
Expand Down
2 changes: 1 addition & 1 deletion request/src/test/scala/io/taig/communicator/Suite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ trait Suite extends AsyncFlatSpec with Matchers {
}

implicit def taskToFuture(task: Task[Assertion]): Future[Assertion] =
task.runAsync
task.runToFuture

LogManager.getLogManager.reset()
}
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "3.5.1"
version in ThisBuild := "3.6.1"