Skip to content

Commit afa8b4f

Browse files
Update dependency java-jdk to v25 (#1019)
* Update dependency java-jdk to v25 * 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 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Amp <amp@ampcode.com>
1 parent 752b52e commit afa8b4f

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/setup-java@v6
1515
with:
1616
distribution: temurin
17-
java-version: 17.0.21+9
17+
java-version: 25.0.5+8.0.LTS
1818

1919
- uses: gradle/actions/setup-gradle@v6
2020
with:
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/setup-java@v6
3232
with:
3333
distribution: temurin
34-
java-version: 17.0.21+9
34+
java-version: 25.0.5+8.0.LTS
3535

3636
- uses: gradle/actions/setup-gradle@v6
3737
with:

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ These are the main components of the project.
6262
| `gradle spotlessApply` | terminal | Format Java and Kotlin sources with Spotless. |
6363
| `gradle spotlessCheck` | terminal | Check Java and Kotlin formatting. Enforced by GitHub Actions. |
6464

65+
Spotless needs JDK 21 or newer for google-java-format; from the default JDK 17
66+
shell, run it as `nix develop .#jdk25 --command gradle spotlessApply`.
67+
6568
## Import the project into IntelliJ
6669

6770
It's recommended to use IntelliJ when editing code in this codebase.

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spotless {
1414
java {
1515
target("scip-*/src/**/*.java")
1616
targetExclude("scip-java/src/test/resources/fixtures/**")
17-
googleJavaFormat("1.28.0")
17+
googleJavaFormat("1.36.1")
1818
}
1919

2020
kotlin {

0 commit comments

Comments
 (0)