Update Gradle wrapper to 8.8 - supports Java 22 (#13453)

This commit updates the Gradle wrapper to 8.8, which has support for Java 22.
This commit is contained in:
Chris Hegarty 2024-06-06 08:46:18 +01:00 committed by GitHub
parent fe50e86e36
commit 9a4caa935a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions

View File

@ -50,7 +50,7 @@ if (jvmGradle != jvmCurrent) {
doFirst { doFirst {
def jvmInfo = { JavaInfo javaInfo -> def jvmInfo = { JavaInfo javaInfo ->
JvmInstallationMetadata jvmMetadata = jvmDetector.getMetadata(new InstallationLocation(javaInfo.javaHome, "specific path")) JvmInstallationMetadata jvmMetadata = jvmDetector.getMetadata(InstallationLocation.userDefined(javaInfo.javaHome, "specific path"))
return "${jvmMetadata.languageVersion} (${jvmMetadata.displayName} ${jvmMetadata.runtimeVersion}, home at: ${jvmMetadata.javaHome})" return "${jvmMetadata.languageVersion} (${jvmMetadata.displayName} ${jvmMetadata.runtimeVersion}, home at: ${jvmMetadata.javaHome})"
} }
@ -88,6 +88,6 @@ if (jvmGradle != jvmCurrent) {
// Set up root project's properties. // Set up root project's properties.
rootProject.ext.runtimeJavaExecutable = jvmCurrent.javaExecutable rootProject.ext.runtimeJavaExecutable = jvmCurrent.javaExecutable
rootProject.ext.runtimeJavaHome = jvmCurrent.javaHome rootProject.ext.runtimeJavaHome = jvmCurrent.javaHome
rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(new InstallationLocation(jvmCurrent.javaHome, "specific path")).getLanguageVersion() rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(InstallationLocation.userDefined(jvmCurrent.javaHome, "specific path")).getLanguageVersion()
rootProject.ext.usesAltJvm = (jvmGradle != jvmCurrent); rootProject.ext.usesAltJvm = (jvmGradle != jvmCurrent);

View File

@ -22,7 +22,7 @@ import org.gradle.util.GradleVersion
configure(rootProject) { configure(rootProject) {
ext { ext {
expectedGradleVersion = '8.4' expectedGradleVersion = '8.8'
hasJavaFlightRecorder = ModuleLayer.boot().findModule('jdk.jfr').map(this.class.module::canRead).orElse(false) hasJavaFlightRecorder = ModuleLayer.boot().findModule('jdk.jfr').map(this.class.module::canRead).orElse(false)
} }

View File

@ -1 +1 @@
0336f591bc0ec9aa0c9988929b93ecc916b3c1d52aed202c7381db144aa0ef15 cb0da6751c2b753a16ac168bb354870ebb1e162e9083f116729cec9c781156b8

View File

@ -1 +1 @@
8.4.0 8.8.0

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME