Merge branch '1.10.x' into update/scala-compiler-2.12.20

.github/workflows/ci.yml

@@ -5,6 +5,7 @@ on:
 
 jobs:
   test:
+    timeout-minutes: 25
     strategy:
       fail-fast: false
       matrix:
@@ -73,7 +74,7 @@ jobs:
       run: |
         sbt -v -Dfile.encoding=UTF-8 "-Dbenchmark.pattern=.*AnalysisFormatBenchmark.*" "runBenchmarks"
     - name: Checkout Target Branch (4-6)
-      if: ${{ github.event_name == 'pull_request' && (matrix.jobtype >= 4 || matrix.jobtype <= 6) }}
+      if: ${{ github.event_name == 'pull_request' && (matrix.jobtype >= 4 && matrix.jobtype <= 6) }}
       uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.base.ref }}

.github/workflows/dependency-graph.yml

@@ -0,0 +1,16 @@
+# .github/workflows/dependency-graph.yml
+name: Submit Dependency Graph
+on:
+  push:
+    branches: [1.10.x] # default branch of the project
+permissions: {}
+jobs:
+  submit-graph:
+    permissions:
+      contents: write # to submit the dependency graph
+
+    name: Submit Dependency Graph
+    runs-on: ubuntu-latest # or windows-latest, or macOS-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: scalacenter/sbt-dependency-submission@v3

.scala-steward.conf

@@ -5,5 +5,6 @@ pullRequests.frequency = "14 days"
 updates.ignore = [
   # as per discussion on sbt/zinc#1236, this is
   # "if it ain't broke don't fix it" territory
-  { groupId = "com.google.protobuf" }
+  { groupId = "com.google.protobuf" },
+  { groupId = "org.eclipse.jgit" }
 ]

build.sbt

@@ -327,7 +327,7 @@ lazy val zincPersistCore = (project in internalPath / "zinc-persist-core")
     crossPaths := false,
     autoScalaLibrary := false,
     exportJars := true,
-    ProtobufConfig / version := "3.24.4",
+    ProtobufConfig / version := "3.25.5",
     publish / skip := true,
     assembly / assemblyShadeRules := Seq(
       ShadeRule
@@ -686,7 +686,6 @@ lazy val zincScripted = (projectMatrix in internalPath / "zinc-scripted")
   .enablePlugins(BuildInfoPlugin)
   .settings(
     baseSettings,
-    ideSkipProject := true, // otherwise IntelliJ complains
     publish / skip := true,
     name := "zinc Scripted",
     Compile / buildInfo := Nil, // Only generate build info for tests

project/plugins.sbt

@@ -1,9 +1,9 @@
 scalacOptions += "-feature"
 
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
-addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.3")
+addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.6.0")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
 addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.8.0")