This is an automated email from the ASF dual-hosted git repository. emilles pushed a commit to branch Gradle_8_14_rc1 in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a33b5434acf630c51c8ba610f5d3b6fe0542fbc7 Author: Eric Milles <[email protected]> AuthorDate: Tue Apr 15 09:04:20 2025 -0500 Gradle 8.14 RC1 - supports Java 24 --- .github/workflows/groovy-build-test.yml | 26 +------------------------- gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- gradlew.bat | 4 ++-- 5 files changed, 6 insertions(+), 30 deletions(-) diff --git a/.github/workflows/groovy-build-test.yml b/.github/workflows/groovy-build-test.yml index dd4693657e..b560808071 100644 --- a/.github/workflows/groovy-build-test.yml +++ b/.github/workflows/groovy-build-test.yml @@ -55,7 +55,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - java: [12, 13, 14, 15, 16, 18, 19, 20, 22, 23] + java: [12, 13, 14, 15, 16, 18, 19, 20, 22, 23, 24] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -69,30 +69,6 @@ jobs: run: ./gradlew test timeout-minutes: 60 - # merge with 'additional' once gradle supports jdk24 for running gradle - additional24: - #if: github.event_name == 'push' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: | - 24 - 21 - check-latest: true - - uses: gradle/actions/setup-gradle@v4 - - name: Test with Gradle - run: ./gradlew test -Ptarget.java.home=$JAVA_HOME_24_X64 --no-build-cache --no-daemon - timeout-minutes: 60 - - name: Upload reports - uses: actions/upload-artifact@v4 - if: always() - with: - name: build-reports-24 - path: '**/build/reports/' - ea: #if: github.event_name == 'push' strategy: diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c74..1b33c55baa 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1c8..bb3521c606 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-rc-1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf93008b7..23d15a9367 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21834..db3a6ac207 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell
