Scala native support (#1010)

zio · Sep 4, 2023 · 7554a86 · 7554a86
1 parent 6cf7935
commit 7554a86
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
       matrix:
         java: ['8', '11', '17']
         scala: ['2.12.18', '2.13.11', '3.3.0']
-        platform: ['JVM', 'JS']
+        platform: ['JVM', 'JS', 'Native']
     steps:
       - name: Checkout current branch
         uses: actions/[email protected]
@@ -94,12 +94,14 @@ jobs:
           check-latest: true
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
-      - name: Run tests
+      - name: Install libuv
+        if: matrix.platform == 'Native'
+        run: sudo apt-get update && sudo apt-get install -y libuv1-dev
+      - name: Run Macros tests
         if: ${{ !startsWith(matrix.scala, '3.3.') }}
+        run: sbt ++${{ matrix.scala }}! testScala2${{ matrix.platform }}
+      - name: Run tests
         run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
-      - name: Run Dotty tests
-        if: ${{ startsWith(matrix.scala, '3.3.') && matrix.platform == 'JVM' }}
-        run: sbt ++${{ matrix.scala }}! testJVMDotty
 
   ci:
     runs-on: ubuntu-20.04

diff --git a/build.sbt b/build.sbt
@@ -27,15 +27,33 @@ addCommandAlias("prepare", "fmt")
 
 addCommandAlias(
   "testJVM",
-  "zioJsonJVM/test; zioJsonYaml/test; zioJsonMacrosJVM/test; zioJsonInteropHttp4s/test; zioJsonInteropScalaz7xJVM/test; zioJsonGolden/test; zioJsonInteropScalaz7xJS/test; zioJsonInteropRefinedJVM/test; zioJsonInteropRefinedJS/test"
+  "zioJsonJVM/test; zioJsonYaml/test; zioJsonInteropHttp4s/test; zioJsonInteropScalaz7xJVM/test; zioJsonGolden/test"
 )
 
 addCommandAlias(
-  "testJVMDotty",
-  "zioJsonJVM/test"
+  "testScala2JVM",
+  "zioJsonMacrosJVM/test; zioJsonInteropRefinedJVM/test"
 )
 
-addCommandAlias("testJS", "zioJsonJS/test")
+addCommandAlias(
+  "testScala2JS",
+  "zioJsonMacrosJS/test; zioJsonInteropRefinedJS/test"
+)
+
+addCommandAlias(
+  "testScala2Native",
+  "zioJsonMacrosNative/test; zioJsonInteropRefinedNative/test"
+)
+
+addCommandAlias(
+  "testJS",
+  "zioJsonJS/test; zioJsonInteropScalaz7xJS/test"
+)
+
+addCommandAlias(
+  "testNative",
+  "zioJsonNative/test; zioJsonInteropScalaz7xNative/test"
+)
 
 val zioVersion = "2.0.16"
 
@@ -49,20 +67,24 @@ lazy val zioJsonRoot = project
     docs,
     zioJsonJVM,
     zioJsonJS,
+    zioJson.native,
     zioJsonYaml,
     zioJsonMacrosJVM,
     zioJsonMacrosJS,
+    zioJsonMacros.native,
     zioJsonInteropHttp4s,
     zioJsonInteropRefined.js,
     zioJsonInteropRefined.jvm,
+    zioJsonInteropRefined.native,
     zioJsonInteropScalaz7x.js,
     zioJsonInteropScalaz7x.jvm,
+    zioJsonInteropScalaz7x.native,
     zioJsonGolden
   )
 
 val circeVersion = "0.14.3"
 
-lazy val zioJson = crossProject(JSPlatform, JVMPlatform)
+lazy val zioJson = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .in(file("zio-json"))
   .settings(stdSettings("zio-json"))
   .settings(crossProjectSettings)
@@ -103,7 +125,6 @@ lazy val zioJson = crossProject(JSPlatform, JVMPlatform)
             "org.scala-lang"                          % "scala-reflect"         % scalaVersion.value % Provided,
             "com.softwaremill.magnolia1_2"          %%% "magnolia"              % "1.1.3",
             "io.circe"                              %%% "circe-generic-extras"  % circeVersion       % "test",
