Merge pull request #9 from riiswa/main

Add minimal support for Scala.js
kitlangton · Feb 11, 2022 · 6c08854 · 6c08854
2 parents 17009c5 + 1ebfd54
commit 6c08854
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 27 deletions.
diff --git a/build.sbt b/build.sbt
@@ -38,71 +38,72 @@ val zioQueryVersion    = "0.3.0-RC2"
 val catsEffect3Version = "3.3.5"
 
 lazy val root = (project in file("."))
-  .aggregate(core, zio)
+  .aggregate(core.js, core.jvm, zio.js, zio.jvm)
   .settings(
     name               := "parallel-for",
     crossScalaVersions := Nil,
     skip / publish     := true
   )
 
-lazy val core = (project in file("core"))
+lazy val core = (crossProject(JSPlatform, JVMPlatform) in file("core"))
   .settings(
     name := "parallel-for",
     libraryDependencies ++= Seq(
       "org.scala-lang" % "scala-reflect"  % scalaVersion.value,
       "org.scala-lang" % "scala-compiler" % scalaVersion.value,
-      "dev.zio"       %% "zio-test"       % zio2Version % Test,
-      "dev.zio"       %% "zio-test-sbt"   % zio2Version % Test
+      "dev.zio"       %%% "zio-test"       % zio2Version % Test,
+      "dev.zio"       %%% "zio-test-sbt"   % zio2Version % Test
     ),
     testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
     sharedSettings
   )
+  .enablePlugins(ScalaJSPlugin)
 
-lazy val zio1 = (project in file("zio1"))
+lazy val zio1 = (crossProject(JSPlatform, JVMPlatform) in file("zio1"))
   .settings(
     name := "parallel-for-zio-1",
     libraryDependencies ++= Seq(
-      "dev.zio" %% "zio"          % zio1Version,
-      "dev.zio" %% "zio-test"     % zio1Version % Test,
-      "dev.zio" %% "zio-test-sbt" % zio1Version % Test
+      "dev.zio" %%% "zio"          % zio1Version,
+      "dev.zio" %%% "zio-test"     % zio1Version % Test,
+      "dev.zio" %%% "zio-test-sbt" % zio1Version % Test
     ),
     testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
     sharedSettings
   )
   .dependsOn(core)
 
-lazy val zio = (project in file("zio"))
+lazy val zio = (crossProject(JSPlatform, JVMPlatform)  in file("zio"))
   .settings(
     name := "parallel-for-zio",
     libraryDependencies ++= Seq(
-      "dev.zio" %% "zio"          % zio2Version,
-      "dev.zio" %% "zio-test"     % zio2Version % Test,
-      "dev.zio" %% "zio-test-sbt" % zio2Version % Test
+      "dev.zio" %%% "zio"          % zio2Version,
+      "dev.zio" %%% "zio-test"     % zio2Version % Test,
+      "dev.zio" %%% "zio-test-sbt" % zio2Version % Test
     ),
     testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
     sharedSettings
   )
   .dependsOn(core)
 
-lazy val zioQuery = (project in file("zio-query"))
+lazy val zioQuery = (crossProject(JSPlatform, JVMPlatform)  in file("zio-query"))
   .settings(
     name := "parallel-for-zio-query",
     libraryDependencies ++= Seq(
-      "dev.zio" %% "zio-query"    % zioQueryVersion,
-      "dev.zio" %% "zio-test"     % zio2Version % Test,
-      "dev.zio" %% "zio-test-sbt" % zio2Version % Test
+      "dev.zio" %%% "zio-query"    % zioQueryVersion,
+      "dev.zio" %%% "zio-test"     % zio2Version % Test,
+      "dev.zio" %%% "zio-test-sbt" % zio2Version % Test
     ),
     testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
     sharedSettings
   )
   .dependsOn(core)
 
