Update ox to 0.4.0 (#2294)

softwaremill · Sep 25, 2024 · a5c5560 · a5c5560
1 parent 838913b
commit a5c5560
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,11 +24,13 @@ core/native/local.sbt
 
 .metals/
 .bloop/
-project/metals.sbt
 .bsp/
 .java-version
+metals.sbt
 
 .vscode
 
 # scala-native
 lowered.hnir
+
+work.txt
diff --git a/build.sbt b/build.sbt
@@ -150,7 +150,7 @@ val zio2Version = "2.1.9"
 val zio1InteropRsVersion = "1.3.12"
 val zio2InteropRsVersion = "2.0.2"
 
-val oxVersion = "0.2.0"
+val oxVersion = "0.4.0"
 val sttpModelVersion = "1.7.11"
 val sttpSharedVersion = "1.3.22"
 

diff --git a/effects/ox/src/main/scala/sttp/client4/impl/ox/sse/OxServerSentEvents.scala b/effects/ox/src/main/scala/sttp/client4/impl/ox/sse/OxServerSentEvents.scala
@@ -7,7 +7,7 @@ import sttp.model.sse.ServerSentEvent
 import java.io.InputStream
 
 object OxServerSentEvents:
-  def parse(is: InputStream)(using Ox, IO): Source[ServerSentEvent] =
+  def parse(is: InputStream)(using Ox): Source[ServerSentEvent] =
     Source
       .fromInputStream(is)
       .linesUtf8

diff --git a/effects/ox/src/test/scala/sttp/client4/impl/ox/ws/OxSseTest.scala b/effects/ox/src/test/scala/sttp/client4/impl/ox/ws/OxSseTest.scala
@@ -4,7 +4,6 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import ox.*
-import ox.IO.globalForTesting.given
 import sttp.client4.*
 import sttp.client4.testing.HttpTest.*
 import sttp.model.sse.ServerSentEvent

diff --git a/effects/ox/src/test/scala/sttp/client4/impl/ox/ws/OxWebSocketsTest.scala b/effects/ox/src/test/scala/sttp/client4/impl/ox/ws/OxWebSocketsTest.scala
@@ -164,10 +164,13 @@ class OxWebSocketTest extends AnyFlatSpec with BeforeAndAfterAll with Matchers w
   }
 
   def sendText(wsSink: Sink[WebSocketFrame], count: Int)(using Ox): Unit =
-    Source.fromIterable(1 to count).map(i => WebSocketFrame.text(s"test$i")).pipeTo(wsSink)
+    Source.fromIterable(1 to count).map(i => WebSocketFrame.text(s"test$i")).pipeTo(wsSink, propagateDone = true)
 
   def sendBinary(wsSink: Sink[WebSocketFrame], count: Int)(using Ox): Unit =
-    Source.fromIterable(1 to count).map(i => WebSocketFrame.binary(Array(i.toByte))).pipeTo(wsSink)
+    Source
+      .fromIterable(1 to count)
+      .map(i => WebSocketFrame.binary(Array(i.toByte)))
+      .pipeTo(wsSink, propagateDone = true)
 
   def receiveEchoText(wsSource: Source[WebSocketFrame], count: Int): Unit =
     for (i <- 1 to count)

diff --git a/examples3/src/main/scala/sttp/client4/examples/WebSocketOx.scala b/examples3/src/main/scala/sttp/client4/examples/WebSocketOx.scala
@@ -10,16 +10,13 @@ import sttp.ws.WebSocketFrame
 
 @main def wsOxExample =
   def useWebSocket(ws: SyncWebSocket): Unit =
-    supervised {
+    supervised:
       val inputs = Source.fromValues(1, 2, 3).map(i => WebSocketFrame.text(s"Frame no $i"))
       val (wsSource, wsSink) = asSourceAndSink(ws)
-      fork {
-        inputs.pipeTo(wsSink)
-      }
-      wsSource.foreach { frame =>
+      fork:
+        inputs.pipeTo(wsSink, propagateDone = true)
+      wsSource.foreach: frame =>
         println(s"RECEIVED: $frame")
-      }
-    }
 
   val backend = DefaultSyncBackend()
   try