Fix android CI (#4122)

* Fix android CI

* Update version to 2025.7.0

* Fix apk size

Author: Withalion

.github/workflows/android.yml

@@ -193,16 +193,12 @@ jobs:
                                     
       - name: Configure app
         env:
-          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
-          ANDROID_NDK_HOST: darwin-x86_64
-
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
             mkdir -p ${{ github.workspace }}/build-mm
             cd ${{ github.workspace }}/build-mm
 
             export PATH=${{ env.VCPKG_ROOT }}:$PATH
-            export ANDROID_NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}
-            export ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}
             export ANDROID_ABI=${{ matrix.ANDROID_ABI }}
 
             cmake \
@@ -226,8 +222,7 @@ jobs:
       
       - name: Build APK
         env:
-          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
-          ANDROID_NDK_HOST: darwin-x86_64
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
             cd ${{ github.workspace }}/build-mm
             ninja apk
@@ -250,11 +245,9 @@ jobs:
       - name: Build AAB
         if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }}
         env:
-          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
-          ANDROID_NDK_HOST: darwin-x86_64
-          QT_BASE: ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
-            cd ${{ github.workspace }}/build-Input
+            cd ${{ github.workspace }}/build-mm
             ninja aab
 
             echo "AAB:"
@@ -272,4 +265,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab
-          name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} AAB
+          name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} AAB [${{ matrix.ANDROID_ABI }}]

.zenodo.json

@@ -2,7 +2,7 @@
     "description": "<p>Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.</p>", 
     "license": "GPLv3", 
     "title": "Mergin Maps mobile app", 
-    "version": "2025.6.0",
+    "version": "2025.7.0",
     "upload_type": "software", 
     "publication_date": "2022-02-24", 
     "creators": [
@@ -39,7 +39,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/MerginMaps/mobile/tree/2025.6.0", 
+            "identifier": "https://github.com/MerginMaps/mobile/tree/2025.7.0", 
             "relation": "isSupplementTo"
         }, 
         {

CITATION.cff

@@ -1,4 +1,4 @@
-cff-version: 2025.6.0
+cff-version: 2025.7.0
 message: "If you use this software, please cite it as below."
 authors:
 - family-names: "Martin"

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.22)
 
 # Note: To update version use script/update_all_versions.bash
 set(MM_VERSION_MAJOR "2025")
-set(MM_VERSION_MINOR "6")
+set(MM_VERSION_MINOR "7")
 set(MM_VERSION_PATCH "0")
 
 if (VCPKG_TARGET_TRIPLET MATCHES ".*ios.*")

cmake_templates/build.gradle.in

@@ -46,6 +46,8 @@ android {
     compileSdkVersion androidCompileSdkVersion
     buildToolsVersion androidBuildToolsVersion
     ndkVersion androidNdkVersion
+    // don't get rid of this line as it inflates the final bundle size 5x
+    ndkPath '@INPUT_ANDROID_NDK_PATH@'
 
     packagingOptions.jniLibs.useLegacyPackaging true
 

vcpkg.json

@@ -9,7 +9,7 @@
     },
     "name": "merginmaps-mobile-app",
     "description": "Collect. Share. Publish.",
-    "version": "2025.6.0",
+    "version": "2025.7.0",
     "homepage": "https://github.com/merginmaps/mobile",
     "dependencies": [
         {