-lazy val catsEffect3 = (project in file("cats-effect-3"))
+lazy val catsEffect3 = (crossProject(JSPlatform, JVMPlatform)  in file("cats-effect-3"))
   .settings(
     name := "parallel-for-cats-effect-3",
     libraryDependencies ++= Seq(
-      "org.typelevel"       %% "cats-effect" % catsEffect3Version,
-      "com.disneystreaming" %% "weaver-cats" % "0.7.9" % Test
+      "org.typelevel"       %%% "cats-effect" % catsEffect3Version,
+      "com.disneystreaming" %%% "weaver-cats" % "0.7.9" % Test
     ),
     testFrameworks += new TestFramework("weaver.framework.CatsEffect"),
     sharedSettings

diff --git a/...la/parallelfor/interop/cats/package.scala → ...la/parallelfor/interop/cats/package.scala b/...la/parallelfor/interop/cats/package.scala → ...la/parallelfor/interop/cats/package.scala
diff --git a/...elfor/interop/cats/ParallelCatsSpec.scala → ...elfor/interop/cats/ParallelCatsSpec.scala b/...elfor/interop/cats/ParallelCatsSpec.scala → ...elfor/interop/cats/ParallelCatsSpec.scala
diff --git a/...in/scala/parallelfor/Parallelizable.scala → ...in/scala/parallelfor/Parallelizable.scala b/...in/scala/parallelfor/Parallelizable.scala → ...in/scala/parallelfor/Parallelizable.scala
diff --git a/...cala/parallelfor/internal/Algorithm.scala → ...cala/parallelfor/internal/Algorithm.scala b/...cala/parallelfor/internal/Algorithm.scala → ...cala/parallelfor/internal/Algorithm.scala
diff --git a/...scala/parallelfor/internal/CodeTree.scala → ...scala/parallelfor/internal/CodeTree.scala b/...scala/parallelfor/internal/CodeTree.scala → ...scala/parallelfor/internal/CodeTree.scala
diff --git a/...in/scala/parallelfor/internal/Macro.scala → ...in/scala/parallelfor/internal/Macro.scala b/...in/scala/parallelfor/internal/Macro.scala → ...in/scala/parallelfor/internal/Macro.scala
diff --git a/...scala/parallelfor/internal/Parallel.scala → ...scala/parallelfor/internal/Parallel.scala b/...scala/parallelfor/internal/Parallel.scala → ...scala/parallelfor/internal/Parallel.scala
diff --git a/...la/parallelfor/internal/PrettyPrint.scala → ...la/parallelfor/internal/PrettyPrint.scala b/...la/parallelfor/internal/PrettyPrint.scala → ...la/parallelfor/internal/PrettyPrint.scala
diff --git a/...ala/parallelfor/internal/Sequential.scala → ...ala/parallelfor/internal/Sequential.scala b/...ala/parallelfor/internal/Sequential.scala → ...ala/parallelfor/internal/Sequential.scala
diff --git a/.../src/main/scala/parallelfor/package.scala → .../src/main/scala/parallelfor/package.scala b/.../src/main/scala/parallelfor/package.scala → .../src/main/scala/parallelfor/package.scala
diff --git a/...test/scala/parallelfor/FreeParallel.scala → ...test/scala/parallelfor/FreeParallel.scala b/...test/scala/parallelfor/FreeParallel.scala → ...test/scala/parallelfor/FreeParallel.scala
diff --git a/...src/test/scala/parallelfor/ParTrace.scala → ...src/test/scala/parallelfor/ParTrace.scala b/...src/test/scala/parallelfor/ParTrace.scala → ...src/test/scala/parallelfor/ParTrace.scala
diff --git a/...test/scala/parallelfor/ParallelSpec.scala → ...test/scala/parallelfor/ParallelSpec.scala b/...test/scala/parallelfor/ParallelSpec.scala → ...test/scala/parallelfor/ParallelSpec.scala
diff --git a/...la/parallelfor/ParallelizationDebug.scala → ...la/parallelfor/ParallelizationDebug.scala b/...la/parallelfor/ParallelizationDebug.scala → ...la/parallelfor/ParallelizationDebug.scala
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,10 @@
-addSbtPlugin("org.scalameta"      % "sbt-scalafmt"             % "2.4.3")
-addSbtPlugin("org.xerial.sbt"     % "sbt-sonatype"             % "3.9.10")
-addSbtPlugin("com.github.sbt"     % "sbt-pgp"                  % "2.1.2")
-addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"             % "0.9.32")
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "1.7.1")
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
-addSbtPlugin("com.timushev.sbt"   % "sbt-updates"              % "0.6.0")
-addSbtPlugin("com.github.sbt"     % "sbt-ci-release"           % "1.5.9")
+addSbtPlugin("org.scalameta"      % "sbt-scalafmt"                  % "2.4.3")
+addSbtPlugin("org.xerial.sbt"     % "sbt-sonatype"                  % "3.9.10")
+addSbtPlugin("com.github.sbt"     % "sbt-pgp"                       % "2.1.2")
+addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"                  % "0.9.32")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.8.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.1.0")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.3")
+addSbtPlugin("com.timushev.sbt"   % "sbt-updates"                   % "0.6.0")
+addSbtPlugin("com.github.sbt"     % "sbt-ci-release"                % "1.5.9")
diff --git a/...arallelfor/interop/zioquery/package.scala → ...arallelfor/interop/zioquery/package.scala b/...arallelfor/interop/zioquery/package.scala → ...arallelfor/interop/zioquery/package.scala
diff --git a/...t/scala/parallelfor/ParallelZioSpec.scala → ...t/scala/parallelfor/ParallelZioSpec.scala b/...t/scala/parallelfor/ParallelZioSpec.scala → ...t/scala/parallelfor/ParallelZioSpec.scala
diff --git a/...ala/parallelfor/interop/zio/package.scala → ...ala/parallelfor/interop/zio/package.scala b/...ala/parallelfor/interop/zio/package.scala → ...ala/parallelfor/interop/zio/package.scala
diff --git a/...t/scala/parallelfor/ParallelZioSpec.scala → ...t/scala/parallelfor/ParallelZioSpec.scala b/...t/scala/parallelfor/ParallelZioSpec.scala → ...t/scala/parallelfor/ParallelZioSpec.scala
diff --git a/...la/parallelfor/interop/zio1/package.scala → ...la/parallelfor/interop/zio1/package.scala b/...la/parallelfor/interop/zio1/package.scala → ...la/parallelfor/interop/zio1/package.scala
diff --git a/...t/scala/parallelfor/ParallelZioSpec.scala → ...t/scala/parallelfor/ParallelZioSpec.scala b/...t/scala/parallelfor/ParallelZioSpec.scala → ...t/scala/parallelfor/ParallelZioSpec.scala