Skip to content

Commit 9d4fd1b

Browse files
committed
JDK: Update install_jdk script such that we use Corretto JDK 24
This is primarily to ease up development envs and bring consistency / use the latest release etc.
1 parent 8c2f391 commit 9d4fd1b

File tree

4 files changed

+9
-30
lines changed

4 files changed

+9
-30
lines changed

BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins {
2323

2424
java {
2525
toolchain {
26-
languageVersion = JavaLanguageVersion.of(22)
26+
languageVersion = JavaLanguageVersion.of(24)
2727
}
2828
}
2929

Samples/SwiftAndJavaJarSampleLib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ repositories {
3838

3939
java {
4040
toolchain {
41-
languageVersion.set(JavaLanguageVersion.of(22))
41+
languageVersion.set(JavaLanguageVersion.of(24))
4242
}
4343
}
4444

SwiftKit/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repositories {
2525

2626
java {
2727
toolchain {
28-
languageVersion.set(JavaLanguageVersion.of(22))
28+
languageVersion.set(JavaLanguageVersion.of(24))
2929
}
3030
}
3131

docker/install_jdk.sh

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
##===----------------------------------------------------------------------===##
1515
set -euo pipefail
1616

17-
# Supported JDKs: Corretto or OpenJDK
17+
# Supported JDKs: Corretto
1818
if [ "$JDK_VENDOR" = "" ]; then
1919
declare -r JDK_VENDOR="Corretto"
2020
fi
@@ -24,34 +24,13 @@ apt-get update && apt-get install -y wget
2424

2525
echo "Download JDK for: $(uname -m)"
2626

27-
if [ "$JDK_VENDOR" = 'OpenJDK' ]; then
27+
if [ "$JDK_VENDOR" = 'Corretto' ]; then
2828
if [ "$(uname -m)" = 'aarch64' ]; then
29-
declare -r JDK_URL="https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-aarch64_bin.tar.gz"
30-
declare -r EXPECT_JDK_SHA="076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7"
29+
declare -r JDK_URL="https://corretto.aws/downloads/latest/amazon-corretto-24-aarch64-linux-jdk.tar.gz"
30+
declare -r EXPECT_JDK_MD5="3b543f4e971350b73d0ab6d8174cc030"
3131
else
32-
declare -r JDK_URL="https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/$JDK_NAME"
33-
declare -r EXPECT_JDK_SHA="08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67"
34-
fi
35-
36-
wget -q -O jdk.tar.gz "$JDK_URL"
37-
38-
declare JDK_SHA # on separate lines due to: SC2155 (warning): Declare and assign separately to avoid masking return values.
39-
JDK_SHA="$(sha256sum jdk.tar.gz | cut -d ' ' -f 1)"
40-
if [ "$JDK_SHA" != "$EXPECT_JDK_SHA" ]; then
41-
echo "Downloaded JDK SHA does not match expected!"
42-
echo "Expected: $EXPECT_JDK_SHA"
43-
echo " Was: $JDK_SHA"
44-
exit 1;
45-
else
46-
echo "JDK SHA is correct.";
47-
fi
48-
elif [ "$JDK_VENDOR" = 'Corretto' ]; then
49-
if [ "$(uname -m)" = 'aarch64' ]; then
50-
declare -r JDK_URL="https://corretto.aws/downloads/latest/amazon-corretto-22-aarch64-linux-jdk.tar.gz"
51-
declare -r EXPECT_JDK_MD5="1ebe5f5229bb18bc784a1e0f54d3fe39"
52-
else
53-
declare -r JDK_URL="https://corretto.aws/downloads/latest/amazon-corretto-22-x64-linux-jdk.tar.gz"
54-
declare -r EXPECT_JDK_MD5="5bd7fe30eb063699a3b4db7a00455841"
32+
declare -r JDK_URL="https://corretto.aws/downloads/latest/amazon-corretto-24-x64-linux-jdk.tar.gz"
33+
declare -r EXPECT_JDK_MD5="130885ded3cbfc712fbe9f7dace45a52"
5534
fi
5635

5736
wget -q -O jdk.tar.gz "$JDK_URL"

0 commit comments

Comments
 (0)