Skip to content

Commit 727e864

Browse files
committed
Updated to gradle 9.
Updated errorprone Updated build for java 25
1 parent fe1fc6c commit 727e864

10 files changed

Lines changed: 127 additions & 119 deletions

File tree

build.gradle

Lines changed: 95 additions & 95 deletions
Large diffs are not rendered by default.

ci/check_java.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ source ci/common.sh
1111

1212

1313

14-
export JAVA_HOME=`openjdk_21`
14+
export JAVA_HOME=`openjdk_25`
1515
export PATH=$JAVA_HOME/bin:$PATH
1616

1717
# Checkstyle

ci/pub.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ source ci/common.sh
1111

1212

1313

14-
export JAVA_HOME=`openjdk_21`
14+
export JAVA_HOME=`openjdk_25`
1515
export PATH=$JAVA_HOME/bin:$PATH
1616

1717
./gradlew clean build -x test

ci/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ export BC_JDK8=`openjdk_8`
1313
export BC_JDK11=`openjdk_11`
1414
export BC_JDK17=`openjdk_17`
1515
export BC_JDK21=`openjdk_21`
16+
export BC_JDK25=`openjdk_25`
1617

17-
18-
export JAVA_HOME=`openjdk_21`
18+
export JAVA_HOME=`openjdk_25`
1919
export PATH=$JAVA_HOME/bin:$PATH
2020

2121
./gradlew -stacktrace clean build

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ version=1.83-SNAPSHOT
33
maxVersion=1.84
44
org.gradle.java.installations.auto-detect=false
55
org.gradle.java.installations.auto-download=false
6-
org.gradle.java.installations.fromEnv=BC_JDK8,BC_JDK11,BC_JDK17
6+
org.gradle.java.installations.fromEnv=BC_JDK8,BC_JDK11,BC_JDK17,BC_JDK25

gradle/wrapper/gradle-wrapper.jar

1.95 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tls/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,10 @@ if (System.getenv("BC_JDK21") != null) {
335335
test.dependsOn("test21")
336336
}
337337

338+
if (System.getenv("BC_JDK25") != null) {
339+
System.out.println("${project.name}: Adding test25 as dependency for test task because BC_JDK25 is defined")
340+
test.dependsOn("test25")
341+
}
338342

339343

340344
compileJava9Java.dependsOn([":prov:jar", ":util:jar",":pkix:jar"])

0 commit comments

Comments
 (0)