Fix/android build qt6 next

.github/workflows/android.yml

@@ -76,7 +76,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - run: git fetch --prune --unshallow --tags
 
@@ -364,31 +364,31 @@ jobs:
 
       - name: Archive artifacts (welle.io apk)
         if: always() && steps.build_apk.outcome == 'success'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: welle.io apk (for all android abi)
           path: build/android-build/build/outputs/apk/*/*.apk
           if-no-files-found: error
 
       - name: Archive artifacts (welle.io apk built by qmake)
         if: always() && steps.build_apk_qmake.outcome == 'success'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: welle.io apk built by qmake (arm64-v8a only)
           path: qmake-build/src/welle-gui/android-build/build/outputs/apk/debug/android-build-debug.apk
           if-no-files-found: error
 
       - name: Archive artifacts (welle.io build dir)
         if: always() && steps.build_apk.outcome == 'failure'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: welle.io build dir
           path: build/*
           if-no-files-found: error
 
       - name: Archive artifacts (welle.io qmake-build dir)
         if: always() && steps.build_apk_qmake.outcome == 'failure'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: welle.io qmake-build dir
           path: qmake-build/*

.github/workflows/linux.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - run: git fetch --prune --unshallow --tags
 
@@ -44,17 +44,20 @@ jobs:
 
       - name: Prepare flatpak build
         run: |
-            # Add current build date into appdata.xml
+            # Add shared modules
+            git submodule add https://github.com/flathub/shared-modules.git
+
+            # Add current build date into metainfo.xml
             APPDATA_DATE=`date +%Y-%m-%d`
-            sed -i 's/date="1970-01-01"/'date=\""$APPDATA_DATE"\"'/g' io.welle.welle-gui.appdata.xml
+            sed -i 's/date="1970-01-01"/'date=\""$APPDATA_DATE"\"'/g' io.welle.welle-gui.metainfo.xml
 
-            # Add githash into appdata.xml
+            # Add githash into metainfo.xml
             #APPDATA_DATE_VERSION="2.7-unstable-$GIT_HASH"
             APPDATA_DATE_VERSION="2.7-$GIT_HASH"
-            sed -i 's/version="0.0.0"/'version=\""$APPDATA_DATE_VERSION"\"'/g' io.welle.welle-gui.appdata.xml
+            sed -i 's/version="0.0.0"/'version=\""$APPDATA_DATE_VERSION"\"'/g' io.welle.welle-gui.metainfo.xml
 
-            # Check if file "io.welle.welle-gui.appdata.xml" is valid
-            flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream io.welle.welle-gui.appdata.xml
+            # Check if file "io.welle.welle-gui.metainfo.xml" is valid
+            flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream io.welle.welle-gui.metainfo.xml
 
       - name: Build
         id: build
@@ -77,7 +80,7 @@ jobs:
             # Prepare publish
             mkdir publish
             mv welle-io.flatpak publish/"$DATE"_"$GIT_HASH"_Linux_welle_"$ARCH_SUFFIX".flatpak
-            #cp io.welle.welle-gui.appdata.xml publish/
+            #cp io.welle.welle-gui.metainfo.xml publish/
 
       - name: Check flathub eligibility
         continue-on-error: true
@@ -86,7 +89,7 @@ jobs:
           flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
 
       - name: Archive artifacts (welle.io Flatpak)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: welle.io Flatpak (${{ env.ARCH_SUFFIX }})
           path: publish/*

.github/workflows/raspberrypi.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - run: git fetch --prune --unshallow --tags
 
@@ -40,7 +40,7 @@ jobs:
 
       - name: Archive artifacts (welle.io build dir)
         if: always() && steps.build.outcome == 'failure'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: welle.io build dir
           path: build/*

.github/workflows/windows.yml

@@ -16,13 +16,12 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.8.1'
+          version: '6.10.1'
           modules: 'qtcharts qtmultimedia qt5compat qtshadertools'
           arch: 'win64_mingw'
           tools: 'tools_mingw1310'
-          aqtversion: '==3.1.19' # See https://github.com/jurplel/install-qt-action/issues/270
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - run: git fetch --prune --unshallow --tags
 
@@ -84,15 +83,15 @@ jobs:
 
       - name: Archive artifacts (welle.io Windows installer)
         id: upload_artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: welle.io Windows installer
           path: to_publish\*.exe
           if-no-files-found: error
 
       - name: Sign installer with self-signed certificate with SignPath
         id: signing_installer
-        uses: signpath/github-action-submit-signing-request@v1
+        uses: signpath/github-action-submit-signing-request@v2
         with:
           api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
           organization-id: 'b7a507e8-ab76-445f-bfb5-05944bcbbee9'
@@ -104,7 +103,7 @@ jobs:
 
       - name: Archive artifacts (welle.io Windows installer signed)
         id: upload_artifact_self_signed
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: welle.io Windows installer self-signed
           path: publish\*.exe
@@ -121,7 +120,7 @@ jobs:
 
       - name: Production sign installer with SignPath
         id: production_signing_installer
-        uses: signpath/github-action-submit-signing-request@v1
+        uses: signpath/github-action-submit-signing-request@v2
 
         # Production signing needs a manual step in SignPath within 5 minutes.
         # During development we don't need each build signed with a production key.
@@ -139,7 +138,7 @@ jobs:
 
       - name: Archive artifacts (welle.io Windows installer signed)
         id: upload_artifact_production_signed
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: always() && steps.production_signing_installer.outcome == 'success'
         with:
           name: welle.io Windows installer production-signed

.gitignore

@@ -18,3 +18,9 @@ welle.io.pro.user
 cmake_install.cmake
 cmake_uninstall.cmake
 install_manifest.txt
+
+# Android build artifacts
+/build-android-arm64/
+/dist/
+/aqtinstall.log
+/LOG.md

BUILDING_ANDROID.md

@@ -0,0 +1,76 @@
+# Building welle.io for Android (Qt 6.5.3)
+
+This document describes the known-good setup to build the Android APK with Qt 6.5.3.
+
+## Requirements
+
+- Qt **6.5.3**
+- Android SDK/NDK (tested with NDK r27)
+- JDK 17
+
+### Required Qt modules
+
+Install these Qt 6.5.3 modules for **both** `desktop` and `android_arm64_v8a`:
+
+- `qtcharts`
+- `qtmultimedia`
+- `qtconnectivity`
+- `qtpositioning`
+- `qtserialport`
+
+> Note: the Android build currently targets `arm64-v8a`.
+
+## Environment
+
+Set the following environment variables (examples use the local Qt install at `~/qt-cli/6.5.3`):
+
+```bash
+export ANDROID_SDK_ROOT="$HOME/Android/Sdk"
+export ANDROID_HOME="$HOME/Android/Sdk"
+
+export QT_ANDROID_PREFIX_ARM64="$HOME/qt-cli/6.5.3/android_arm64_v8a"
+export QT_HOST_PATH="$HOME/qt-cli/6.5.3/gcc_64"
+export QT_CMAKE_BIN="$QT_HOST_PATH/bin/qt-cmake"
+```
+
+## Install Qt modules (aqtinstall)
+
+If you used `aqtinstall` to install Qt:
+
+```bash
+python3 -m venv ~/.venvs/aqt
+~/.venvs/aqt/bin/pip install -U pip aqtinstall
+
+~/.venvs/aqt/bin/aqt install-qt linux desktop 6.5.3 gcc_64 \
+  -m qtcharts qtmultimedia qtconnectivity qtpositioning qtserialport \
+  --outputdir ~/qt-cli
+
+~/.venvs/aqt/bin/aqt install-qt linux android 6.5.3 android_arm64_v8a \
+  -m qtcharts qtmultimedia qtconnectivity qtpositioning qtserialport \
+  --outputdir ~/qt-cli
+```
+
+## Build steps
+
+From the repo root:
+
+```bash
+QT_ANDROID_PREFIX_ARM64="$HOME/qt-cli/6.5.3/android_arm64_v8a" \
+QT_HOST_PATH="$HOME/qt-cli/6.5.3/gcc_64" \
+QT_CMAKE_BIN="$HOME/qt-cli/6.5.3/gcc_64/bin/qt-cmake" \
+./tools/android/build.sh
+```
+
+The APK is written to:
+
+```
+./dist/welle-io-arm64-v8a.apk
+```
+
+If a debug keystore exists at `~/.android/debug.keystore`, the script will sign the APK for local install convenience.
+
+## Install to device
+
+```bash
+adb install -r dist/welle-io-arm64-v8a.apk
+```