diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ccbc221..1fb2dbb 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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" } @@ -18,4 +18,4 @@ object Dependencies { val okhttpMockwebserver = "com.squareup.okhttp3" % "mockwebserver" % Version.okhttp val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -} \ No newline at end of file +} diff --git a/request/src/test/scala/io/taig/communicator/CancelTest.scala b/request/src/test/scala/io/taig/communicator/CancelTest.scala index da628f8..879e13e 100644 --- a/request/src/test/scala/io/taig/communicator/CancelTest.scala +++ b/request/src/test/scala/io/taig/communicator/CancelTest.scala @@ -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 { diff --git a/request/src/test/scala/io/taig/communicator/ParserTest.scala b/request/src/test/scala/io/taig/communicator/ParserTest.scala index 00e1ab8..fd3b051 100644 --- a/request/src/test/scala/io/taig/communicator/ParserTest.scala +++ b/request/src/test/scala/io/taig/communicator/ParserTest.scala @@ -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 } } @@ -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" } } @@ -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" } } @@ -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" } } diff --git a/request/src/test/scala/io/taig/communicator/RequestTest.scala b/request/src/test/scala/io/taig/communicator/RequestTest.scala index ba3d4c7..fdc5cd0 100644 --- a/request/src/test/scala/io/taig/communicator/RequestTest.scala +++ b/request/src/test/scala/io/taig/communicator/RequestTest.scala @@ -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" } } @@ -23,7 +23,7 @@ class RequestTest extends Suite { val request = builder.build() - Request(request).runAsync.map { + Request(request).runToFuture.map { _.code shouldBe 201 } } @@ -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" } } @@ -47,7 +47,7 @@ class RequestTest extends Suite { val request = builder.build() - Request(request).runAsync.map { + Request(request).runToFuture.map { _.code shouldBe 200 } } @@ -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 } } diff --git a/request/src/test/scala/io/taig/communicator/ResponseTest.scala b/request/src/test/scala/io/taig/communicator/ResponseTest.scala index af64205..5983bf6 100644 --- a/request/src/test/scala/io/taig/communicator/ResponseTest.scala +++ b/request/src/test/scala/io/taig/communicator/ResponseTest.scala @@ -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\] @@ -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() @@ -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" diff --git a/request/src/test/scala/io/taig/communicator/Suite.scala b/request/src/test/scala/io/taig/communicator/Suite.scala index f0fe0d4..ff39c8e 100644 --- a/request/src/test/scala/io/taig/communicator/Suite.scala +++ b/request/src/test/scala/io/taig/communicator/Suite.scala @@ -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() } diff --git a/version.sbt b/version.sbt index 210b8e1..1a8eadb 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "3.5.1" +version in ThisBuild := "3.6.1"