Merge pull request #432 from ThijsBroersen/feat/zio/support-native

feat(zio): support Native
softwaremill · Sep 4, 2024 · e12212a · e12212a
2 parents 1a6e570 + 965eb35
commit e12212a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -27,7 +27,7 @@ def dependenciesFor(version: String)(deps: (Option[(Long, Long)] => ModuleID)*):
 val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
   organization := "com.softwaremill.sttp.shared",
   libraryDependencies ++= Seq(
-    "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+    "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
   ),
   mimaPreviousArtifacts := Set.empty,
   versionScheme := Some("semver-spec")
@@ -59,14 +59,15 @@ val commonJsSettings = commonSettings ++ Seq(
     }
   },
   libraryDependencies ++= Seq(
-    "org.scala-js" %%% "scalajs-dom" % "2.8.0"
+    "org.scala-js" %%% "scalajs-dom" % "2.8.0",
+    "io.github.cquiroz" %%% "scala-java-time" % "2.6.0" % Test
   )
 )
 
 val commonNativeSettings = commonSettings ++ Seq(
   ideSkipProject := true,
   libraryDependencies ++= Seq(
-    "org.scala-native" %%% "test-interface" % nativeVersion
+    "io.github.cquiroz" %%% "scala-java-time" % "2.6.0" % Test
   )
 )
 
@@ -241,6 +242,10 @@ lazy val zio = (projectMatrix in file("zio"))
     scalaVersions = scala2alive ++ scala3,
     settings = commonJsSettings ++ browserChromeTestSettings
   )
+  .nativePlatform(
+    scalaVersions = scala3,
+    settings = commonNativeSettings
+  )
   .dependsOn(core)
 
 lazy val vertx = (projectMatrix in file("vertx"))

diff --git a/fs2/src/test/scala/sttp/capabilities/fs2/Fs2StreamsTest.scala b/fs2/src/test/scala/sttp/capabilities/fs2/Fs2StreamsTest.scala
@@ -1,13 +1,18 @@
 package sttp.capabilities.fs2
 
 import cats.effect.IO
+import cats.effect.unsafe
 import cats.effect.unsafe.implicits.global
 import fs2._
 import org.scalatest.flatspec.AsyncFlatSpec
 import org.scalatest.matchers.should.Matchers
 import sttp.capabilities.StreamMaxLengthExceededException
+import scala.concurrent.ExecutionContext
 
 class Fs2StreamsTest extends AsyncFlatSpec with Matchers {
+
+  override implicit val executionContext: ExecutionContext = unsafe.IORuntime.global.compute
+
   behavior of "Fs2Streams"
 
   it should "Pass all bytes if limit is not exceeded" in {

diff --git a/zio/src/test/scala/sttp/capabilities/zio/ZioStreamsTest.scala b/zio/src/test/scala/sttp/capabilities/zio/ZioStreamsTest.scala
@@ -5,8 +5,11 @@ import org.scalatest.matchers.should.Matchers
 import sttp.capabilities.StreamMaxLengthExceededException
 import zio._
 import zio.stream.ZStream
+import scala.concurrent.ExecutionContext
 
 class ZioStreamsTest extends AsyncFlatSpec with Matchers {
+  override implicit val executionContext: ExecutionContext = Runtime.defaultExecutor.asExecutionContext
+
   behavior of "ZioStreams"
 
   implicit val r: Runtime[Any] = Runtime.default