From b201076c7bccf3281d02d73bb44ebe6d6eaaf4da Mon Sep 17 00:00:00 2001
From: Thijs Broersen <4889512+ThijsBroersen@users.noreply.github.com>
Date: Thu, 5 Sep 2024 21:02:33 +0200
Subject: [PATCH] feat(zio): support Native (#4018)

---
 .github/workflows/ci.yml |  4 ----
 build.sbt                | 14 +++++++++++---
 project/Versions.scala   |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e3b48d6ea..68f0f7bdfe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,10 +24,6 @@ jobs:
         java: [ "11", "21" ]
         exclude:
           - java: "21"
-          - scala-version: "2.12"
-            target-platform: "Native"
-          - scala-version: "2.13"
-            target-platform: "Native"
         include: # Restricted to build only specific Loom-based modules
           - scala-version: "2.13"
             target-platform: "JVM"
diff --git a/build.sbt b/build.sbt
index df18be30cc..dea4ae6d0f 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 4bbadbdb82..417eb86cd7 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.21"
+  val sttpShared = "1.3.22"
   val sttpApispec = "0.11.3"
   val akkaHttp = "10.2.10"
   val akkaStreams = "2.6.20"