-            "com.typesafe.play"                     %%% "play-json"             % "2.9.4"            % "test",
             "com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-core"   % "2.23.3"           % "test",
             "com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-macros" % "2.23.3"           % "test"
           )
@@ -211,12 +232,19 @@ lazy val zioJson = crossProject(JSPlatform, JVMPlatform)
 
         case _ =>
           Seq(
-            "ai.x"          %% "play-json-extensions" % "0.42.0" % "test",
-            "org.typelevel" %% "jawn-ast"             % "1.5.1"  % "test"
+            "ai.x"               %% "play-json-extensions" % "0.42.0" % "test",
+            "com.typesafe.play" %%% "play-json"            % "2.9.4"  % "test",
+            "org.typelevel"      %% "jawn-ast"             % "1.5.1"  % "test"
           )
       }
     }
   )
+  .nativeSettings(Test / fork := false)
+  .nativeSettings(
+    libraryDependencies ++= Seq(
+      "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
+    )
+  )
   .enablePlugins(BuildInfoPlugin)
 
 lazy val zioJsonJS = zioJson.js
@@ -260,8 +288,9 @@ lazy val zioJsonYaml = project
   .dependsOn(zioJsonJVM)
   .enablePlugins(BuildInfoPlugin)
 
-lazy val zioJsonMacros = crossProject(JSPlatform, JVMPlatform)
+lazy val zioJsonMacros = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .in(file("zio-json-macros"))
+  .nativeConfigure(_.dependsOn(zioJson.native))
   .settings(stdSettings("zio-json-macros"))
   .settings(crossProjectSettings)
   .settings(macroExpansionSettings)
@@ -275,6 +304,7 @@ lazy val zioJsonMacros = crossProject(JSPlatform, JVMPlatform)
     ),
     testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")
   )
+  .nativeSettings(Test / fork := false)
 
 lazy val zioJsonMacrosJVM = zioJsonMacros.jvm.dependsOn(zioJsonJVM)
 
@@ -301,10 +331,9 @@ lazy val zioJsonInteropHttp4s = project
   .dependsOn(zioJsonJVM)
   .enablePlugins(BuildInfoPlugin)
 
-lazy val zioJsonInteropRefined = crossProject(JSPlatform, JVMPlatform)
+lazy val zioJsonInteropRefined = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .in(file("zio-json-interop-refined"))
-  .jvmConfigure(_.dependsOn(zioJsonJVM))
-  .jsConfigure(_.dependsOn(zioJsonJS))
+  .dependsOn(zioJson)
   .settings(stdSettings("zio-json-interop-refined"))
   .settings(buildInfoSettings("zio.json.interop.refined"))
   .settings(
@@ -317,10 +346,9 @@ lazy val zioJsonInteropRefined = crossProject(JSPlatform, JVMPlatform)
   )
   .enablePlugins(BuildInfoPlugin)
 
