diff options
Diffstat (limited to 'implementations/monix')
3 files changed, 6 insertions, 6 deletions
diff --git a/implementations/monix/src/main/scala/com/softwaremill/sttp/impl/monix/TaskMonadAsyncError.scala b/implementations/monix/src/main/scala/com/softwaremill/sttp/impl/monix/TaskMonadAsyncError.scala index 1806100..75992d4 100644 --- a/implementations/monix/src/main/scala/com/softwaremill/sttp/impl/monix/TaskMonadAsyncError.scala +++ b/implementations/monix/src/main/scala/com/softwaremill/sttp/impl/monix/TaskMonadAsyncError.scala @@ -1,8 +1,8 @@ package com.softwaremill.sttp.impl.monix import com.softwaremill.sttp.MonadAsyncError -import _root_.monix.eval.Task -import _root_.monix.execution.Cancelable +import monix.eval.Task +import monix.execution.Cancelable import scala.util.{Failure, Success} diff --git a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala index c6e44da..3f84ec3 100644 --- a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala +++ b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala @@ -2,13 +2,13 @@ package com.softwaremill.sttp.impl.monix import java.nio.ByteBuffer -import _root_.monix.eval.Task -import _root_.monix.reactive.Observable import com.softwaremill.sttp.testing.streaming.{ConvertToFuture, TestStreamingBackend} +import monix.eval.Task +import monix.reactive.Observable trait MonixTestStreamingBackend extends TestStreamingBackend[Task, Observable[ByteBuffer]] { - override implicit def convertToFuture: ConvertToFuture[Task] = com.softwaremill.sttp.impl.monix.convertToFuture + override implicit def convertToFuture: ConvertToFuture[Task] = convertMonixTaskToFuture override def bodyProducer(body: String): Observable[ByteBuffer] = Observable.fromIterable(body.getBytes("utf-8").map(b => ByteBuffer.wrap(Array(b)))) diff --git a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala index 25cf7e1..f77aa93 100644 --- a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala +++ b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala @@ -7,7 +7,7 @@ import com.softwaremill.sttp.testing.streaming.ConvertToFuture package object monix { - val convertToFuture: ConvertToFuture[Task] = new ConvertToFuture[Task] { + val convertMonixTaskToFuture: ConvertToFuture[Task] = new ConvertToFuture[Task] { import _root_.monix.execution.Scheduler.Implicits.global override def toFuture[T](value: Task[T]): Future[T] = value.runAsync |