From 10a687324c7c6ff978a60c765da5f480154ba447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 15 Sep 2025 15:04:54 +0300 Subject: [PATCH] Provisioning: Install openjdk@21 for QtBridges Pick-to: 6.10 Change-Id: Ibad51807cf188016e761e76bc62c1fd80aabfbc7 Reviewed-by: Tero Heikkinen --- coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 2 ++ coin/provisioning/qtci-macos-15-arm/91-install-openjdk.sh | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100755 coin/provisioning/qtci-macos-15-arm/91-install-openjdk.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh index 35f2c088..4f3e1b1d 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh @@ -151,6 +151,8 @@ installPackages+=(zlib1g) installPackages+=(openjdk-8-jdk) #Java 17 for Android, needed by RTA installPackages+=(openjdk-17-jdk) +# Java 21 for QtBridges +installPackages+=(openjdk-21-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev) diff --git a/coin/provisioning/qtci-macos-15-arm/91-install-openjdk.sh b/coin/provisioning/qtci-macos-15-arm/91-install-openjdk.sh new file mode 100755 index 00000000..4a6e6da8 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/91-install-openjdk.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +#Copyright (C) 2025 The Qt Company Ltd +#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +set -ex +brew install openjdk@21 +sudo ln -sfn /opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-21.jdk