From 726e30183e0ed961302c98f71f5b22b03176c8df Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 8 May 2024 11:22:55 +0300 Subject: [PATCH] Coin: update jdk from 11 to 17 to support Android builds with Gradle 8+ Gradle 8 and AGP 8+ require JDK version 17 to work properly, this is needed for CI test runs of Android. Task-number: QTBUG-106907 Change-Id: I437ee6752fe12ce4d40fbfe1af2bfff1b4ca243b Reviewed-by: Jukka Jokiniva (cherry picked from commit 31d72b0e2ca763dbbd7d49edb93c15e1e4ab2c15) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 2 +- .../qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh | 2 +- .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 227e879a..3f2829ac 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -87,7 +87,7 @@ installPackages+=(python3-html5lib) installPackages+=(libatomic) installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64) # For Android builds -installPackages+=(java-11-openjdk-devel-11.0.19.0.7) +installPackages+=(java-17-openjdk-devel-17.0.9.0.9) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh index c843bbd0..79c3476a 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh @@ -80,7 +80,7 @@ installPackages+=(python3-html5lib) installPackages+=(mesa-libgbm-devel-21.3.4-2.el9) installPackages+=(libstdc++-static) # For Android builds -installPackages+=(java-11-openjdk-devel-11.0.19.0.7) +installPackages+=(java-17-openjdk-devel-17.0.9.0.9) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index 693979c1..0adcec27 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -93,7 +93,7 @@ installPackages+=(python3-html5lib) installPackages+=(libstdc++-static) installPackages+=(mesa-libgbm-devel-21.3.4-2.el9.x86_64) # For Android builds -installPackages+=(java-11-openjdk-devel) +installPackages+=(java-17-openjdk-devel-17.0.9.0.9) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements