From 7dde81a715cc80bbcf51d5908a2da2851a5a46e3 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 29 Sep 2026 19:17:53 +0200 Subject: [PATCH 1/5] chore: v1.0.1 --- .gitea/workflows/release.yaml | 21 ++++++++++++++++++++- app/build.gradle.kts | 26 +++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 31ed339..3b28ccc 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -55,11 +55,30 @@ jobs: echo -e "\n6010077ebe6b4f930974d1266684e201b8723913" > "$LIC_DIR/android-googlexr-license" - name: Android Release APK bauen - run: ./gradlew assembleRelease --no-daemon + run: | + VERSION="${GITHUB_REF_NAME#v}" + ./gradlew assembleRelease --no-daemon -PversionNameOverride="$VERSION" + env: + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + + - name: Release-Notes extrahieren + run: | + VERSION="${GITHUB_REF_NAME#v}" + awk -v v="$VERSION" ' + index($0, "## [" v "]") == 1 {found=1; next} + found && /^## \[/ {exit} + found {print} + ' CHANGELOG.md > release-notes.md + [ -s release-notes.md ] || echo "Keine Release-Notes vorhanden." > release-notes.md - name: Release in Gitea erstellen uses: softprops/action-gh-release@v2 with: + tag_name: ${{ github.ref_name }} + name: ${{ github.ref_name }} files: app/build/outputs/apk/release/*.apk + body_path: release-notes.md env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 096fbdd..06b612f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,6 +3,22 @@ plugins { alias(libs.plugins.kotlin.compose) } +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 + .removePrefix("v") + .substringBefore("-") +val parts = core.split(".").map { it.toIntOrNull() ?: 0 } +val major = parts.getOrElse(0) { 0 } +val minor = parts.getOrElse(1) { 0 } +val patch = parts.getOrElse(2) { 0 } + +val copyChangelog by tasks.registering(Copy::class) { + from(rootProject.file("CHANGELOG.md")) + into(layout.buildDirectory.dir("generated/changelog")) +} + android { namespace = "de.schanbro.weekfocus" compileSdk { @@ -13,8 +29,8 @@ android { applicationId = "de.schanbro.weekfocus" minSdk = 29 targetSdk = 37 - versionCode = 1 - versionName = "1.0" + versionCode = major * 10000 + minor * 100 + patch + versionName = tagVersion testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -33,6 +49,7 @@ android { buildFeatures { compose = true } + sourceSets["main"].assets.srcDir(layout.buildDirectory.dir("generated/changelog")) } dependencies { @@ -51,4 +68,7 @@ dependencies { androidTestImplementation(libs.androidx.junit) debugImplementation(libs.androidx.compose.ui.test.manifest) debugImplementation(libs.androidx.compose.ui.tooling) -} \ No newline at end of file +} + +tasks.matching { it.name.startsWith("merge") && it.name.endsWith("Assets") } + .configureEach { dependsOn(copyChangelog) } \ No newline at end of file -- 2.54.1 From 52a758ff163eb5bb5c2f982db8b6cdccd5e69c1d Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 29 Sep 2026 19:18:16 +0200 Subject: [PATCH 2/5] chore: add CHANGELOG --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..fa6c756 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +# Changelog + +## [1.0.1] - 2026-09-29 +### Neu +- Erste stabile Version mit automatischen APK-Builds +- CHANGELOG.md als Release-Body + +### Behoben +- VersionCode und -Name \ No newline at end of file -- 2.54.1 From 3d5cc10a1abdb6d34c3a46dbd6732a675b55d5bb Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 29 Sep 2026 19:28:26 +0200 Subject: [PATCH 3/5] chore: fix for v1.0.1 --- app/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 06b612f..6628f16 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -49,7 +49,6 @@ android { buildFeatures { compose = true } - sourceSets["main"].assets.srcDir(layout.buildDirectory.dir("generated/changelog")) } dependencies { -- 2.54.1 From b1977d790d6578381807c008eef01035af3c18b3 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 29 Sep 2026 19:53:01 +0200 Subject: [PATCH 4/5] chore: fix for v1.0.2 --- .gitea/workflows/release.yaml | 102 +++++++++++++++++++++++----------- app/build.gradle.kts | 10 +--- 2 files changed, 72 insertions(+), 40 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 3b28ccc..87319a5 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -9,6 +9,7 @@ on: jobs: build: runs-on: ubuntu-latest + steps: - name: Code auschecken uses: actions/checkout@v4 @@ -23,41 +24,64 @@ jobs: - name: Rechte für gradlew setzen run: chmod +x gradlew - - name: Android SDK Pfad prüfen & einrichten + - name: Android SDK einrichten run: | - if [ -d "/usr/local/lib/android/sdk" ]; then - SDK_PATH="/usr/local/lib/android/sdk" - elif [ -d "/opt/android-sdk" ]; then - SDK_PATH="/opt/android-sdk" - else - echo "Android SDK nicht gefunden. Installiere cmdline-tools..." - SDK_PATH="$HOME/android-sdk" + set -euo pipefail + + SDK_PATH="$HOME/android-sdk" + SDKMANAGER="$SDK_PATH/cmdline-tools/latest/bin/sdkmanager" + + if [ ! -x "$SDKMANAGER" ]; then + echo "Installiere Android cmdline-tools..." + mkdir -p "$SDK_PATH/cmdline-tools" - cd "$SDK_PATH/cmdline-tools" - curl -s -o tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip - unzip -q tools.zip - mv cmdline-tools latest - rm tools.zip + + curl -sSL \ + -o /tmp/tools.zip \ + https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip + + unzip -q /tmp/tools.zip -d "$SDK_PATH/cmdline-tools" + mv "$SDK_PATH/cmdline-tools/cmdline-tools" \ + "$SDK_PATH/cmdline-tools/latest" + + rm /tmp/tools.zip fi - echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV - echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV - echo "sdk.dir=$SDK_PATH" > local.properties + echo "Akzeptiere Android-SDK-Lizenzen..." + "$SDKMANAGER" \ + --sdk_root="$SDK_PATH" \ + --licenses < <(yes) > /dev/null - - name: Android SDK Lizenzen vorab akzeptieren + echo "Installiere benötigte Android-SDK-Pakete..." + "$SDKMANAGER" \ + --sdk_root="$SDK_PATH" \ + "platform-tools" \ + "platforms;android-37.0" \ + "build-tools;36.0.0" + + echo "ANDROID_HOME=$SDK_PATH" >> "$GITHUB_ENV" + echo "ANDROID_SDK_ROOT=$SDK_PATH" >> "$GITHUB_ENV" + + echo "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties" + + - name: Keystore dekodieren run: | - LIC_DIR="${ANDROID_HOME:-$HOME/android-sdk}/licenses" - mkdir -p "$LIC_DIR" - echo -e "\n24333f8a637b37ea6d1270c750f0160576065016" > "$LIC_DIR/android-sdk-license" - echo -e "\n84831b9409646a456e88576d19212d3582701724" >> "$LIC_DIR/android-sdk-license" - echo -e "\nd975f751698a7780098d5c6814341db27684b376" > "$LIC_DIR/android-sdk-preview-license" - echo -e "\n33b6a2b64607f11b759f320ef9dff4ae5e40007e" > "$LIC_DIR/android-googletv-license" - echo -e "\n6010077ebe6b4f930974d1266684e201b8723913" > "$LIC_DIR/android-googlexr-license" + set -euo pipefail + + echo "${{ secrets.KEYSTORE_BASE64 }}" \ + | base64 -d > "$RUNNER_TEMP/release.keystore" + + echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> "$GITHUB_ENV" - name: Android Release APK bauen run: | + set -euo pipefail + VERSION="${GITHUB_REF_NAME#v}" - ./gradlew assembleRelease --no-daemon -PversionNameOverride="$VERSION" + + ./gradlew assembleRelease \ + --no-daemon \ + -PversionNameOverride="$VERSION" env: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} @@ -65,20 +89,36 @@ jobs: - name: Release-Notes extrahieren run: | + set -euo pipefail + VERSION="${GITHUB_REF_NAME#v}" + awk -v v="$VERSION" ' - index($0, "## [" v "]") == 1 {found=1; next} - found && /^## \[/ {exit} - found {print} + index($0, "## [" v "]") == 1 { + found=1 + next + } + + found && /^## \[/ { + exit + } + + found { + print + } ' CHANGELOG.md > release-notes.md - [ -s release-notes.md ] || echo "Keine Release-Notes vorhanden." > release-notes.md + + if [ ! -s release-notes.md ]; then + echo "Keine Release-Notes für Version $VERSION vorhanden." \ + > release-notes.md + fi - name: Release in Gitea erstellen uses: softprops/action-gh-release@v2 with: tag_name: ${{ github.ref_name }} name: ${{ github.ref_name }} - files: app/build/outputs/apk/release/*.apk body_path: release-notes.md + files: app/build/outputs/apk/release/*.apk env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6628f16..6a44fd2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,11 +14,6 @@ val major = parts.getOrElse(0) { 0 } val minor = parts.getOrElse(1) { 0 } val patch = parts.getOrElse(2) { 0 } -val copyChangelog by tasks.registering(Copy::class) { - from(rootProject.file("CHANGELOG.md")) - into(layout.buildDirectory.dir("generated/changelog")) -} - android { namespace = "de.schanbro.weekfocus" compileSdk { @@ -67,7 +62,4 @@ dependencies { androidTestImplementation(libs.androidx.junit) debugImplementation(libs.androidx.compose.ui.test.manifest) debugImplementation(libs.androidx.compose.ui.tooling) -} - -tasks.matching { it.name.startsWith("merge") && it.name.endsWith("Assets") } - .configureEach { dependsOn(copyChangelog) } \ No newline at end of file +} \ No newline at end of file -- 2.54.1 From f9b666fe15900e67ca31fa7e75fbd05c3182a576 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 29 Sep 2026 20:10:43 +0200 Subject: [PATCH 5/5] chore: fix for 1.0.3 --- .gitea/workflows/release.yaml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 87319a5..d083410 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -78,10 +78,22 @@ jobs: set -euo pipefail VERSION="${GITHUB_REF_NAME#v}" + APK_DIR="app/build/outputs/apk/release" + APK_NAME="WeekFocus-${VERSION}.apk" ./gradlew assembleRelease \ --no-daemon \ -PversionNameOverride="$VERSION" + + mv "$APK_DIR/app-release.apk" "$APK_DIR/$APK_NAME" + + echo "APK erstellt: $APK_DIR/$APK_NAME" + ls -lh "$APK_DIR" + env: + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + env: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} @@ -119,6 +131,14 @@ jobs: tag_name: ${{ github.ref_name }} name: ${{ github.ref_name }} body_path: release-notes.md - files: app/build/outputs/apk/release/*.apk + files: app/build/outputs/apk/release/WeekFocus-*.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: APK-Version prüfen + run: | + VERSION="${GITHUB_REF_NAME#v}" + + "$ANDROID_HOME/build-tools/36.0.0/aapt" dump badging \ + "app/build/outputs/apk/release/WeekFocus-${VERSION}.apk" \ + | grep -E "versionCode|versionName" -- 2.54.1