Merge pull request #4665 from typelevel/update/sbt-typelevel-0.7.4

Update sbt-typelevel, sbt-typelevel-site to 0.7.4
typelevel · Oct 14, 2024 · eeb4bfa · eeb4bfa
2 parents 478e1a4 + 92dd62e
commit eeb4bfa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,8 +52,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
@@ -89,7 +88,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
@@ -151,8 +150,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
@@ -188,7 +186,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
@@ -322,8 +320,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
@@ -359,7 +356,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
@@ -409,8 +406,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
@@ -446,7 +442,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
@@ -476,8 +472,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
@@ -513,7 +508,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
@@ -1,4 +1,4 @@
-val sbtTypelevelVersion = "0.7.3"
+val sbtTypelevelVersion = "0.7.4"
 addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")