Merge branch 'main' into update/sbt-1.11.6

Author: ckipp01

.github/workflows/ci.yml

@@ -19,14 +19,14 @@ jobs:
 
     steps:
       - name: checkout the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - uses: sbt/setup-sbt@v1
 
       - name: Set up JVM
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -39,12 +39,12 @@ jobs:
 
     steps:
       - name: checkout the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Set up JVM
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '11'

.github/workflows/release.yml

@@ -8,10 +8,10 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '11'

src/sbt-test/scoverage/aggregate-disabled-module/project/build.properties

@@ -5,6 +5,7 @@
 
 lazy val commonSettings = Seq(
   organization := "org.scoverage",
+  allowUnsafeScalaLibUpgrade := true,
   version := "0.1.0",
   scalaVersion := "2.13.13"
 )

src/sbt-test/scoverage/aggregate/build.sbt

@@ -2,6 +2,8 @@ version := "0.1"
 
 scalaVersion := "2.13.13"
 
+allowUnsafeScalaLibUpgrade := true
+
 libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test
 
 coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*"

src/sbt-test/scoverage/aggregate/project/build.properties

@@ -2,6 +2,8 @@ version := "0.1"
 
 scalaVersion := "2.13.13"
 
+allowUnsafeScalaLibUpgrade := true
+
 libraryDependencies += "org.specs2" %% "specs2-core" % "4.12.10" % "test"
 
 coverageDataDir := target.value / "custom-test"