Merge branch 'main' into update/sbt-1.10.7

etspaceman · Jan 10, 2025 · c088b4f · c088b4f
2 parents 16df948 + 6fc81be
commit c088b4f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,24 +24,23 @@ concurrency:
 
 jobs:
   build:
-    name: Build and Test
+    name: Test
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         scala: [2.13, 3, 2.12]
         java: [temurin@17]
     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:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@17)
         id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'
@@ -59,22 +58,22 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
         run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Check scalafix lints
-        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
         run: sbt '++ ${{ matrix.scala }}' 'scalafixAll --check'
 
       - name: Test
         run: sbt '++ ${{ matrix.scala }}' test
 
       - name: Check binary compatibility
-        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
         run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
-        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
         run: sbt '++ ${{ matrix.scala }}' doc
 
       - name: Make target directories
@@ -98,19 +97,18 @@ jobs:
     if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@17]
     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:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@17)
         id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'
@@ -183,19 +181,18 @@ jobs:
     if: github.event.repository.fork == false && github.event_name != 'pull_request'
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@17]
     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:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@17)
         id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'
@@ -219,19 +216,18 @@ jobs:
     name: Generate Site
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@17]
     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:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@17)
         id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'

diff --git a/.mergify.yml b/.mergify.yml
@@ -10,9 +10,9 @@ pull_request_rules:
   conditions:
   - author=etspaceman-scala-steward-app[bot]
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@17)
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@17)
+  - status-success=Test (ubuntu-22.04, 2.13, temurin@17)
+  - status-success=Test (ubuntu-22.04, 3, temurin@17)
+  - status-success=Test (ubuntu-22.04, 2.12, temurin@17)
   actions:
     merge:
       method: squash

diff --git a/project/LibraryDependencies.scala b/project/LibraryDependencies.scala
@@ -5,7 +5,7 @@ object LibraryDependencies {
   val TypesafeConfig = "com.typesafe" % "config" % "1.4.3"
   val ApacheCommons = "org.apache.commons" % "commons-lang3" % "3.17.0"
   val KindProjector = "org.typelevel" % "kind-projector" % "0.13.3"
-  val PureConfig = "com.github.pureconfig" %% "pureconfig-core" % "0.17.7"
+  val PureConfig = "com.github.pureconfig" %% "pureconfig-core" % "0.17.8"
   val ScalaParsingCombinators =
     "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0"
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.3")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.3")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.3")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mima" % "0.7.3")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.5")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.5")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.5")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mima" % "0.7.5")