-lazy val zioJsonInteropScalaz7x = crossProject(JSPlatform, JVMPlatform)
+lazy val zioJsonInteropScalaz7x = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .in(file("zio-json-interop-scalaz7x"))
-  .jvmConfigure(_.dependsOn(zioJsonJVM))
-  .jsConfigure(_.dependsOn(zioJsonJS))
+  .dependsOn(zioJson)
   .settings(stdSettings("zio-json-interop-scalaz7x"))
   .settings(buildInfoSettings("zio.json.interop.scalaz7x"))
   .settings(

diff --git a/zio-json/native/src/main/scala/zio/JsonPackagePlatformSpecific.scala b/zio-json/native/src/main/scala/zio/JsonPackagePlatformSpecific.scala
@@ -0,0 +1,3 @@
+package zio
+
+trait JsonPackagePlatformSpecific {}
diff --git a/zio-json/native/src/main/scala/zio/json/JsonDecoderPlatformSpecific.scala b/zio-json/native/src/main/scala/zio/json/JsonDecoderPlatformSpecific.scala
@@ -0,0 +1,3 @@
+package zio.json
+
+trait JsonDecoderPlatformSpecific[A] { self: JsonDecoder[A] => }
diff --git a/zio-json/native/src/main/scala/zio/json/JsonEncoderPlatformSpecific.scala b/zio-json/native/src/main/scala/zio/json/JsonEncoderPlatformSpecific.scala
@@ -0,0 +1,3 @@
+package zio.json
+
+trait JsonEncoderPlatformSpecific[A] { self: JsonEncoder[A] => }
diff --git a/zio-json/shared/src/test/scala/zio/json/CodecSpec.scala b/zio-json/shared/src/test/scala/zio/json/CodecSpec.scala
@@ -103,7 +103,6 @@ object CodecSpec extends ZIOSpecDefault {
           assert(snakedLegacy.fromJson[legacy.Snaked])(isRight(equalTo(legacy.Snaked("")))) &&
           assert(pascaled.fromJson[Pascaled])(isRight(equalTo(Pascaled("")))) &&
           assert(cameled.fromJson[Cameled])(isRight(equalTo(Cameled("")))) &&
-          assert(indianaJones.fromJson[Custom])(isRight(equalTo(Custom("")))) &&
           assert(overrides.fromJson[OverridesAlsoWork])(isRight(equalTo(OverridesAlsoWork("", 0)))) &&
           assertTrue(Kebabed("").toJson == kebabed) &&
           assertTrue(Kebabed("").toJsonAST.toOption.get == kebabed.fromJson[Json].toOption.get) &&
@@ -117,10 +116,19 @@ object CodecSpec extends ZIOSpecDefault {
           assertTrue(Pascaled("").toJsonAST.toOption.get == pascaled.fromJson[Json].toOption.get) &&
           assertTrue(Cameled("").toJson == cameled) &&
           assertTrue(Cameled("").toJsonAST.toOption.get == cameled.fromJson[Json].toOption.get) &&
-          assertTrue(Custom("").toJson == indianaJones) &&
-          assertTrue(Custom("").toJsonAST.toOption.get == indianaJones.fromJson[Json].toOption.get) &&
           assertTrue(OverridesAlsoWork("", 0).toJson == overrides)
         },
+        test("key transformation - except native") {
+          // Problem in scala-native seems to be with implementation of package scala.scalanative.regex.Parser, in particular method `parsePerlFlags`.
+          // It should be fixed from there. Until then, better not to use regex.
+
+          import exampletransformkeys._
+          val indianaJones = """{"wHATcASEiStHIS":""}"""
+
+          assert(indianaJones.fromJson[Custom])(isRight(equalTo(Custom("")))) &&
+          assertTrue(Custom("").toJson == indianaJones) &&
+          assertTrue(Custom("").toJsonAST.toOption.get == indianaJones.fromJson[Json].toOption.get)
+        } @@ TestAspect.exceptNative,
         test("unicode") {
           assert(""""€🐵🥰"""".fromJson[String])(isRight(equalTo("€🐵🥰")))
         },

diff --git a/zio-json/shared/src/test/scala/zio/json/JavaTimeSpec.scala b/zio-json/shared/src/test/scala/zio/json/JavaTimeSpec.scala
@@ -345,8 +345,9 @@ object JavaTimeSpec extends ZIOSpecDefault {
           assert(stringify("foody").fromJson[DayOfWeek])(
             isLeft(
               equalTo("(No enum constant java.time.DayOfWeek.FOODY)") || // JVM
-                equalTo("(Unrecognized day of week name: FOODY)")
-            ) // Scala.js
+                equalTo("(Unrecognized day of week name: FOODY)") ||     // Scala.js 2.
+                equalTo("(enum case not found: FOODY)")                  // Scala.js 3.
+            )
           )
         },
         test("Duration") {
@@ -1498,8 +1499,9 @@ object JavaTimeSpec extends ZIOSpecDefault {
           assert(stringify("FebTober").fromJson[Month])(
             isLeft(
               equalTo("(No enum constant java.time.Month.FEBTOBER)") || // JVM
-                equalTo("(Unrecognized month name: FEBTOBER)")
-            ) // Scala.js
+                equalTo("(Unrecognized month name: FEBTOBER)") ||       // Scala.js 2.
+                equalTo("(enum case not found: FEBTOBER)")              // Scala.js 3.
+            )
           )
         },
         test("MonthDay") {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package zio

		trait JsonPackagePlatformSpecific {}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package zio.json

		trait JsonDecoderPlatformSpecific[A] { self: JsonDecoder[A] => }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package zio.json

		trait JsonEncoderPlatformSpecific[A] { self: JsonEncoder[A] => }