From 7eff7300d0d4cff2513e996d6c3a82bc0a83913f Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Wed, 7 Oct 2026 16:45:22 +0200 Subject: [PATCH 1/3] chore: disable abi (apk-split) --- app/build.gradle.kts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 73c1cca..7b104c8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -27,14 +27,15 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - splits { + // not necessary + /*splits { abi { isEnable = true reset() include("arm64-v8a", "armeabi-v7a", "x86", "x86_64") isUniversalApk = true } - } + }*/ signingConfigs { create("release") { -- 2.54.1 From d03f9eee679297f8fd209caf0b0a342e17259bbf Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Wed, 7 Oct 2026 16:48:13 +0200 Subject: [PATCH 2/3] chore: enable R8 (Code-Shrinking) --- .idea/misc.xml | 2 +- app/build.gradle.kts | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 1896758..f104487 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7b104c8..86ee171 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -57,8 +57,13 @@ android { release { signingConfig = signingConfigs.getByName("release") optimization { - enable = false + enable = true } + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) } } compileOptions { -- 2.54.1 From bc6edc4a04912f2beb1d790ec179b6be4098370f Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Wed, 7 Oct 2026 16:49:40 +0200 Subject: [PATCH 3/3] chore: adjust workflow --- .gitea/workflows/release.yaml | 40 +++++++++++++---------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index ebc3bd1..b8b055c 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -50,7 +50,7 @@ jobs: "$SDKMANAGER" --sdk_root="$SDK_PATH" \ "platform-tools" \ - "platforms;android-35" \ + "platforms;android-37" \ "build-tools;35.0.0" echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV @@ -64,7 +64,7 @@ jobs: echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore" echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV - - name: Android Release APKs bauen + - name: Android Release APK bauen run: | set -euo pipefail @@ -79,33 +79,23 @@ jobs: APK_DIR="app/build/outputs/apk/release" - echo "Gefundene Original-APKs in $APK_DIR:" + echo "Gefundene APKs in $APK_DIR:" ls -lh "$APK_DIR" - for APK in "$APK_DIR"/*.apk; do - [ -e "$APK" ] || continue + SRC="$APK_DIR/app-release.apk" + if [ ! -f "$SRC" ]; then + echo "app-release.apk nicht gefunden (evtl. unsigniert oder anderer Name)" + exit 1 + fi - if [[ "$APK" == *"unsigned"* || "$APK" == *"WeekFocus-"* ]]; then - continue - fi + TARGET_PATH="$APK_DIR/WeekFocus-${VERSION}.apk" + mv "$SRC" "$TARGET_PATH" - FILENAME=$(basename "$APK") - VARIANT=$(echo "$FILENAME" | sed -E 's/^app-(.*)-release\.apk$/\1/') - if [ "$VARIANT" = "$FILENAME" ]; then - VARIANT="release" - fi + echo "Signatur prüfen für $(basename "$TARGET_PATH")..." + "$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH" - TARGET_NAME="WeekFocus-${VERSION}-${VARIANT}.apk" - TARGET_PATH="$APK_DIR/$TARGET_NAME" - - mv "$APK" "$TARGET_PATH" - - echo "Signatur prüfen für $TARGET_NAME..." - "$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH" - done - - echo "Finale Release-APKs:" - ls -lh "$APK_DIR"/WeekFocus-*.apk + echo "Finale Release-APK:" + ls -lh "$TARGET_PATH" env: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} @@ -142,7 +132,7 @@ jobs: echo "Release-Notes:" cat "$NOTES_FILE" - - name: Release in Gitea erstellen und APKs hochladen + - name: Release in Gitea erstellen und APK hochladen env: TOKEN: ${{ secrets.GITHUB_TOKEN }} API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }} -- 2.54.1