diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e27eb1ca3..2c347cda7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,9 +126,7 @@ jobs: timeout-minutes: 60 steps: - name: Install sbt - if: contains(runner.os, 'macos') - shell: bash - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Ignore line ending differences in git if: contains(runner.os, 'windows') @@ -199,7 +197,7 @@ jobs: - name: Setup Java (graalvm@17) id: setup-java-graalvm-17 if: matrix.java == 'graalvm@17' - uses: graalvm/setup-graalvm@v1 + uses: actions/setup-java@v4 with: distribution: graalvm java-version: 17 @@ -315,8 +313,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: Ignore line ending differences in git if: contains(runner.os, 'windows') @@ -382,7 +379,7 @@ jobs: - name: Setup Java (graalvm@17) id: setup-java-graalvm-17 if: matrix.java == 'graalvm@17' - uses: graalvm/setup-graalvm@v1 + uses: actions/setup-java@v4 with: distribution: graalvm java-version: 17 @@ -544,8 +541,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: Ignore line ending differences in git if: contains(runner.os, 'windows') @@ -611,7 +607,7 @@ jobs: - name: Setup Java (graalvm@17) id: setup-java-graalvm-17 if: matrix.java == 'graalvm@17' - uses: graalvm/setup-graalvm@v1 + uses: actions/setup-java@v4 with: distribution: graalvm java-version: 17 diff --git a/project/plugins.sbt b/project/plugins.sbt index b71a01054f..2b6b2e9c8d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1" -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.3") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")