Compare commits

..
1 Commits
Author SHA1 Message Date
robin 8458f0fce5 Merge pull request 'Chore/smaller apk' (#28) from chore/smaller-apk into main
Build & Release Android App / build (push) Successful in 19m5s
Reviewed-on: #28
2026-10-07 14:08:54 +00:00
3 changed files with 29 additions and 25 deletions

No files matched your search

+25 -15
View File
@@ -50,7 +50,7 @@ jobs:
"$SDKMANAGER" --sdk_root="$SDK_PATH" \ "$SDKMANAGER" --sdk_root="$SDK_PATH" \
"platform-tools" \ "platform-tools" \
"platforms;android-37" \ "platforms;android-35" \
"build-tools;35.0.0" "build-tools;35.0.0"
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
@@ -64,7 +64,7 @@ jobs:
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore" echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
- name: Android Release APK bauen - name: Android Release APKs bauen
run: | run: |
set -euo pipefail set -euo pipefail
@@ -79,23 +79,33 @@ jobs:
APK_DIR="app/build/outputs/apk/release" APK_DIR="app/build/outputs/apk/release"
echo "Gefundene APKs in $APK_DIR:" echo "Gefundene Original-APKs in $APK_DIR:"
ls -lh "$APK_DIR" ls -lh "$APK_DIR"
SRC="$APK_DIR/app-release.apk" for APK in "$APK_DIR"/*.apk; do
if [ ! -f "$SRC" ]; then [ -e "$APK" ] || continue
echo "app-release.apk nicht gefunden (evtl. unsigniert oder anderer Name)"
exit 1
fi
TARGET_PATH="$APK_DIR/WeekFocus-${VERSION}.apk" if [[ "$APK" == *"unsigned"* || "$APK" == *"WeekFocus-"* ]]; then
mv "$SRC" "$TARGET_PATH" continue
fi
echo "Signatur prüfen für $(basename "$TARGET_PATH")..." FILENAME=$(basename "$APK")
"$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH" VARIANT=$(echo "$FILENAME" | sed -E 's/^app-(.*)-release\.apk$/\1/')
if [ "$VARIANT" = "$FILENAME" ]; then
VARIANT="release"
fi
echo "Finale Release-APK:" TARGET_NAME="WeekFocus-${VERSION}-${VARIANT}.apk"
ls -lh "$TARGET_PATH" 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
env: env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -132,7 +142,7 @@ jobs:
echo "Release-Notes:" echo "Release-Notes:"
cat "$NOTES_FILE" cat "$NOTES_FILE"
- name: Release in Gitea erstellen und APK hochladen - name: Release in Gitea erstellen und APKs hochladen
env: env:
TOKEN: ${{ secrets.GITHUB_TOKEN }} TOKEN: ${{ secrets.GITHUB_TOKEN }}
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }} API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
+3 -9
View File
@@ -27,15 +27,14 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
// not necessary splits {
/*splits {
abi { abi {
isEnable = true isEnable = true
reset() reset()
include("arm64-v8a", "armeabi-v7a", "x86", "x86_64") include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
isUniversalApk = true isUniversalApk = true
} }
}*/ }
signingConfigs { signingConfigs {
create("release") { create("release") {
@@ -57,13 +56,8 @@ android {
release { release {
signingConfig = signingConfigs.getByName("release") signingConfig = signingConfigs.getByName("release")
optimization { optimization {
enable = true enable = false
} }
isShrinkResources = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
} }
} }
compileOptions { compileOptions {