Update zio to 2.1.1 (#486)

zio · May 14, 2024 · cd8b383 · cd8b383
1 parent 898d184
commit cd8b383
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 59 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,14 +75,18 @@ jobs:
       matrix:
         java:
         - '11'
+        - '17'
         - '21'
         scala-project:
-        - ++2.12 zioQueryJVM
-        - ++2.13 zioQueryJVM
-        - ++3.3 zioQueryJVM
-        - ++2.13 zioQueryJS
-        - ++3.3 zioQueryJS
+        - ++2.12.19 zioQueryJVM
+        - ++2.13.13 zioQueryJVM
+        - ++3.3.3 zioQueryJVM
+        - ++2.12.19 zioQueryJS
+        - ++2.13.13 zioQueryJS
+        - ++3.3.3 zioQueryJS
     steps:
+    - name: Install libuv
+      run: sudo apt-get update && sudo apt-get install -y libuv1-dev
     - name: Setup Scala
       uses: actions/setup-java@v4
       with:

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,6 @@ import com.typesafe.tools.mima.core.*
 import explicitdeps.ExplicitDepsPlugin.autoImport.moduleFilterRemoveValue
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 import zio.sbt.githubactions.*
-import _root_.io.circe.syntax.*
 
 enablePlugins(ZioSbtEcosystemPlugin, ZioSbtCiPlugin)
 
@@ -11,7 +10,7 @@ crossScalaVersions := Seq.empty
 inThisBuild(
   List(
     name       := "ZIO Query",
-    zioVersion := "2.1.0",
+    zioVersion := "2.1.1",
     developers := List(
       Developer(
         "kyri-petrou",
@@ -128,55 +127,3 @@ ThisBuild / ciCheckArtifactsBuildSteps +=
     "Check binary compatibility",
     run = Some("sbt \"+zioQueryJVM/mimaReportBinaryIssues; +zioQueryJS/mimaReportBinaryIssues\"")
   )
-
-// Temporary, until zio-test issue with ScalaJS 2.12 is resolved
-ThisBuild / ciTestJobs := Seq(
-  Job(
-    id = "test",
-    name = "Test",
-    runsOn = "ubuntu-latest",
-    timeoutMinutes = 15,
-    continueOnError = false,
-    strategy = Some(
-      Strategy(
-        matrix = Map(
-          "java" -> List("11", "21"),
-          "scala-project" -> List(
-            "++2.12 zioQueryJVM",
-            "++2.13 zioQueryJVM",
-            "++3.3 zioQueryJVM",
-            "++2.13 zioQueryJS",
-            "++3.3 zioQueryJS"
-          )
-        ),
-        failFast = false
-      )
-    ),
-    steps = List(
-      Step.SingleStep(
-        name = "Setup Scala",
-        uses = Some(ActionRef("actions/setup-java@v4")),
-        parameters = Map(
-          "distribution" -> "corretto".asJson,
-          "java-version" -> "${{ matrix.java }}".asJson,
-          "check-latest" -> true.asJson
-        )
-      ),
-      Step.SingleStep(
-        name = "Cache Dependencies",
-        uses = Some(ActionRef("coursier/cache-action@v6"))
-      ),
-      Step.SingleStep(
-        name = "Git Checkout",
-        uses = Some(ActionRef("actions/checkout@v4")),
-        parameters = Map(
-          "fetch-depth" -> "0".asJson
-        )
-      ),
-      Step.SingleStep(
-        name = "Test",
-        run = Some("sbt ${{ matrix.scala-project }}/test")
-      )
-    )
-  )
-)