Merge pull request #370 from armanbilge/feature/native

Cross-build for Native
typelevel · Sep 15, 2022 · 5a9822e · 5a9822e
2 parents a6cd60b + 0863818
commit 5a9822e
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
         os: [ubuntu-latest]
         scala: [2.12.16, 3.1.3, 2.13.8]
         java: [temurin@8]
-        project: [rootJS, rootJVM]
+        project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -77,6 +77,10 @@ jobs:
         if: matrix.project == 'rootJS'
         run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' Test/scalaJSLinkerResult
 
+      - name: nativeLink
+        if: matrix.project == 'rootNative'
+        run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' Test/nativeLink
+
       - name: Test
         run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' test
 
@@ -90,11 +94,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p target .js/target core/.js/target .jvm/target .native/target core/.jvm/target project/target
+        run: mkdir -p target .js/target core/.js/target .jvm/target .native/target core/.jvm/target core/.native/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar target .js/target core/.js/target .jvm/target .native/target core/.jvm/target project/target
+        run: tar cf targets.tar target .js/target core/.js/target .jvm/target .native/target core/.jvm/target core/.native/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -167,6 +171,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (2.12.16, rootNative)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootNative
+
+      - name: Inflate target directories (2.12.16, rootNative)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Download target directories (3.1.3, rootJS)
         uses: actions/download-artifact@v2
         with:
@@ -187,6 +201,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (3.1.3, rootNative)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootNative
+
+      - name: Inflate target directories (3.1.3, rootNative)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Download target directories (2.13.8, rootJS)
         uses: actions/download-artifact@v2
         with:
@@ -207,6 +231,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (2.13.8, rootNative)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootNative
+
+      - name: Inflate target directories (2.13.8, rootNative)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Import signing key
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
         run: echo $PGP_SECRET | base64 -di | gpg --import

diff --git a/build.sbt b/build.sbt
@@ -19,13 +19,13 @@ ThisBuild / developers := List(
 )
 
 val JawnVersion = "1.4.0"
-val Fs2Version = "3.2.11"
-val MunitVersion = "0.7.29"
-val MunitCatsEffectVersion = "1.0.7"
+val Fs2Version = "3.3.0"
+val MunitVersion = "1.0.0-M6"
+val MunitCatsEffectVersion = "2.0.0-M3"
 
 lazy val root = tlCrossRootProject.aggregate(`jawn-fs2`)
 
-lazy val `jawn-fs2` = crossProject(JVMPlatform, JSPlatform)
+lazy val `jawn-fs2` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .crossType(CrossType.Pure)
   .in(file("core"))
   .settings(
@@ -35,10 +35,13 @@ lazy val `jawn-fs2` = crossProject(JVMPlatform, JSPlatform)
       "co.fs2" %%% "fs2-io" % Fs2Version % Test,
       "org.typelevel" %%% "jawn-ast" % JawnVersion % Test,
       "org.scalameta" %%% "munit" % MunitVersion % Test,
-      "org.typelevel" %%% "munit-cats-effect-3" % MunitCatsEffectVersion % Test
+      "org.typelevel" %%% "munit-cats-effect" % MunitCatsEffectVersion % Test
     )
   )
   .jsSettings(
     tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "2.1.0").toMap,
     scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) }
   )
+  .nativeSettings(
+    tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "2.2.1").toMap
+  )
diff --git a/core/src/test/scala/org/typelevel/jawn/fs2/JawnFs2Suite.scala b/core/src/test/scala/org/typelevel/jawn/fs2/JawnFs2Suite.scala
@@ -40,7 +40,7 @@ class JawnFs2Suite extends CatsEffectSuite {
   implicit val facade: Facade[JValue] = JParser.facade
 
   private def liftResource[A](io: IO[A]): SyncIO[FunFixture[A]] =
-    ResourceFixture(Resource.eval(io))
+    ResourceFunFixture(Resource.eval(io))
 
   private def parse[A: Absorbable](a: A*): SyncIO[FunFixture[Option[JValue]]] =
     liftResource(

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,4 @@
 addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.13")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.7")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")