sbt
Showing with 22 additions and 0 deletions.

+8 −0 .github/workflows/ci.yml

+1 −0 .gitignore

+13 −0 build.sbt
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,6 +25,9 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         scala: [2.12.19]
         java: [temurin@8, temurin@11, temurin@17, temurin@21]
+        exclude:
+          - java: temurin@8
+            os: macos-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Ignore line ending differences in git
@@ -77,6 +80,11 @@ jobs:
           java-version: 21
           cache: sbt
 
+      - name: Install sbt
+        if: matrix.os == 'macos-latest'
+        shell: bash
+        run: brew install sbt
+
       - name: Check that workflows are up to date
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 boot/
 lib_managed/
 target/
+.bsp/
 
 # Eclipse
 .cache

diff --git a/build.sbt b/build.sbt
@@ -49,6 +49,19 @@ ThisBuild / githubWorkflowJavaVersions := Seq(
   JavaSpec.temurin("21")
 )
 
+ThisBuild / githubWorkflowBuildMatrixExclusions += MatrixExclude(Map("java" -> "temurin@8", "os" -> "macos-latest"))
+
+// GitHub Actions macOS 13+ runner images do not come with sbt preinstalled anymore
+ThisBuild / githubWorkflowBuildPreamble ++= Seq(
+  WorkflowStep.Run(
+    commands = List(
+      "brew install sbt"
+    ),
+    cond = Some("matrix.os == 'macos-latest'"),
+    name = Some("Install sbt")
+  )
+)
+
 name := "sbt-osgi"
 enablePlugins(SbtPlugin)
 libraryDependencies ++= Dependencies.sbtOsgi
-Original file line number
+Diff line change
@@ @@ -3,6 +3,7 @@ @@
     boot/
     lib_managed/
     target/
+    .bsp/
     # Eclipse
     .cache