From 3cdd158300317f94957de268b5bd1efa9f956795 Mon Sep 17 00:00:00 2001 From: Withalion Date: Tue, 30 Sep 2025 20:54:16 +0200 Subject: [PATCH 1/5] Fix android CI --- .github/workflows/android.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 1141fc782..7f01aa041 100644 --- a/.github/workflows/android.yml +++ b/.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:" From 12fb1065d336e8813db5f8c43bd6e51250d554fb Mon Sep 17 00:00:00 2001 From: Withalion Date: Tue, 30 Sep 2025 20:58:01 +0200 Subject: [PATCH 2/5] Update version to 2025.7.0 --- .zenodo.json | 4 ++-- CITATION.cff | 2 +- CMakeLists.txt | 2 +- vcpkg.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index c04734b10..22d39916a 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -2,7 +2,7 @@ "description": "

Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.

", "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" }, { diff --git a/CITATION.cff b/CITATION.cff index f128a7c6d..9b3fedd36 100644 --- a/CITATION.cff +++ b/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" diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c0eaeac5..e6a8d5cb0 100644 --- a/CMakeLists.txt +++ b/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.*") diff --git a/vcpkg.json b/vcpkg.json index 703191d2d..2e5a19d4b 100644 --- a/vcpkg.json +++ b/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": [ { From fc8d7a189fb635d931d54df322c5a0e51e8ad84a Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Thu, 2 Oct 2025 15:48:39 +0200 Subject: [PATCH 3/5] Force building AAB --- .github/workflows/android.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 7f01aa041..a4620514e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -243,7 +243,7 @@ jobs: name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} APK [${{ matrix.ANDROID_ABI }}] - name: Build AAB - if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} +# if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} env: ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} run: | @@ -254,15 +254,15 @@ jobs: find . | grep .aab - name: Rename AAB artefacts - if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} +# if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} run: | mv \ ${{ github.workspace }}/build-mm/app/android-build/build/outputs/bundle/release/android-build-release.aab \ ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab - name: Upload AAB to Artifacts - if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} +# if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} 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 }}] From fb1b05d8a353f66c4d39c003b54f8ec53da883d0 Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Thu, 2 Oct 2025 19:14:19 +0200 Subject: [PATCH 4/5] Fix apk size --- cmake_templates/build.gradle.in | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake_templates/build.gradle.in b/cmake_templates/build.gradle.in index ac88401d9..197c52b03 100644 --- a/cmake_templates/build.gradle.in +++ b/cmake_templates/build.gradle.in @@ -46,6 +46,7 @@ android { compileSdkVersion androidCompileSdkVersion buildToolsVersion androidBuildToolsVersion ndkVersion androidNdkVersion + ndkPath '@INPUT_ANDROID_NDK_PATH@' packagingOptions.jniLibs.useLegacyPackaging true From 70df9103d2e649753243c8d4c7a1bf31d9c8472f Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Thu, 2 Oct 2025 19:46:45 +0200 Subject: [PATCH 5/5] Add comments & uncomment AAB building condition --- .github/workflows/android.yml | 6 +++--- cmake_templates/build.gradle.in | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index a4620514e..27a02d6eb 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -243,7 +243,7 @@ jobs: name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} APK [${{ matrix.ANDROID_ABI }}] - name: Build AAB -# if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} + if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} env: ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} run: | @@ -254,14 +254,14 @@ jobs: find . | grep .aab - name: Rename AAB artefacts -# if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} + if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} run: | mv \ ${{ github.workspace }}/build-mm/app/android-build/build/outputs/bundle/release/android-build-release.aab \ ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab - name: Upload AAB to Artifacts -# if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} + if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} uses: actions/upload-artifact@v4 with: path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab diff --git a/cmake_templates/build.gradle.in b/cmake_templates/build.gradle.in index 197c52b03..7561dbd91 100644 --- a/cmake_templates/build.gradle.in +++ b/cmake_templates/build.gradle.in @@ -46,6 +46,7 @@ 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