chore: apk-splits

chore: adjust workflow in Gitea
chore(deps): update versions
This commit is contained in:
robin committed 2026-10-07 15:19:22 +02:00
1 parent ff78c71ab5
commit 6206a47fc7
3 files changed
+57 -41

No files matched your search

+38 -29
View File
@@ -1,4 +1,3 @@
# .gitea/workflows/build-release.yml
name: Build & Release Android App name: Build & Release Android App
on: on:
@@ -19,6 +18,7 @@ jobs:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
- name: Code auschecken - name: Code auschecken
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -46,14 +46,12 @@ jobs:
rm /tmp/tools.zip rm /tmp/tools.zip
fi fi
# Lizenzen korrekt akzeptieren (kein "yes |", wegen pipefail/SIGPIPE)
"$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null "$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null
# Benötigte Pakete direkt installieren
"$SDKMANAGER" --sdk_root="$SDK_PATH" \ "$SDKMANAGER" --sdk_root="$SDK_PATH" \
"platform-tools" \ "platform-tools" \
"platforms;android-37.0" \ "platforms;android-37" \
"build-tools;36.0.0" "build-tools;37.0.0"
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV
@@ -66,38 +64,46 @@ 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
VERSION="${GITHUB_REF_NAME#v}" VERSION="${GITHUB_REF_NAME#v}"
echo "Baue Version: $VERSION" echo "Baue Version: $VERSION"
./gradlew assembleRelease \ ./gradlew assembleRelease \
--no-daemon \ --no-daemon \
-PversionNameOverride="$VERSION" -PversionNameOverride="$VERSION"
echo "Erzeugte APK-Dateien:"
find app/build/outputs -type f -name "*.apk" -print
APK_SOURCE="$(find app/build/outputs/apk/release -maxdepth 1 -type f -name "*.apk" ! -name "*unsigned*" | head -n 1)"
if [ -z "$APK_SOURCE" ]; then
echo "Keine Release-APK gefunden."
exit 1
fi
APK_DIR="app/build/outputs/apk/release" APK_DIR="app/build/outputs/apk/release"
APK_NAME="WeekFocus-${VERSION}.apk"
APK_TARGET="$APK_DIR/$APK_NAME"
mv "$APK_SOURCE" "$APK_TARGET" echo "Gefundene Original-APKs in $APK_DIR:"
"$ANDROID_HOME/build-tools/36.0.0/apksigner" verify --verbose "$APK_TARGET"
echo "APK erstellt: $APK_TARGET"
ls -lh "$APK_DIR" ls -lh "$APK_DIR"
for APK in "$APK_DIR"/*.apk; do
[ -e "$APK" ] || continue
if [[ "$APK" == *"unsigned"* || "$APK" == *"WeekFocus-"* ]]; then
continue
fi
FILENAME=$(basename "$APK")
VARIANT=$(echo "$FILENAME" | sed -E 's/^app-(.*)-release\.apk$/\1/')
if [ "$VARIANT" = "$FILENAME" ]; then
VARIANT="release"
fi
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
env: env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -134,30 +140,29 @@ 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 }}
run: | run: |
set -euo pipefail set -euo pipefail
TAG="$GITHUB_REF_NAME" TAG="$GITHUB_REF_NAME"
VERSION="${TAG#v}"
NOTES_FILE="$RUNNER_TEMP/release_notes.md" NOTES_FILE="$RUNNER_TEMP/release_notes.md"
AUTH="Authorization: token $TOKEN" AUTH="Authorization: token $TOKEN"
# Release holen oder neu anlegen
CODE=$(curl -sS -o release.json -w '%{http_code}' -H "$AUTH" "$API/releases/tags/$TAG") CODE=$(curl -sS -o release.json -w '%{http_code}' -H "$AUTH" "$API/releases/tags/$TAG")
if [ "$CODE" = "404" ]; then if [ "$CODE" = "404" ]; then
# Nach VERSION="${GITHUB_REF_NAME#v}" hinzufügen:
if [[ "$VERSION" =~ (alpha|beta|rc|dev) ]]; then if [[ "$VERSION" =~ (alpha|beta|rc|dev) ]]; then
IS_PRERELEASE="true" IS_PRERELEASE="true"
else else
IS_PRERELEASE="false" IS_PRERELEASE="false"
fi fi
# Dann beim jq-Aufruf:
jq -n --arg tag "$TAG" --arg name "$TAG" --rawfile body "$NOTES_FILE" \ jq -n --arg tag "$TAG" --arg name "$TAG" --rawfile body "$NOTES_FILE" \
--argjson prerelease "$IS_PRERELEASE" \ --argjson prerelease "$IS_PRERELEASE" \
'{tag_name:$tag, name:$name, body:$body, prerelease:$prerelease}' > payload.json '{tag_name:$tag, name:$name, body:$body, prerelease:$prerelease}' > payload.json
curl -fsS -X POST -H "$AUTH" -H "Content-Type: application/json" \ curl -fsS -X POST -H "$AUTH" -H "Content-Type: application/json" \
-d @payload.json "$API/releases" -o release.json -d @payload.json "$API/releases" -o release.json
elif [ "$CODE" != "200" ]; then elif [ "$CODE" != "200" ]; then
@@ -165,14 +170,18 @@ jobs:
cat release.json cat release.json
exit 1 exit 1
fi fi
RELEASE_ID=$(jq -r .id release.json) RELEASE_ID=$(jq -r .id release.json)
# APK hochladen, gleichnamige alte Assets vorher löschen
for APK in app/build/outputs/apk/release/WeekFocus-*.apk; do for APK in app/build/outputs/apk/release/WeekFocus-*.apk; do
[ -e "$APK" ] || continue
NAME=$(basename "$APK") NAME=$(basename "$APK")
echo "Lade Hoch: $NAME"
for ID in $(jq -r --arg n "$NAME" '.assets[]? | select(.name==$n) | .id' release.json); do for ID in $(jq -r --arg n "$NAME" '.assets[]? | select(.name==$n) | .id' release.json); do
curl -fsS -X DELETE -H "$AUTH" "$API/releases/$RELEASE_ID/assets/$ID" curl -fsS -X DELETE -H "$AUTH" "$API/releases/$RELEASE_ID/assets/$ID"
done done
curl -fsS -X POST -H "$AUTH" -F "attachment=@$APK" \ curl -fsS -X POST -H "$AUTH" -F "attachment=@$APK" \
"$API/releases/$RELEASE_ID/assets?name=$NAME" "$API/releases/$RELEASE_ID/assets?name=$NAME"
done done
+11 -5
View File
@@ -5,7 +5,6 @@ plugins {
val tagVersion = (project.findProperty("versionNameOverride") as String?) ?: "0.0.0-dev" val tagVersion = (project.findProperty("versionNameOverride") as String?) ?: "0.0.0-dev"
// "1.2.3" oder "1.2.3-alpha9" -> Kern "1.2.3" für den versionCode
val core = tagVersion val core = tagVersion
.removePrefix("v") .removePrefix("v")
.substringBefore("-") .substringBefore("-")
@@ -16,9 +15,7 @@ val patch = parts.getOrElse(2) { 0 }
android { android {
namespace = "de.schanbro.weekfocus" namespace = "de.schanbro.weekfocus"
compileSdk { compileSdk = 37
version = release(37)
}
defaultConfig { defaultConfig {
applicationId = "de.schanbro.weekfocus" applicationId = "de.schanbro.weekfocus"
@@ -30,6 +27,15 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
splits {
abi {
isEnable = true
reset()
include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
isUniversalApk = true
}
}
signingConfigs { signingConfigs {
create("release") { create("release") {
val ksPath = System.getenv("KEYSTORE_PATH") val ksPath = System.getenv("KEYSTORE_PATH")
@@ -79,5 +85,5 @@ dependencies {
androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.junit)
debugImplementation(libs.androidx.compose.ui.test.manifest) debugImplementation(libs.androidx.compose.ui.test.manifest)
debugImplementation(libs.androidx.compose.ui.tooling) debugImplementation(libs.androidx.compose.ui.tooling)
implementation("androidx.compose.material:material-icons-extended") implementation(libs.androidx.material.icons.extended)
} }
+8 -7
View File
@@ -1,13 +1,13 @@
[versions] [versions]
agp = "9.4.1" agp = "9.4.1"
coreKtx = "1.10.1" coreKtx = "1.19.1"
junit = "4.13.2" junit = "4.13.2"
junitVersion = "1.1.5" junitVersion = "1.3.0"
espressoCore = "3.5.1" espressoCore = "3.7.0"
lifecycleRuntimeKtx = "2.6.1" lifecycleRuntimeKtx = "2.11.0"
activityCompose = "1.8.0" activityCompose = "1.13.0"
kotlin = "2.2.10" kotlin = "2.4.20"
composeBom = "2026.02.01" composeBom = "2026.09.00"
[libraries] [libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -24,6 +24,7 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
[plugins] [plugins]
android-application = { id = "com.android.application", version.ref = "agp" } android-application = { id = "com.android.application", version.ref = "agp" }