Skip to content

Commit

Permalink
feat(zio): support Native (softwaremill#4018)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThijsBroersen authored Sep 5, 2024
1 parent 1c5cc5e commit b201076
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 11 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ lazy val core: ProjectMatrix = (projectMatrix in file("core"))
)
)
.nativePlatform(
scalaVersions = List(scala3),
scalaVersions = scala2And3Versions,
settings = {
commonNativeSettings ++ Seq(
libraryDependencies ++= Seq(
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion project/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b201076

Please sign in to comment.