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

Update sbt-typelevel, ... to 0.7.4
typelevel · Oct 11, 2024 · e3769a7 · e3769a7
2 parents bbee1f7 + f455ee3
commit e3769a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 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
@@ -108,8 +107,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
@@ -253,8 +251,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/project/plugins.sbt b/project/plugins.sbt
@@ -3,8 +3,8 @@ ThisBuild / libraryDependencySchemes ++= Seq(
   "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
 )
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.3")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.3")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.4")
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
 addSbtPlugin("com.github.sbt" % "sbt-site" % "1.7.0")
 addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0")