Skip to content

Add Java 24 into test matrix #2473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add Java 24 into test matrix #2473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24b41f7
Add Java 24 into test matrix
Goooler Apr 27, 2025
e1b0d61
Update Spotbugs to 4.9.3 for Java 24 support
Goooler Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
matrix:
kind: [maven, gradle]
# Test on the latest Java version once Gradle & Maven support it.
jre: [11, 17, 21, 23]
jre: [11, 17, 21, 24]
os: [ubuntu-latest]
include:
# test windows at the diagonals of the above matrix
Expand Down
2 changes: 2 additions & 0 deletions gradle/java-setup.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ spotbugs {
// https://spotbugs.readthedocs.io/en/latest/detectors.html#findreturnref
'FindReturnRef',
]
// TODO: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/1360
toolVersion = '4.9.3'
}
tasks.named('spotbugsTest') {
enabled = false
Expand Down
2 changes: 2 additions & 0 deletions lib-extra/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,6 @@ p2deps {
spotbugs {
// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
// TODO: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/1360
toolVersion = '4.9.3'
}
2 changes: 2 additions & 0 deletions lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ dependencies {
spotbugs {
// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
// TODO: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/1360
toolVersion = '4.9.3'
}

apply from: rootProject.file('gradle/special-tests.gradle')
Expand Down
7 changes: 5 additions & 2 deletions plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2024 DiffPlug
* Copyright 2016-2025 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -54,8 +54,11 @@ public enum GradleVersionSupport {
GradleVersionSupport(String version) {
String minVersionForRunningJRE;
switch (Jvm.version()) {
case 24:
case 25:
// TODO: https://docs.gradle.org/current/userguide/compatibility.html
case 24:
minVersionForRunningJRE = "8.14";
break;
case 23:
minVersionForRunningJRE = "8.10";
break;
Expand Down
2 changes: 2 additions & 0 deletions testlib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ dependencies {
spotbugs {
// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
reportLevel = com.github.spotbugs.snom.Confidence.valueOf('HIGH')
// TODO: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/1360
toolVersion = '4.9.3'
}

apply from: rootProject.file('gradle/special-tests.gradle')
Expand Down
Loading