Skip to content

Commit b898731

Browse files
araptearapte
committed
8336632: Update Gradle to 8.9
8336633: Update boot JDK to 22.0.2 Reviewed-by: kcr, sykora
1 parent 67ac9d7 commit b898731

File tree

7 files changed

+35
-30
lines changed

7 files changed

+35
-30
lines changed

‎.github/workflows/submit.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ jobs:
7373
# BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
7474
# BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
7575
# BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
76-
BOOT_JDK_VERSION: "21.0.2"
77-
BOOT_JDK_FILENAME: "jdk-21.0.2_linux-x64_bin.tar.gz"
78-
BOOT_JDK_URL: "https://download.oracle.com/java/21/archive/jdk-21.0.2_linux-x64_bin.tar.gz"
76+
BOOT_JDK_VERSION: "22.0.2"
77+
BOOT_JDK_FILENAME: "jdk-22.0.2_linux-x64_bin.tar.gz"
78+
BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_linux-x64_bin.tar.gz"
7979
ANT_DIR: "apache-ant-1.10.5"
8080
ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
8181
ANT_URL: "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz"
@@ -155,9 +155,9 @@ jobs:
155155
# BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
156156
# BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
157157
# BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
158-
BOOT_JDK_VERSION: "21.0.2"
159-
BOOT_JDK_FILENAME: "jdk-21.0.2_macos-x64_bin.tar.gz"
160-
BOOT_JDK_URL: "https://download.oracle.com/java/21/archive/jdk-21.0.2_macos-x64_bin.tar.gz"
158+
BOOT_JDK_VERSION: "22.0.2"
159+
BOOT_JDK_FILENAME: "jdk-22.0.2_macos-x64_bin.tar.gz"
160+
BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_macos-x64_bin.tar.gz"
161161
# Disabled due to timeout downloading ant; use ant installed on system
162162
#ANT_DIR: "apache-ant-1.10.5"
163163
#ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
@@ -241,9 +241,9 @@ jobs:
241241
# BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
242242
# BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
243243
# BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
244-
BOOT_JDK_VERSION: "21.0.2"
245-
BOOT_JDK_FILENAME: "jdk-21.0.2_macos-aarch64_bin.tar.gz"
246-
BOOT_JDK_URL: "https://download.oracle.com/java/21/archive/jdk-21.0.2_macos-aarch64_bin.tar.gz"
244+
BOOT_JDK_VERSION: "22.0.2"
245+
BOOT_JDK_FILENAME: "jdk-22.0.2_macos-aarch64_bin.tar.gz"
246+
BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_macos-aarch64_bin.tar.gz"
247247
# Disabled due to timeout downloading ant; use ant installed on system
248248
#ANT_DIR: "apache-ant-1.10.5"
249249
#ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
@@ -327,9 +327,9 @@ jobs:
327327
# BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
328328
# BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
329329
# BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
330-
BOOT_JDK_VERSION: "21.0.2"
331-
BOOT_JDK_FILENAME: "jdk-21.0.2_windows-x64_bin.zip"
332-
BOOT_JDK_URL: "https://download.oracle.com/java/21/archive/jdk-21.0.2_windows-x64_bin.zip"
330+
BOOT_JDK_VERSION: "22.0.2"
331+
BOOT_JDK_FILENAME: "jdk-22.0.2_windows-x64_bin.zip"
332+
BOOT_JDK_URL: "https://download.oracle.com/java/22/archive/jdk-22.0.2_windows-x64_bin.zip"
333333
ANT_DIR: "apache-ant-1.10.5"
334334
ANT_FILENAME: "apache-ant-1.10.5.tar.gz"
335335
ANT_URL: "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz"

‎build.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ javadoc.header=JavaFX 24
7777
##############################################################################
7878

7979
# JDK
80-
jfx.build.jdk.version=21.0.2
81-
jfx.build.jdk.buildnum=13
80+
jfx.build.jdk.version=22.0.2
81+
jfx.build.jdk.buildnum=9
8282
jfx.build.jdk.version.min=21
8383
jfx.build.jdk.buildnum.min=35
8484
jfx.jdk.target.version=21
@@ -88,7 +88,7 @@ jfx.jdk.target.version=21
8888
# gradle/wrapper/gradle-wrapper.properties and should also be recorded in
8989
# The jfx.gradle.version.min property defines the minimum version of gradle
9090
# that is supported. It must be <= jfx.gradle.version.
91-
jfx.gradle.version=8.5
91+
jfx.gradle.version=8.9
9292
jfx.gradle.version.min=8.5
9393

9494
# Toolchains

‎gradle/UPDATING.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ NOTE: only update the minimum when necessary (e.g., when replacing deprecated AP
1010
* Update the version number in the URL in gradle/wrapper/gradle-wrapper.properties
1111
* Run: bash gradlew wrapper --gradle-version VERSION
1212
* Verify the changes (fix line endings in gradlew.bat if needed)
13-
* Add "distributionSha256Sum" back into gradle/wrapper/gradle-wrapper.properties (get the checksum from gradle.org)
13+
* Add "distributionSha256Sum" back into gradle/wrapper/gradle-wrapper.properties (get the checksum from https://gradle.org/release-checksums)

‎gradle/wrapper/gradle-wrapper.jar

42 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+2-2
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-8.5-bin.zip
4-
distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
3+
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎gradlew

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

‎gradlew.bat

+12-10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

0 commit comments

Comments
 (0)