Do Scala.js properly

zio · Jun 30, 2023 · f2b8c44 · f2b8c44
1 parent 1360c48
commit f2b8c44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['adopt@1.8', 'adopt@1.11']
-        scala: ['2.12.17', '2.13.8', '3.2.2']
+        scala: ['2.12.17', '2.13.8', '3.2.1']
     steps:
     - uses: actions/checkout@v3.0.0
       with:

diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -1,6 +1,7 @@
 import sbt._
 import Keys._
 
+import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 import sbtcrossproject.CrossPlugin.autoImport.crossProjectPlatform
 import sbtbuildinfo._
 import BuildInfoKeys._
@@ -29,7 +30,7 @@ object BuildHelper {
   val Scala213: String = versions("2.13")
   val Scala3: String   = versions("3")
 
-  val zioVersion                   = "2.0.11"
+  val zioVersion                   = "2.0.10"
   val zioJsonVersion               = "0.5.0"
   val zioPreludeVersion            = "1.0.0-RC18"
   val zioOpticsVersion             = "0.2.1"
@@ -40,11 +41,6 @@ object BuildHelper {
   val zioConstraintlessVersion     = "0.3.2"
   val scalaCollectionCompatVersion = "2.10.0"
 
-  private val testDeps = Seq(
-    "dev.zio" %% "zio-test"     % zioVersion % "test",
-    "dev.zio" %% "zio-test-sbt" % zioVersion % "test"
-  )
-
   def macroDefinitionSettings = Seq(
     scalacOptions += "-language:experimental.macros",
     libraryDependencies ++= {
@@ -203,7 +199,10 @@ object BuildHelper {
       crossScalaVersions := Seq(Scala213, Scala212, Scala3),
       ThisBuild / scalaVersion := Scala213, //crossScalaVersions.value.head, //Scala3,
       scalacOptions := compilerOptions(scalaVersion.value, optimize = !isSnapshot.value),
-      libraryDependencies ++= compileOnlyDeps(scalaVersion.value) ++ testDeps,
+      libraryDependencies ++= compileOnlyDeps(scalaVersion.value) ++ Seq(
+        "dev.zio" %%% "zio-test"     % zioVersion % Test,
+        "dev.zio" %%% "zio-test-sbt" % zioVersion % Test
+      ),
       ThisBuild / semanticdbEnabled := scalaVersion.value != Scala3, // enable SemanticDB,
       ThisBuild / semanticdbOptions += "-P:semanticdb:synthetics:on",
       ThisBuild / semanticdbVersion := scalafixSemanticdb.revision,