Merge branch 'master' into update/scala3-library-3.3.4

laserdisc-io · Oct 19, 2024 · e3653a2 · e3653a2
2 parents 8a799ba + 1a5f0d1
commit e3653a2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,8 +35,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
@@ -117,8 +116,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
@@ -245,8 +243,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4

diff --git a/build.sbt b/build.sbt
@@ -11,7 +11,7 @@ val V = new {
   val scalaCheck = "1.18.1"
   val scalaTest  = "3.2.19"
   val scribe     = "3.15.0"
-  val zio        = "2.1.9"
+  val zio        = "2.1.11"
 }
 
 val D = new {

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.16.0")
-addSbtPlugin("org.typelevel"      % "sbt-typelevel"                 % "0.7.3")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.17.0")
+addSbtPlugin("org.typelevel"      % "sbt-typelevel"                 % "0.7.4")