Skip to content

Commit

Permalink
Restore Native support for core and a few other modules (#3894)
Browse files Browse the repository at this point in the history
  • Loading branch information
kciesielski authored Jul 2, 2024
1 parent ae26fc7 commit 76a4667
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
35 changes: 35 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,17 @@ lazy val core: ProjectMatrix = (projectMatrix in file("core"))
)
)
)
.nativePlatform(
scalaVersions = List(scala3),
settings = {
commonNativeSettings ++ Seq(
libraryDependencies ++= Seq(
"io.github.cquiroz" %%% "scala-java-time" % Versions.nativeScalaJavaTime,
"io.github.cquiroz" %%% "scala-java-time-tzdb" % Versions.nativeScalaJavaTime % Test
)
)
}
)
//.enablePlugins(spray.boilerplate.BoilerplatePlugin)

lazy val files: ProjectMatrix = (projectMatrix in file("files"))
Expand All @@ -458,6 +469,7 @@ lazy val files: ProjectMatrix = (projectMatrix in file("files"))
)
.jvmPlatform(scalaVersions = scala2And3Versions)
.jsPlatform(scalaVersions = scala2And3Versions)
.nativePlatform(scalaVersions = List(scala3))
.dependsOn(core)

lazy val testing: ProjectMatrix = (projectMatrix in file("testing"))
Expand All @@ -471,6 +483,7 @@ lazy val testing: ProjectMatrix = (projectMatrix in file("testing"))
)
.jvmPlatform(scalaVersions = scala2And3Versions)
.jsPlatform(scalaVersions = scala2And3Versions, settings = commonJsSettings)
.nativePlatform(scalaVersions = List(scala3), settings = commonNativeSettings)
.dependsOn(core, circeJson % Test)

lazy val tests: ProjectMatrix = (projectMatrix in file("tests"))
Expand Down Expand Up @@ -575,6 +588,14 @@ lazy val cats: ProjectMatrix = (projectMatrix in file("integrations/cats"))
)
)
)
.nativePlatform(
scalaVersions = List(scala3),
settings = commonNativeSettings ++ Seq(
libraryDependencies ++= Seq(
"io.github.cquiroz" %%% "scala-java-time" % Versions.jsScalaJavaTime % Test
)
)
)
.dependsOn(core)

lazy val catsEffect: ProjectMatrix = (projectMatrix in file("integrations/cats-effect"))
Expand Down Expand Up @@ -760,6 +781,10 @@ lazy val circeJson: ProjectMatrix = (projectMatrix in file("json/circe"))
scalaVersions = scala2And3Versions,
settings = commonJsSettings
)
.nativePlatform(
scalaVersions = List(scala3),
settings = commonNativeSettings
)
.dependsOn(core)

lazy val json4s: ProjectMatrix = (projectMatrix in file("json/json4s"))
Expand Down Expand Up @@ -853,6 +878,14 @@ lazy val uPickleJson: ProjectMatrix = (projectMatrix in file("json/upickle"))
)
)
)
.nativePlatform(
scalaVersions = List(scala3),
settings = commonNativeSettings ++ Seq(
libraryDependencies ++= Seq(
"io.github.cquiroz" %%% "scala-java-time" % Versions.nativeScalaJavaTime % Test
)
)
)
.dependsOn(core)

lazy val picklerJson: ProjectMatrix = (projectMatrix in file("json/pickler"))
Expand Down Expand Up @@ -1157,6 +1190,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)

lazy val serverTests: ProjectMatrix = (projectMatrix in file("server/tests"))
.settings(commonJvmSettings)
Expand Down Expand Up @@ -1829,6 +1863,7 @@ lazy val clientCore: ProjectMatrix = (projectMatrix in file("client/core"))
)
.jvmPlatform(scalaVersions = scala2And3Versions)
.jsPlatform(scalaVersions = scala2And3Versions)
.nativePlatform(scalaVersions = List(scala3))
.dependsOn(core)

lazy val http4sClient: ProjectMatrix = (projectMatrix in file("client/http4s-client"))
Expand Down
2 changes: 1 addition & 1 deletion project/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ object Versions {
val tethys = "0.28.4"
val vertx = "4.5.8"
val jsScalaJavaTime = "2.6.0"
val nativeScalaJavaTime = "2.4.0-M3"
val nativeScalaJavaTime = "2.6.0"
val jwtScala = "10.0.1"
val derevo = "0.13.0"
val newtype = "0.4.4"
Expand Down

0 comments on commit 76a4667

Please sign in to comment.