Skip to content

Commit 797036e

Browse files
committed
Add java25 checks
Signed-off-by: Appu <appu@google.com>
1 parent 2a56fe1 commit 797036e

5 files changed

Lines changed: 9 additions & 5 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
matrix:
2222
# sigstore-java still supports Java 11, however, we test it with conformance-tests only
23-
java-version: [17, 21]
23+
java-version: [17, 21, 25]
2424
fail-fast: false
2525

2626
concurrency:

build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ tasks.configureEach<JavaExec> {
2525

2626
spotless {
2727
java {
28-
googleJavaFormat("1.24.0")
28+
googleJavaFormat("1.35.0")
2929
licenseHeaderFile("$rootDir/config/licenseHeader")
3030
// Note if submodule needs to add more exclusions, it should list ALL of them since
3131
// Spotless does not have "addTargetExclude" method

build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@ tasks.withType<Test>().configureEach {
2222
if (project.hasProperty("skipStaging")) {
2323
systemProperty("sigstore-java.test.skipStaging", project.findProperty("skipStaging")!!)
2424
}
25+
if (buildParameters.testJdkVersion >= 23) {
26+
jvmArgs("--sun-misc-unsafe-memory-access=deny")
27+
}
2528
}

fuzzing/oss_fuzz_build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
# TODO: this should be a gradle plugin
44

55
# build the fuzzing classes and extract dependencies into $OUT
6-
./gradlew :fuzzing:copyToFuzzOut -x test -PfuzzOut="$OUT"
6+
# Exclude spotlessCheck because GJF 1.35.0+ requires JDK 21+ to run, which would crash the build in CIFuzz (currently running on JDK 17).
7+
./gradlew :fuzzing:copyToFuzzOut -x test -x spotlessCheck -PfuzzOut="$OUT"
78
ALL_JARS=""
89
for jarfile in $(find $OUT -name *.jar)
910
do

sigstore-java/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ spotless {
9191
)
9292
}
9393
format("conscrypt", com.diffplug.gradle.spotless.JavaExtension::class.java) {
94-
googleJavaFormat("1.24.0")
94+
googleJavaFormat("1.35.0")
9595
licenseHeaderFile("$rootDir/config/conscryptLicenseHeader")
9696
target("src/*/java/dev/sigstore/encryption/certificates/transparency/*.java")
9797
}
9898
format("webPki", com.diffplug.gradle.spotless.JavaExtension::class.java) {
99-
googleJavaFormat("1.24.0")
99+
googleJavaFormat("1.35.0")
100100
licenseHeaderFile("$rootDir/config/webPKILicenseHeader")
101101
target("src/*/java/dev/sigstore/json/canonicalizer/*.java")
102102
}

0 commit comments

Comments
 (0)