diff --git a/build.sbt b/build.sbt index 0cb7fe57dc..870e27a4d6 100644 --- a/build.sbt +++ b/build.sbt @@ -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")) @@ -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")) @@ -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")) @@ -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")) @@ -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")) @@ -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")) @@ -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) @@ -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")) diff --git a/project/Versions.scala b/project/Versions.scala index 1adc2ffff7..1eba13926c 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -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"