Merge pull request #1420 from softwaremill/scala-native-scala3

Scala native scala3
softwaremill · Apr 29, 2022 · 0dd3176 · 0dd3176
2 parents 30b3b36 + ee715b8
commit 0dd3176
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -310,7 +310,7 @@ lazy val core = (projectMatrix in file("core"))
     }
   )
   .nativePlatform(
-    scalaVersions = scala2,
+    scalaVersions = scala2 ++ scala3,
     settings = {
       commonNativeSettings ++ versioningSchemeSettings ++ List(
         Test / publishArtifact := true

diff --git a/core/src/main/scalanative/sttp/client3/AbstractCurlBackend.scala b/core/src/main/scalanative/sttp/client3/AbstractCurlBackend.scala
@@ -206,14 +206,14 @@ abstract class AbstractCurlBackend[F[_]](monad: MonadError[F], verbose: Boolean)
     val array = str
       .split("\n")
       .filter(_.trim.length > 0)
+    Seq(array: _*)
       .map { line =>
         val split = line.split(":", 2)
         if (split.size == 2)
           Header(split(0).trim, split(1).trim)
         else
           Header(split(0).trim, "")
       }
-    Seq(array: _*)
   }
 
   private lazy val bodyFromResponseAs = new BodyFromResponseAs[F, String, Nothing, Nothing] {

diff --git a/core/src/test/scalanative/sttp/client3/CurlBackendHttpTest.scala b/core/src/test/scalanative/sttp/client3/CurlBackendHttpTest.scala
@@ -3,5 +3,5 @@ package sttp.client3
 import sttp.client3.testing.SyncHttpTest
 
 class CurlBackendHttpTest extends SyncHttpTest {
-  override implicit lazy val backend: SttpBackend[Identity, Any] = CurlBackend(verbose = true)
+  override implicit val backend: SttpBackend[Identity, Any] = CurlBackend(verbose = true)
 }
diff --git a/core/src/test/scalanative/sttp/client3/testing/SyncHttpTestExtensions.scala b/core/src/test/scalanative/sttp/client3/testing/SyncHttpTestExtensions.scala
@@ -1,13 +1,14 @@
 package sttp.client3.testing
 
+import org.scalatest.freespec.AnyFreeSpecLike
 import sttp.client3._
 import sttp.model.{Header, StatusCode}
 
 import java.io.File
 import java.nio.file.Files
 import java.security.MessageDigest
 
-trait SyncHttpTestExtensions {
+trait SyncHttpTestExtensions extends AnyFreeSpecLike {
   self: SyncHttpTest =>
 
   // browsers do not allow access to redirect responses