Merge branch 'main' into update/sbt-1.10.1

typelevel · Jul 26, 2024 · 76c44b7 · 76c44b7
2 parents 8f5274a + 67c49ab
commit 76c44b7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,6 +39,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
+      - name: Install sbt
+        if: contains(runner.os, 'macos')
+        run: brew install sbt
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -108,6 +112,10 @@ jobs:
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install sbt
+        if: contains(runner.os, 'macos')
+        run: brew install sbt
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -286,6 +294,10 @@ jobs:
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install sbt
+        if: contains(runner.os, 'macos')
+        run: brew install sbt
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.2"
+version = "3.8.3"
 
 runner.dialect = scala213
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,5 +3,5 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.0")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.1")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.1")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.2")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.2")