From ea58e27a45d0568c787a78dabe49c718e86e6d41 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 28 Oct 2026 11:05:11 +0000
Subject: [PATCH 1/2] Update dependency java-jdk to v25

---
 .github/workflows/ci.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 536988c8b..debf4dd63 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v6
         with:
           distribution: temurin
-          java-version: 17.0.21+9
+          java-version: 25.0.5+8.0.LTS
 
       - uses: gradle/actions/setup-gradle@v6
         with:
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/setup-java@v6
         with:
           distribution: temurin
-          java-version: 17.0.21+9
+          java-version: 25.0.5+8.0.LTS
 
       - uses: gradle/actions/setup-gradle@v6
         with:

From 9d34e8a4c5cef779120e12e72ab97d62d76f5891 Mon Sep 17 00:00:00 2001
From: Amp <amp@ampcode.com>
Date: Thu, 29 Oct 2026 11:09:43 +0000
Subject: [PATCH 2/2] Bump google-java-format to 1.36.1 for JDK 25

Spotless refuses google-java-format older than 1.30.0 on JDK 25, which
the Formatting job now uses. 1.36.1 is the newest version Spotless
8.10.4 supports; it requires JDK 21+, so document running Spotless from
the jdk25 dev shell. No source files need reformatting.

Amp-Thread-ID: https://ampcode.com/threads/T-01a1872f-16af-77cc-94a8-a8a3b26bfb1e
---
 CONTRIBUTING.md  | 3 +++
 build.gradle.kts | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 85c7f09c1..8eb4ccd54 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -62,6 +62,9 @@ These are the main components of the project.
 | `gradle spotlessApply`                                  | terminal | Format Java and Kotlin sources with Spotless.                            |
 | `gradle spotlessCheck`                                  | terminal | Check Java and Kotlin formatting. Enforced by GitHub Actions.            |
 
+Spotless needs JDK 21 or newer for google-java-format; from the default JDK 17
+shell, run it as `nix develop .#jdk25 --command gradle spotlessApply`.
+
 ## Import the project into IntelliJ
 
 It's recommended to use IntelliJ when editing code in this codebase.
diff --git a/build.gradle.kts b/build.gradle.kts
index 05bc3d8b4..01cc930fa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ spotless {
     java {
         target("scip-*/src/**/*.java")
         targetExclude("scip-java/src/test/resources/fixtures/**")
-        googleJavaFormat("1.28.0")
+        googleJavaFormat("1.36.1")
     }
 
     kotlin {