diff --git a/.forgejo/workflows/on_release.yml b/.forgejo/workflows/on_release.yml index 712ec3c8..471ef209 100644 --- a/.forgejo/workflows/on_release.yml +++ b/.forgejo/workflows/on_release.yml @@ -26,6 +26,12 @@ 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 @@ -38,21 +44,18 @@ 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 for legacy versions - ./scripts/compile_version.sh $TAG 9-PIE 28 + # Build versions vor legacy + ./scripts/compile_version.shs $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: diff --git a/app/build.gradle b/app/build.gradle index f7d16418..6e52ddef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,9 +5,9 @@ android { compileSdk rootProject.ext.compileSdkVersion defaultConfig { applicationId "org.mapcomplete" - minSdk 28 // Use 32 for google play, 28 for FDroid - targetSdkVersion 35 - versionCode 2031 + minSdk 33 + targetSdkVersion targetSdkVersion + versionCode 9 versionName "debug" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { diff --git a/app/src/main/java/org/mapcomplete/MainActivity.java b/app/src/main/java/org/mapcomplete/MainActivity.java index 2698fe72..e297f306 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,11 +67,6 @@ 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); @@ -91,10 +86,6 @@ 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) {