From 53910547ccbd9a6386d3c266c2de709b8d4ceaf1 Mon Sep 17 00:00:00 2001
From: janbar <jlbarriere68@gmail.com>
Date: Wed, 18 Sep 2024 23:51:20 +0200
Subject: [PATCH] build with qt5.15.15 ndk26 jdk17

---
 .github/workflows/build_android_x64.yml | 14 +++++++-------
 android/linux-build-arm64-qt515.sh      |  4 ++--
 android/linux-build-armv7-qt515.sh      |  4 ++--
 android/linux-build-x64-qt515.sh        |  4 ++--
 android/linux-build-x86-qt515.sh        |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build_android_x64.yml b/.github/workflows/build_android_x64.yml
index d4eb759a..f49409e5 100644
--- a/.github/workflows/build_android_x64.yml
+++ b/.github/workflows/build_android_x64.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     environment: build
     steps:
       - name: Checkout
@@ -33,7 +33,7 @@ jobs:
       - name: Configure ENV
         run:  |
             echo "ANDROID_NDK=${ANDROID_HOME}/ndk/26.1.10909125" >> $GITHUB_ENV
-            echo "QT_DIR=${HOME}/Qt/5.15.14/android" >> $GITHUB_ENV
+            echo "QT_DIR=${HOME}/Qt/5.15.15/android" >> $GITHUB_ENV
 
       - name: Cache Qt
         id: cache-qt
@@ -41,17 +41,17 @@ jobs:
         env:
           cache-name: cache-qt
         with:
-          path: ~/Qt/5.15.14/android
-          key: qtandroid-51514-ndk21
+          path: ~/Qt/5.15.15/android
+          key: qtandroid-51515-ndk21
 
       - if: ${{ steps.cache-qt.outputs.cache-hit != 'true' }}
         name: Install Qt
         continue-on-error: true
         run: |
-            wget -q ${{secrets.PRIVATE_URL_DOWNLOAD}}/qt/qt-5.15.14-android-ndk21-linux64.tar.xz
+            wget -q ${{secrets.PRIVATE_URL_DOWNLOAD}}/qt/qt-5.15.15-android-ndk21-linux64.tar.xz
             mkdir -p ~/Qt
-            tar xfJ qt-5.15.14-android-ndk21-linux64.tar.xz -C ~/Qt/
-            rm -f qt-5.15.14-android-ndk21-linux64.tar.xz
+            tar xfJ qt-5.15.15-android-ndk21-linux64.tar.xz -C ~/Qt/
+            rm -f qt-5.15.15-android-ndk21-linux64.tar.xz
 
       - name: Fetch submodules
         run: git submodule init && git submodule update
diff --git a/android/linux-build-arm64-qt515.sh b/android/linux-build-arm64-qt515.sh
index f4add078..58ddaac1 100755
--- a/android/linux-build-arm64-qt515.sh
+++ b/android/linux-build-arm64-qt515.sh
@@ -2,10 +2,10 @@ BUILD_DIR=build-arm64-515
 rm -rf $BUILD_DIR/*
 mkdir -p $BUILD_DIR
 
-export JAVA_HOME=$HOME/bin/java/jdk1.8.0
+export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
 export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
-export QT_DIR=$HOME/bin/Qt/5.15.2/android
+export QT_DIR=$HOME/bin/Qt/5.15.15/android
 
 cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \
 -DCMAKE_PREFIX_PATH=$QT_DIR \
diff --git a/android/linux-build-armv7-qt515.sh b/android/linux-build-armv7-qt515.sh
index 1e058a54..4867140a 100755
--- a/android/linux-build-armv7-qt515.sh
+++ b/android/linux-build-armv7-qt515.sh
@@ -2,10 +2,10 @@ BUILD_DIR=build-armv7-515
 rm -rf $BUILD_DIR/*
 mkdir -p $BUILD_DIR
 
-export JAVA_HOME=$HOME/bin/java/jdk1.8.0
+export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
 export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
-export QT_DIR=$HOME/bin/Qt/5.15.2/android
+export QT_DIR=$HOME/bin/Qt/5.15.15/android
 
 cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \
 -DCMAKE_PREFIX_PATH=$QT_DIR \
diff --git a/android/linux-build-x64-qt515.sh b/android/linux-build-x64-qt515.sh
index 92e5b08e..2cce352d 100755
--- a/android/linux-build-x64-qt515.sh
+++ b/android/linux-build-x64-qt515.sh
@@ -2,10 +2,10 @@ BUILD_DIR=build-x64-515
 rm -rf $BUILD_DIR/*
 mkdir -p $BUILD_DIR
 
-export JAVA_HOME=$HOME/bin/java/jdk1.8.0
+export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
 export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
-export QT_DIR=$HOME/bin/Qt/5.15.2/android
+export QT_DIR=$HOME/bin/Qt/5.15.15/android
 
 cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \
 -DCMAKE_PREFIX_PATH=$QT_DIR \
diff --git a/android/linux-build-x86-qt515.sh b/android/linux-build-x86-qt515.sh
index b82b376f..d81481d8 100755
--- a/android/linux-build-x86-qt515.sh
+++ b/android/linux-build-x86-qt515.sh
@@ -2,10 +2,10 @@ BUILD_DIR=build-x86-515
 rm -rf $BUILD_DIR/*
 mkdir -p $BUILD_DIR
 
-export JAVA_HOME=$HOME/bin/java/jdk1.8.0
+export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
 export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
-export QT_DIR=$HOME/bin/Qt/5.15.2/android
+export QT_DIR=$HOME/bin/Qt/5.15.15/android
 
 cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \
 -DCMAKE_PREFIX_PATH=$QT_DIR \