Skip to content

Add java25 checks #1244

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
loosebazooka wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add java25 checks #1244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
# sigstore-java still supports Java 11, however, we test it with conformance-tests only
java-version: [17, 21]
java-version: [17, 21, 25]
fail-fast: false

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tasks.configureEach<JavaExec> {

spotless {
java {
googleJavaFormat("1.24.0")
googleJavaFormat("1.35.0")
licenseHeaderFile("$rootDir/config/licenseHeader")
// Note if submodule needs to add more exclusions, it should list ALL of them since
// Spotless does not have "addTargetExclude" method
Expand Down
3 changes: 3 additions & 0 deletions build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ tasks.withType<Test>().configureEach {
if (project.hasProperty("skipStaging")) {
systemProperty("sigstore-java.test.skipStaging", project.findProperty("skipStaging")!!)
}
if (buildParameters.testJdkVersion >= 23) {
jvmArgs("--sun-misc-unsafe-memory-access=deny")
}
}
3 changes: 2 additions & 1 deletion fuzzing/oss_fuzz_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
# TODO: this should be a gradle plugin

# build the fuzzing classes and extract dependencies into $OUT
./gradlew :fuzzing:copyToFuzzOut -x test -PfuzzOut="$OUT"
# Exclude spotlessCheck because GJF 1.35.0+ requires JDK 21+ to run, which would crash the build in CIFuzz (currently running on JDK 17).
./gradlew :fuzzing:copyToFuzzOut -x test -x spotlessCheck -PfuzzOut="$OUT"
ALL_JARS=""
for jarfile in $(find $OUT -name *.jar)
do
Expand Down
4 changes: 2 additions & 2 deletions sigstore-java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ spotless {
)
}
format("conscrypt", com.diffplug.gradle.spotless.JavaExtension::class.java) {
googleJavaFormat("1.24.0")
googleJavaFormat("1.35.0")
licenseHeaderFile("$rootDir/config/conscryptLicenseHeader")
target("src/*/java/dev/sigstore/encryption/certificates/transparency/*.java")
}
format("webPki", com.diffplug.gradle.spotless.JavaExtension::class.java) {
googleJavaFormat("1.24.0")
googleJavaFormat("1.35.0")
licenseHeaderFile("$rootDir/config/webPKILicenseHeader")
target("src/*/java/dev/sigstore/json/canonicalizer/*.java")
}
Expand Down
Loading