From 48a2978ffe2b9c58fd74b56973010eb2c7b61ecf Mon Sep 17 00:00:00 2001
From: Thijs Broersen <thijsbroersen@gmail.com>
Date: Thu, 5 Sep 2024 10:58:32 +0000
Subject: [PATCH] feat(zio): support Native

---
 build.sbt              | 14 +++++++++++---
 project/Versions.scala |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/build.sbt b/build.sbt
index 49d9a67a33..ec3a1a4e57 100644
--- a/build.sbt
+++ b/build.sbt
@@ -451,7 +451,7 @@ lazy val core: ProjectMatrix = (projectMatrix in file("core"))
     )
   )
   .nativePlatform(
-    scalaVersions = List(scala3),
+    scalaVersions = scala2And3Versions,
     settings = {
       commonNativeSettings ++ Seq(
         libraryDependencies ++= Seq(
@@ -700,6 +700,10 @@ lazy val zio: ProjectMatrix = (projectMatrix in file("integrations/zio"))
     scalaVersions = scala2And3Versions,
     settings = commonJsSettings
   )
+  .nativePlatform(
+    scalaVersions = scala2And3Versions,
+    settings = commonNativeSettings
+  )
   .dependsOn(core, serverCore % Test)
 
 lazy val derevo: ProjectMatrix = (projectMatrix in file("integrations/derevo"))
@@ -765,6 +769,10 @@ lazy val zioPrelude: ProjectMatrix = (projectMatrix in file("integrations/zio-pr
     scalaVersions = scala2And3Versions,
     settings = commonJsSettings
   )
+  .nativePlatform(
+    scalaVersions = scala2And3Versions,
+    settings = commonNativeSettings
+  )
   .dependsOn(core)
 
 // json
@@ -955,7 +963,7 @@ lazy val zioJson: ProjectMatrix = (projectMatrix in file("json/zio"))
     settings = commonJsSettings
   )
   .nativePlatform(
-    scalaVersions = List(scala3),
+    scalaVersions = scala2And3Versions,
     settings = commonNativeSettings
   )
   .dependsOn(core)
@@ -1202,7 +1210,7 @@ lazy val serverCore: ProjectMatrix = (projectMatrix in file("server/core"))
   .dependsOn(core % CompileAndTest)
   .jvmPlatform(scalaVersions = scala2And3Versions, settings = commonJvmSettings)
   .jsPlatform(scalaVersions = scala2And3Versions, settings = commonJsSettings)
-  .nativePlatform(scalaVersions = List(scala3), settings = commonNativeSettings)
+  .nativePlatform(scalaVersions = scala2And3Versions, settings = commonNativeSettings)
 
 lazy val serverTests: ProjectMatrix = (projectMatrix in file("server/tests"))
   .settings(commonJvmSettings)
diff --git a/project/Versions.scala b/project/Versions.scala
index 2d61c2a064..cca77ef035 100644
--- a/project/Versions.scala
+++ b/project/Versions.scala
@@ -10,7 +10,7 @@ object Versions {
   val helidon = "4.0.10"
   val sttp = "3.9.8"
   val sttpModel = "1.7.11"
-  val sttpShared = "1.3.20"
+  val sttpShared = "1.3.22"
   val sttpApispec = "0.11.3"
   val akkaHttp = "10.2.10"
   val akkaStreams = "2.6.20"