Merge pull request #183 from armanbilge/feature/js-native

Cross for JS  and Native

Author: SystemFw

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.8, 3.1.2, 2.12.14]
+        scala: [2.13.8, 3.2.2, 2.12.14]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -63,7 +63,7 @@ jobs:
         run: sbt ++${{ matrix.scala }} docs/mdoc
 
       - name: Compress target directories
-        run: tar cf targets.tar target modules/core/target project/target
+        run: tar cf targets.tar target modules/core/.native/target modules/core/.js/target modules/core/.jvm/target project/target
 
       - name: Upload target directories
         uses: actions/upload-artifact@v2
@@ -116,12 +116,12 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.1.2)
+      - name: Download target directories (3.2.2)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-3.1.2-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.2.2-${{ matrix.java }}
 
-      - name: Inflate target directories (3.1.2)
+      - name: Inflate target directories (3.2.2)
         run: |
           tar xf targets.tar
           rm targets.tar
@@ -162,12 +162,12 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.1.2)
+      - name: Download target directories (3.2.2)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-3.1.2-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.2.2-${{ matrix.java }}
 
-      - name: Inflate target directories (3.1.2)
+      - name: Inflate target directories (3.2.2)
         run: |
           tar xf targets.tar
           rm targets.tar

build.sbt

@@ -18,7 +18,7 @@ Global / excludeLintKeys += scmInfo
 val Scala213 = "2.13.8"
 ThisBuild / spiewakMainBranches := Seq("main")
 
-ThisBuild / crossScalaVersions := Seq(Scala213, "3.1.2", "2.12.14")
+ThisBuild / crossScalaVersions := Seq(Scala213, "3.2.2", "2.12.14")
 ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head
 ThisBuild / initialCommands := """
   |import cats._, data._, syntax.all._
@@ -34,27 +34,32 @@ ThisBuild / initialCommands := """
 ThisBuild / testFrameworks += new TestFramework("munit.Framework")
 ThisBuild / Test / parallelExecution := false
 
-def dep(org: String, prefix: String, version: String)(modules: String*)(testModules: String*) =
-  modules.map(m => org %% (prefix ++ m) % version) ++
-   testModules.map(m => org %% (prefix ++ m) % version % Test)
+def dep(org: String, prefix: String, version: String)(
+    modules: String*
+)(testModules: String*) =
+  Def.setting {
+    modules.map(m => org %%% (prefix ++ m) % version) ++
+      testModules.map(m => org %%% (prefix ++ m) % version % Test)
+  }
 
 lazy val root = project
   .in(file("."))
   .enablePlugins(NoPublishPlugin, SonatypeCiReleasePlugin)
-  .aggregate(core)
+  .aggregate(core.jvm, core.js, core.native)
 
-lazy val core = project
+lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
+  .crossType(CrossType.Pure)
   .in(file("modules/core"))
   .settings(
     name := "upperbound",
     scalafmtOnCompile := true,
     libraryDependencies ++=
-      dep("org.typelevel", "cats-", "2.7.0")("core")() ++
-      dep("org.typelevel", "cats-effect", "3.3.11")("")("-laws", "-testkit") ++
-      dep("co.fs2", "fs2-", "3.2.7")("core")() ++
-      dep("org.scalameta", "munit", "0.7.29")()("", "-scalacheck") ++
-      dep("org.typelevel", "", "1.0.7")()("munit-cats-effect-3") ++
-      dep("org.typelevel",  "scalacheck-effect", "1.0.3")()("", "-munit")
+      dep("org.typelevel", "cats-", "2.9.0")("core")().value ++
+        dep("org.typelevel", "cats-effect", "3.5.0")("")("-laws", "-testkit").value ++
+        dep("co.fs2", "fs2-", "3.7.0")("core")().value ++
+        dep("org.scalameta", "munit", "1.0.0-M7")()("", "-scalacheck").value ++
+        dep("org.typelevel", "", "2.0.0-M3")()("munit-cats-effect").value ++
+        dep("org.typelevel", "scalacheck-effect", "2.0.0-M2")()("", "-munit").value
   )
 
 lazy val docs = project
@@ -71,7 +76,7 @@ lazy val docs = project
     githubWorkflowArtifactUpload := false,
     fatalWarningsInCI := false
   )
-  .dependsOn(core)
+  .dependsOn(core.jvm)
   .enablePlugins(MdocPlugin, NoPublishPlugin)
 
 ThisBuild / githubWorkflowBuildPostamble ++= List(

modules/core/src/test/scala/BaseSuite.scala

@@ -21,9 +21,8 @@
 
 package upperbound
 
-import scala.concurrent.ExecutionContext
 import munit.{CatsEffectSuite, ScalaCheckEffectSuite}
 
 abstract class BaseSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
-  override val munitExecutionContext: ExecutionContext = ExecutionContext.global
+  def isJS = Option(System.getProperty("java.vm.name")).contains("Scala.js")
 }

modules/core/src/test/scala/LimiterSuite.scala

@@ -93,7 +93,7 @@ class LimiterSuite extends BaseSuite {
       maxConcurrent = Int.MaxValue,
       productionInterval = 1.millis,
       producers = 4,
-      jobsPerProducer = 100,
+      jobsPerProducer = if (isJS) 10 else 100,
       jobCompletion = 0.seconds
     )
 
@@ -108,7 +108,7 @@ class LimiterSuite extends BaseSuite {
       maxConcurrent = Int.MaxValue,
       productionInterval = 300.millis,
       producers = 1,
-      jobsPerProducer = 100,
+      jobsPerProducer = if (isJS) 10 else 100,
       jobCompletion = 0.seconds
     )
 

project/plugins.sbt

@@ -1,3 +1,8 @@
 addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.23.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24")
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")