diff options
| author | Bjørn Madsen <bm@aeons.dk> | 2017-08-07 08:57:49 +0200 |
|---|---|---|
| committer | Bjørn Madsen <bm@aeons.dk> | 2017-08-07 09:22:26 +0200 |
| commit | ccd84dadf7e7b1b5c037933f3a2ae56272c62919 (patch) | |
| tree | 6104f0824aa37ce6925da7e3e852ba88b8a0ebb8 | |
| parent | 060cd745cdaa72ef433720fa09845c1132a516d8 (diff) | |
| download | sttp-ccd84dadf7e7b1b5c037933f3a2ae56272c62919.tar.gz sttp-ccd84dadf7e7b1b5c037933f3a2ae56272c62919.tar.bz2 sttp-ccd84dadf7e7b1b5c037933f3a2ae56272c62919.zip | |
Move circe package object
| -rw-r--r-- | async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/MonixAsyncHttpClientHandler.scala | 3 | ||||
| -rw-r--r-- | circe/src/main/scala/com/softwaremill/sttp/circe.scala (renamed from circe/src/main/scala/com/softwaremill/sttp/circe/circe.scala) | 0 |
2 files changed, 1 insertions, 2 deletions
diff --git a/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/MonixAsyncHttpClientHandler.scala b/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/MonixAsyncHttpClientHandler.scala index c782519..5b6426f 100644 --- a/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/MonixAsyncHttpClientHandler.scala +++ b/async-http-client-handler/monix/src/main/scala/com/softwaremill/sttp/asynchttpclient/monix/MonixAsyncHttpClientHandler.scala @@ -25,9 +25,8 @@ class MonixAsyncHttpClientHandler private ( closeClient) { override protected def streamBodyToPublisher( - s: Observable[ByteBuffer]): Publisher[ByteBuffer] = { + s: Observable[ByteBuffer]): Publisher[ByteBuffer] = s.toReactivePublisher - } override protected def publisherToStreamBody( p: Publisher[ByteBuffer]): Observable[ByteBuffer] = diff --git a/circe/src/main/scala/com/softwaremill/sttp/circe/circe.scala b/circe/src/main/scala/com/softwaremill/sttp/circe.scala index 0233f08..0233f08 100644 --- a/circe/src/main/scala/com/softwaremill/sttp/circe/circe.scala +++ b/circe/src/main/scala/com/softwaremill/sttp/circe.scala |