From b0824407b1cd373cf1bd4b3034ac54be9549b875 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 19 Aug 2025 17:37:30 +0200 Subject: [PATCH 1/8] Fix build script --- .forgejo/workflows/on_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/on_release.yml b/.forgejo/workflows/on_release.yml index 471ef209..f9a8abed 100644 --- a/.forgejo/workflows/on_release.yml +++ b/.forgejo/workflows/on_release.yml @@ -50,7 +50,7 @@ jobs: scp app/build/outputs/apk/release/app-release.apk hetzner:~/public/apk/mapcomplete-$TAG.apk ssh hetzner 'rm -f public/apk/mapcomplete-latest.apk && cp "public/apk/$(ls -v public/apk/ | tail -n 1)" public/apk/mapcomplete-latest.apk' # Build versions vor legacy - ./scripts/compile_version.shs $TAG 9-PIE 28 + ./scripts/compile_version.sh $TAG 9-PIE 28 ./scripts/compile_version.sh $TAG 10-QUINCE-TART 29 ./scripts/compile_version.sh $TAG 11-RED-VELVET-CAKE 30 ./scripts/compile_version.sh $TAG 12-SNOW-CONE 31 From 5f0fb91b4915d579722934752c19db4443c92d0f Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 19 Aug 2025 18:23:52 +0200 Subject: [PATCH 2/8] Fix build script --- .forgejo/workflows/on_release.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/on_release.yml b/.forgejo/workflows/on_release.yml index f9a8abed..aee47435 100644 --- a/.forgejo/workflows/on_release.yml +++ b/.forgejo/workflows/on_release.yml @@ -44,18 +44,21 @@ jobs: export keyPassword=${{ secrets.KEY_PASSWORD }} ./gradlew build ./gradlew assembleRelease - rm -rf app/build/outputs/apk/release/baselineProfiles - rm -rf app/build/outputs/apk/release/output-metadata.json TAG=$( echo ${{ env.GITHUB_REF_NAME }} ) scp app/build/outputs/apk/release/app-release.apk hetzner:~/public/apk/mapcomplete-$TAG.apk ssh hetzner 'rm -f public/apk/mapcomplete-latest.apk && cp "public/apk/$(ls -v public/apk/ | tail -n 1)" public/apk/mapcomplete-latest.apk' - # Build versions vor legacy + # Build versions for legacy versions ./scripts/compile_version.sh $TAG 9-PIE 28 ./scripts/compile_version.sh $TAG 10-QUINCE-TART 29 ./scripts/compile_version.sh $TAG 11-RED-VELVET-CAKE 30 ./scripts/compile_version.sh $TAG 12-SNOW-CONE 31 ./scripts/compile_version.sh $TAG 13-TIRAMISU 32 + - name: clean intermediate files + run: | + rm -rf app/build/outputs/apk/release/baselineProfiles + rm -rf app/build/outputs/apk/release/output-metadata.json + - name: Upload APK to forgejo releases (MapComplete) uses: https://source.mapcomplete.org/actions/forgejo-release@v2.6.0 with: From 817e8198b5e4c30572d7d3f082d60fc10a7be21e Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 20 Aug 2025 14:28:48 +0200 Subject: [PATCH 3/8] Formatting --- .forgejo/workflows/on_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/on_release.yml b/.forgejo/workflows/on_release.yml index aee47435..fd1a0309 100644 --- a/.forgejo/workflows/on_release.yml +++ b/.forgejo/workflows/on_release.yml @@ -58,7 +58,7 @@ jobs: run: | rm -rf app/build/outputs/apk/release/baselineProfiles rm -rf app/build/outputs/apk/release/output-metadata.json - + - name: Upload APK to forgejo releases (MapComplete) uses: https://source.mapcomplete.org/actions/forgejo-release@v2.6.0 with: From ea7cadde4e17d27df013ec3b3497a494e709d476 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 3 Sep 2025 00:17:20 +0200 Subject: [PATCH 4/8] Attempt to support lower android versions too --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6e52ddef..5a28623f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,9 +5,9 @@ android { compileSdk rootProject.ext.compileSdkVersion defaultConfig { applicationId "org.mapcomplete" - minSdk 33 + minSdk 28 targetSdkVersion targetSdkVersion - versionCode 9 + versionCode 10 versionName "debug" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { From 1180d3cfdd1cf9ea9f439c9a3c4ab9ec490ccda1 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 3 Sep 2025 01:09:05 +0200 Subject: [PATCH 5/8] Attempt to support lower android versions too --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 5a28623f..3642aaff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { applicationId "org.mapcomplete" minSdk 28 - targetSdkVersion targetSdkVersion + targetSdkVersion 35 versionCode 10 versionName "debug" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From dc3f3f5ac3d4d42bed7aeb58ff5386a063dbac06 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 3 Sep 2025 01:09:19 +0200 Subject: [PATCH 6/8] Add inset fallback if insets are not used, add exit functionality --- app/src/main/java/org/mapcomplete/MainActivity.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mapcomplete/MainActivity.java b/app/src/main/java/org/mapcomplete/MainActivity.java index e297f306..2698fe72 100644 --- a/app/src/main/java/org/mapcomplete/MainActivity.java +++ b/app/src/main/java/org/mapcomplete/MainActivity.java @@ -20,7 +20,7 @@ import androidx.core.view.WindowCompat; import com.getcapacitor.BridgeActivity; import com.getcapacitor.JSObject; import com.getcapacitor.PluginCall; - +import android.app.Activity; public class MainActivity extends BridgeActivity { private PluginCall locationRequest = null; @@ -67,6 +67,11 @@ public class MainActivity extends BridgeActivity { responder.setKeepAlive(true); }); + Databridge.addResponder("exit", responder -> { + Log.i("databridge","got exit request"); + finishAffinity(); + }); + super.onCreate(savedInstanceState); EdgeToEdge.enable(this); @@ -86,6 +91,10 @@ public class MainActivity extends BridgeActivity { }); }else{ Log.i("insets","Not enabling insets, version to low"); + Databridge.addResponder("insets", (responder) -> { + var json = "{ \"top\": 0, \"bottom\": 0}"; + Databridge.sendAnswerTo(responder, json); + }); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { From 472b6da88e038d34e2915ebd36350376acf0c58c Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 20 Sep 2025 14:01:49 +0200 Subject: [PATCH 7/8] Add comments about version numbers --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3642aaff..f7d16418 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,9 +5,9 @@ android { compileSdk rootProject.ext.compileSdkVersion defaultConfig { applicationId "org.mapcomplete" - minSdk 28 + minSdk 28 // Use 32 for google play, 28 for FDroid targetSdkVersion 35 - versionCode 10 + versionCode 2031 versionName "debug" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { From dd563776240b4ce9cd8d5fdc2d4cb864c575a268 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 27 Oct 2025 01:52:35 +0100 Subject: [PATCH 8/8] Fix: remove build step that might break reproducible builds --- .forgejo/workflows/on_release.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.forgejo/workflows/on_release.yml b/.forgejo/workflows/on_release.yml index fd1a0309..712ec3c8 100644 --- a/.forgejo/workflows/on_release.yml +++ b/.forgejo/workflows/on_release.yml @@ -26,12 +26,6 @@ jobs: - name: Grant execute permission to gradlew run: chmod +x ./gradlew - - name: Monkeypatch version number - run: | - echo "--- @capacitor ---" - ls @capacitor - sed "s/\.\.\/node_modules\///" -i capacitor.settings.gradle - - name: Build signed APK run: | ./gradlew --version