From 819b58ae470a985e795e85979a6aa975591cac5f Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Mon, 6 Oct 2025 16:44:52 +0200 Subject: [PATCH 01/12] Update version --- .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 22d39916a..26f272ee5 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.7.0", + "version": "2025.8.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.7.0", + "identifier": "https://github.com/MerginMaps/mobile/tree/2025.8.0", "relation": "isSupplementTo" }, { diff --git a/CITATION.cff b/CITATION.cff index 9b3fedd36..9c7aa026f 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,4 +1,4 @@ -cff-version: 2025.7.0 +cff-version: 2025.8.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 796643306..75724973e 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 "7") +set(MM_VERSION_MINOR "8") set(MM_VERSION_PATCH "0") if (VCPKG_TARGET_TRIPLET MATCHES ".*ios.*") diff --git a/vcpkg.json b/vcpkg.json index f5411a67d..7bb869413 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,7 +9,7 @@ }, "name": "merginmaps-mobile-app", "description": "Collect. Share. Publish.", - "version": "2025.7.0", + "version": "2025.8.0", "homepage": "https://github.com/merginmaps/mobile", "dependencies": [ { From b85f1245d23eea45b8493f60a96a763adb11d007 Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Thu, 16 Oct 2025 16:39:14 +0200 Subject: [PATCH 02/12] Add fastlane for android CI/CD --- .github/workflows/android.yml | 34 +++++ .gitignore | 2 + Gemfile | 4 + Gemfile.lock | 229 ++++++++++++++++++++++++++++++++++ fastlane/Appfile | 2 + fastlane/Fastfile | 37 ++++++ fastlane/README.md | 48 +++++++ google_play_key.json.enc | Bin 0 -> 2400 bytes 8 files changed, 356 insertions(+) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 fastlane/Appfile create mode 100644 fastlane/Fastfile create mode 100644 fastlane/README.md create mode 100644 google_play_key.json.enc diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 89858ffc5..b53f4b236 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -179,6 +179,25 @@ jobs: setapikey "${{ secrets.MERGIN_MAPS_BOT_GITHUB_TOKEN }}" \ -source "https://nuget.pkg.github.com/merginmaps/index.json" + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: 'head' + bundler-cache: true + + - name: Decode Google Play JSON Key + run: | + $HOMEBREW_PREFIX/bin/openssl \ + aes-256-cbc -d \ + -in mm/google_play_key.json.enc \ + -out mm/google_play_key.json \ + -k ${{ secrets.MM_GOOGLE_SERVICE_ACCOUNT_DECRYPTION_KEY }} \ + -md md5 + + MM_GOOGLE_KEY_PATH=`pwd`/mm/google_play_key.json + echo "path to keystore $MM_GOOGLE_KEY_PATH" + echo "MM_GOOGLE_KEY_PATH=$MM_GOOGLE_KEY_PATH" >> $GITHUB_ENV + - name: Calculate build number env: OFFFSET: 10 # offset for build number - due to previous builds ~ new builds must always have a higher number @@ -242,6 +261,13 @@ jobs: path: ${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk name: Mergin Maps ${{ env.MM_VERSION_CODE }} APK [${{ matrix.ANDROID_ABI }}] + - name: Deploy App to Google play - Internal app sharing + run: | + FASTLANE_OUTPUT=$(bundle exec fastlane deploy mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk) + + echo "Google play store APK link: $FASTLANE_OUTPUT" + echo "Google play store APK link: $FASTLANE_OUTPUT" >> $GITHUB_STEP_SUMMARY + - name: Build AAB if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} env: @@ -266,3 +292,11 @@ jobs: with: path: ${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.aab name: Mergin Maps ${{ env.MM_VERSION_CODE }} AAB [${{ matrix.ANDROID_ABI }}] + + - name: Deploy App to Google play - Internal app sharing + if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} + run: | + FASTLANE_OUTPUT=$(bundle exec fastlane deploy mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.aab) + + echo "Google play store AAB link: $FASTLANE_OUTPUT" + echo "Google play store AAB link: $FASTLANE_OUTPUT" >> $GITHUB_STEP_SUMMARY \ No newline at end of file diff --git a/.gitignore b/.gitignore index afde8b635..73b4b05af 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ app/android/build.gradle app/android/.gradle/* app/android/.gradle .github/secrets/ios/LutraConsulting*.mobileprovision +google_play_key.json +fastlane/report.xml \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..f21ac79ec --- /dev/null +++ b/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem "fastlane" + diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..c1c5b6a73 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,229 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.4.0) + aws-partitions (1.1172.0) + aws-sdk-core (3.233.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 + bigdecimal + jmespath (~> 1, >= 1.6.1) + logger + aws-sdk-kms (1.113.0) + aws-sdk-core (~> 3, >= 3.231.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.199.1) + aws-sdk-core (~> 3, >= 3.231.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.12.1) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.3.0) + bigdecimal (3.3.1) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.7.0) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.112.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.1) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.1.1) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) + fastimage (2.4.0) + fastlane (2.228.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.4.1) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.8.0) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.5.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.8) + domain_name (~> 0.5) + httpclient (2.9.0) + mutex_m + jmespath (1.6.2) + json (2.15.1) + jwt (2.10.2) + base64 + logger (1.7.0) + mini_magick (4.13.2) + mini_mime (1.1.5) + multi_json (1.17.0) + multipart-post (2.4.1) + mutex_m (0.3.0) + nanaimo (0.4.0) + naturally (2.3.0) + nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.2) + public_suffix (6.0.2) + rake (13.3.0) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.4.4) + rouge (3.28.0) + ruby2_keywords (0.0.5) + rubyzip (2.4.1) + security (0.1.5) + signet (0.21.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 4.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + sysrandom (1.0.5) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.6.0) + word_wrap (1.0.0) + xcodeproj (1.27.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.1) + rouge (~> 3.28.0) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + x86_64-linux + +DEPENDENCIES + fastlane + +BUNDLED WITH + 2.7.2 diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 000000000..2a9bc97a9 --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1,2 @@ +json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +package_name("uk.co.lutraconsulting") # e.g. com.krausefx.app diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 000000000..7ec0d71ae --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,37 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:android) + +platform :android do + desc "Deploy a new version to the Google Play internal app sharing" + lane :deploy do |options| + upload_to_play_store_internal_app_sharing( + package_name: 'uk.co.lutraconsulting', + json_key: ENV['MM_GOOGLE_KEY_PATH'], + apk: options[:mm_path] + ) + end + + desc "Deploy a new version to the Google Play internal beta" + lane :deploy_beta do + upload_to_play_store + end + + desc "Deploy a new version to the Google Play production" + lane :deploy_prod do + upload_to_play_store + end +end diff --git a/fastlane/README.md b/fastlane/README.md new file mode 100644 index 000000000..67c738cd3 --- /dev/null +++ b/fastlane/README.md @@ -0,0 +1,48 @@ +fastlane documentation +---- + +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +```sh +xcode-select --install +``` + +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) + +# Available Actions + +## Android + +### android deploy + +```sh +[bundle exec] fastlane android deploy +``` + +Deploy a new version to the Google Play internal app sharing + +### android deploy_beta + +```sh +[bundle exec] fastlane android deploy_beta +``` + +Deploy a new version to the Google Play internal beta + +### android deploy_prod + +```sh +[bundle exec] fastlane android deploy_prod +``` + +Deploy a new version to the Google Play production + +---- + +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/google_play_key.json.enc b/google_play_key.json.enc new file mode 100644 index 0000000000000000000000000000000000000000..6550a142ee35d9c662f9556123abba7b14b6750f GIT binary patch literal 2400 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 SIh_OveE#yM>x4i5k Date: Thu, 16 Oct 2025 17:09:14 +0200 Subject: [PATCH 03/12] Fix android CI/CD --- .github/workflows/android.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index b53f4b236..f7b02a4f7 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -182,7 +182,8 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 'head' + working-directory: mm + ruby-version: '3.3' bundler-cache: true - name: Decode Google Play JSON Key @@ -263,6 +264,7 @@ jobs: - name: Deploy App to Google play - Internal app sharing run: | + cd ${{ github.workspace }}/mm FASTLANE_OUTPUT=$(bundle exec fastlane deploy mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk) echo "Google play store APK link: $FASTLANE_OUTPUT" @@ -296,6 +298,7 @@ jobs: - name: Deploy App to Google play - Internal app sharing if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} run: | + cd ${{ github.workspace }}/mm FASTLANE_OUTPUT=$(bundle exec fastlane deploy mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.aab) echo "Google play store AAB link: $FASTLANE_OUTPUT" From 7ddd575138dd6e5c3cd85b55d1d12e938b0b91c8 Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Thu, 16 Oct 2025 21:19:37 +0200 Subject: [PATCH 04/12] Polish the output --- .github/workflows/android.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f7b02a4f7..2edaf44fd 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -48,6 +48,8 @@ jobs: QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }} XC_VERSION: ${{ '16.2' }} VCPKG_ROOT: "${{ github.workspace }}/vcpkg" + LC_ALL: 'en_US.UTF-8' #fastlane + LANG: 'en_US.UTF-8' #fastlane steps: - uses: actions/checkout@v4 @@ -267,8 +269,9 @@ jobs: cd ${{ github.workspace }}/mm FASTLANE_OUTPUT=$(bundle exec fastlane deploy mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk) - echo "Google play store APK link: $FASTLANE_OUTPUT" - echo "Google play store APK link: $FASTLANE_OUTPUT" >> $GITHUB_STEP_SUMMARY + echo "$FASTLANE_OUTPUT" + SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/Internal App Sharing URL:/ {print $NF}') + echo "Google play store APK link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY - name: Build AAB if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} From f241ed17d1cf0b8010f158f0faa5a065b71b8dee Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Thu, 16 Oct 2025 22:22:10 +0200 Subject: [PATCH 05/12] Fix whitespaces around download link --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2edaf44fd..c40b25e65 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -270,7 +270,7 @@ jobs: FASTLANE_OUTPUT=$(bundle exec fastlane deploy mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk) echo "$FASTLANE_OUTPUT" - SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/Internal App Sharing URL:/ {print $NF}') + SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/Internal App Sharing URL:/ {print $NF}' | xargs) echo "Google play store APK link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY - name: Build AAB From b8ceaa35c1848e8d59d4c9506badd99704dc0b8c Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Tue, 21 Oct 2025 18:09:24 +0300 Subject: [PATCH 06/12] Try to fix output to summary --- .github/workflows/android.yml | 3 ++- fastlane/Fastfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c40b25e65..9a5bc81f4 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -270,7 +270,8 @@ jobs: FASTLANE_OUTPUT=$(bundle exec fastlane deploy mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk) echo "$FASTLANE_OUTPUT" - SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/Internal App Sharing URL:/ {print $NF}' | xargs) + SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/APP_SHARE_URL:/ {print $NF}') + echo "$SHARE_URL" echo "Google play store APK link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY - name: Build AAB diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 7ec0d71ae..525db01a5 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -18,11 +18,12 @@ default_platform(:android) platform :android do desc "Deploy a new version to the Google Play internal app sharing" lane :deploy do |options| - upload_to_play_store_internal_app_sharing( + share_url = upload_to_play_store_internal_app_sharing( package_name: 'uk.co.lutraconsulting', json_key: ENV['MM_GOOGLE_KEY_PATH'], apk: options[:mm_path] ) + puts "APP_SHARE_URL:#{share_url}" end desc "Deploy a new version to the Google Play internal beta" From c84490ec9dac44845d57ebd7ffaac7ee3595e8af Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Tue, 21 Oct 2025 19:06:13 +0300 Subject: [PATCH 07/12] Fix fastfile output & clean up fastlane config files --- .github/workflows/android.yml | 2 +- fastlane/Appfile | 3 +-- fastlane/Fastfile | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9a5bc81f4..c832407bd 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -271,7 +271,7 @@ jobs: echo "$FASTLANE_OUTPUT" SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/APP_SHARE_URL:/ {print $NF}') - echo "$SHARE_URL" + echo "$SHARE_URL" echo "Google play store APK link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY - name: Build AAB diff --git a/fastlane/Appfile b/fastlane/Appfile index 2a9bc97a9..c037c2a13 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1 @@ -json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one -package_name("uk.co.lutraconsulting") # e.g. com.krausefx.app +package_name("uk.co.lutraconsulting") diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 525db01a5..c369b782b 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -19,11 +19,10 @@ platform :android do desc "Deploy a new version to the Google Play internal app sharing" lane :deploy do |options| share_url = upload_to_play_store_internal_app_sharing( - package_name: 'uk.co.lutraconsulting', json_key: ENV['MM_GOOGLE_KEY_PATH'], apk: options[:mm_path] ) - puts "APP_SHARE_URL:#{share_url}" + puts "APP_SHARE_URL: #{share_url}" end desc "Deploy a new version to the Google Play internal beta" From 7629e92a3d546b2064c58d266c6f9fee9d546c7a Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Wed, 22 Oct 2025 11:21:30 +0300 Subject: [PATCH 08/12] Polish last bits --- .github/workflows/android.yml | 10 +++++----- fastlane/Fastfile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c832407bd..c56b2ee74 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -267,11 +267,10 @@ jobs: - name: Deploy App to Google play - Internal app sharing run: | cd ${{ github.workspace }}/mm - FASTLANE_OUTPUT=$(bundle exec fastlane deploy mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk) + FASTLANE_OUTPUT=$(bundle exec fastlane deploy_app_sharing mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk) echo "$FASTLANE_OUTPUT" SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/APP_SHARE_URL:/ {print $NF}') - echo "$SHARE_URL" echo "Google play store APK link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY - name: Build AAB @@ -303,7 +302,8 @@ jobs: if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} run: | cd ${{ github.workspace }}/mm - FASTLANE_OUTPUT=$(bundle exec fastlane deploy mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.aab) + FASTLANE_OUTPUT=$(bundle exec fastlane deploy_app_sharing mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.aab) - echo "Google play store AAB link: $FASTLANE_OUTPUT" - echo "Google play store AAB link: $FASTLANE_OUTPUT" >> $GITHUB_STEP_SUMMARY \ No newline at end of file + echo "$FASTLANE_OUTPUT" + SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/APP_SHARE_URL:/ {print $NF}') + echo "Google play store AAB link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile index c369b782b..70e1f069c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -17,7 +17,7 @@ default_platform(:android) platform :android do desc "Deploy a new version to the Google Play internal app sharing" - lane :deploy do |options| + lane :deploy_app_sharing do |options| share_url = upload_to_play_store_internal_app_sharing( json_key: ENV['MM_GOOGLE_KEY_PATH'], apk: options[:mm_path] From 7c627a3c6c84747cce8921d36536ec54f2f1aad9 Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Wed, 22 Oct 2025 12:33:59 +0300 Subject: [PATCH 09/12] Fix review issues --- .github/workflows/android.yml | 1 + fastlane/Fastfile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c56b2ee74..b17f5621f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -265,6 +265,7 @@ jobs: name: Mergin Maps ${{ env.MM_VERSION_CODE }} APK [${{ matrix.ANDROID_ABI }}] - name: Deploy App to Google play - Internal app sharing + if: ${{ !(github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag') }} run: | cd ${{ github.workspace }}/mm FASTLANE_OUTPUT=$(bundle exec fastlane deploy_app_sharing mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 70e1f069c..345035356 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -26,12 +26,12 @@ platform :android do end desc "Deploy a new version to the Google Play internal beta" - lane :deploy_beta do + lane :deploy_beta do # TODO upload_to_play_store end desc "Deploy a new version to the Google Play production" - lane :deploy_prod do + lane :deploy_prod do # TODO upload_to_play_store end end From 5d86eedb699f44b00bf93119a58ef459bce0fa86 Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Wed, 22 Oct 2025 12:35:04 +0300 Subject: [PATCH 10/12] Revert "Update version" This reverts commit 819b58ae470a985e795e85979a6aa975591cac5f. --- .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 26f272ee5..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.8.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.8.0", + "identifier": "https://github.com/MerginMaps/mobile/tree/2025.7.0", "relation": "isSupplementTo" }, { diff --git a/CITATION.cff b/CITATION.cff index 9c7aa026f..9b3fedd36 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,4 +1,4 @@ -cff-version: 2025.8.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 75724973e..796643306 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 "8") +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 7bb869413..f5411a67d 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,7 +9,7 @@ }, "name": "merginmaps-mobile-app", "description": "Collect. Share. Publish.", - "version": "2025.8.0", + "version": "2025.7.0", "homepage": "https://github.com/merginmaps/mobile", "dependencies": [ { From 795fa5596d76a2c805f1523dd393c10aa580c6f1 Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Wed, 22 Oct 2025 13:44:07 +0300 Subject: [PATCH 11/12] Move android files around --- .github/workflows/android.yml | 6 +++--- Gemfile => fastlane/Gemfile | 0 Gemfile.lock => fastlane/Gemfile.lock | 0 .../ci/android/Input_keystore.keystore.enc | Bin .../ci/android/google_play_key.json.enc | Bin 5 files changed, 3 insertions(+), 3 deletions(-) rename Gemfile => fastlane/Gemfile (100%) rename Gemfile.lock => fastlane/Gemfile.lock (100%) rename Input_keystore.keystore.enc => scripts/ci/android/Input_keystore.keystore.enc (100%) rename google_play_key.json.enc => scripts/ci/android/google_play_key.json.enc (100%) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index b17f5621f..25914d141 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -143,7 +143,7 @@ jobs: run: | $HOMEBREW_PREFIX/bin/openssl \ aes-256-cbc -d \ - -in mm/Input_keystore.keystore.enc \ + -in mm/scripts/ci/android/Input_keystore.keystore.enc \ -out mm/Input_keystore.keystore \ -k $INPUTKEYSTORE_DECRYPT_KEY \ -md md5 @@ -184,7 +184,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - working-directory: mm + working-directory: mm/fastlane ruby-version: '3.3' bundler-cache: true @@ -192,7 +192,7 @@ jobs: run: | $HOMEBREW_PREFIX/bin/openssl \ aes-256-cbc -d \ - -in mm/google_play_key.json.enc \ + -in mm/scripts/ci/android/google_play_key.json.enc \ -out mm/google_play_key.json \ -k ${{ secrets.MM_GOOGLE_SERVICE_ACCOUNT_DECRYPTION_KEY }} \ -md md5 diff --git a/Gemfile b/fastlane/Gemfile similarity index 100% rename from Gemfile rename to fastlane/Gemfile diff --git a/Gemfile.lock b/fastlane/Gemfile.lock similarity index 100% rename from Gemfile.lock rename to fastlane/Gemfile.lock diff --git a/Input_keystore.keystore.enc b/scripts/ci/android/Input_keystore.keystore.enc similarity index 100% rename from Input_keystore.keystore.enc rename to scripts/ci/android/Input_keystore.keystore.enc diff --git a/google_play_key.json.enc b/scripts/ci/android/google_play_key.json.enc similarity index 100% rename from google_play_key.json.enc rename to scripts/ci/android/google_play_key.json.enc From f00ab5b65dd17dfac1030a009825ee5a67a5754a Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Wed, 22 Oct 2025 14:10:26 +0300 Subject: [PATCH 12/12] Fix bundle execute working directory --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 25914d141..a7cb2305b 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -267,7 +267,7 @@ jobs: - name: Deploy App to Google play - Internal app sharing if: ${{ !(github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag') }} run: | - cd ${{ github.workspace }}/mm + cd ${{ github.workspace }}/mm/fastlane FASTLANE_OUTPUT=$(bundle exec fastlane deploy_app_sharing mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk) echo "$FASTLANE_OUTPUT" @@ -302,7 +302,7 @@ jobs: - name: Deploy App to Google play - Internal app sharing if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} run: | - cd ${{ github.workspace }}/mm + cd ${{ github.workspace }}/mm/fastlane FASTLANE_OUTPUT=$(bundle exec fastlane deploy_app_sharing mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.aab) echo "$FASTLANE_OUTPUT"