Compare commits

..
1 Commits
Author SHA1 Message Date
robin e1e7742ecb Merge pull request 'Initial' (#4) from initial into main
Reviewed-on: #4
2026-09-19 17:29:57 +00:00
6 changed files with 22 additions and 158 deletions

No files matched your search

+11 -120
View File
@@ -1,145 +1,36 @@
# .gitea/workflows/build-release.yml
name: Build & Release Android App
on:
push:
tags:
- 'v*'
- 'v*' # Startet bei Tags wie v1.0.0, v1.0.1 etc.
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Secrets prüfen
run: |
[ -n "$KEYSTORE_PASSWORD" ] && echo "KEYSTORE_PASSWORD gesetzt" || echo "KEYSTORE_PASSWORD LEER"
[ -n "$KEY_ALIAS" ] && echo "KEY_ALIAS gesetzt" || echo "KEY_ALIAS LEER"
[ -n "$KEY_PASSWORD" ] && echo "KEY_PASSWORD gesetzt" || echo "KEY_PASSWORD LEER"
env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
- name: Code auschecken
uses: actions/checkout@v4
- name: Java/JDK 17 einrichten
uses: actions/setup-java@v5
# HIER IST DIE LÖSUNG: Java 25 statt 17 bereitstellen
- name: Java/JDK 25 einrichten
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '25'
distribution: 'temurin'
cache: gradle
- name: Rechte für gradlew setzen
run: chmod +x gradlew
- name: Android SDK einrichten
run: |
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"
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
# Lizenzen korrekt akzeptieren (kein "yes |", wegen pipefail/SIGPIPE)
"$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null
# Benötigte Pakete direkt installieren
"$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
env:
KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
run: |
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
- name: Gradle einrichten
uses: gradle/actions/setup-gradle@v3
- name: Android Release APK bauen
# Keine fehleranfälligen Flags mehr nötig!
run: |
set -euo pipefail
VERSION="${GITHUB_REF_NAME#v}"
echo "Baue Version: $VERSION"
./gradlew assembleRelease \
--no-daemon \
-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_NAME="WeekFocus-${VERSION}.apk"
APK_TARGET="$APK_DIR/$APK_NAME"
mv "$APK_SOURCE" "$APK_TARGET"
"$ANDROID_HOME/build-tools/36.0.0/apksigner" verify --verbose "$APK_TARGET"
echo "APK erstellt: $APK_TARGET"
ls -lh "$APK_DIR"
env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
- name: Release-Notes aus CHANGELOG.md extrahieren
run: |
VERSION="${GITHUB_REF_NAME#v}"
NOTES_FILE="$RUNNER_TEMP/release_notes.md"
if [ -f CHANGELOG.md ]; then
awk -v ver="$VERSION" '
/^##[[:space:]]/ {
if (found) exit
line = $0
sub(/^##[[:space:]]+/, "", line)
sub(/^\[?v?/, "", line)
if (substr(line, 1, length(ver)) == ver) {
rest = substr(line, length(ver) + 1)
if (rest ~ /^([^0-9.]|$)/) { found = 1 }
}
next
}
found { print }
' CHANGELOG.md > "$NOTES_FILE"
else
: > "$NOTES_FILE"
fi
if ! grep -q '[^[:space:]]' "$NOTES_FILE"; then
echo "Keine Release-Notes für Version $VERSION vorhanden." > "$NOTES_FILE"
fi
echo "Release-Notes:"
cat "$NOTES_FILE"
chmod +x gradlew
./gradlew assembleRelease
- name: Release in Gitea erstellen
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ github.ref_name }}
name: ${{ github.ref_name }}
body_path: ${{ runner.temp }}/release_notes.md
files: app/build/outputs/apk/release/WeekFocus-*.apk
files: app/build/outputs/apk/release/*.apk
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+1 -2
View File
@@ -1,14 +1,13 @@
*.iml
.gradle
.idea
/local.properties
/.idea
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
/.idea/misc.xml
.DS_Store
/build
/captures
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_25" project-jdk-name="jbr-25" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
-6
View File
@@ -1,6 +0,0 @@
# Changelog
## [1.1.0] - 2026-10-03
### New
- chore: auto-generate apk files #6
+8 -28
View File
@@ -3,17 +3,6 @@ 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 }
android {
namespace = "de.schanbro.weekfocus"
compileSdk {
@@ -24,41 +13,32 @@ android {
applicationId = "de.schanbro.weekfocus"
minSdk = 29
targetSdk = 37
versionCode = major * 10000 + minor * 100 + patch
versionName = tagVersion
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
signingConfigs {
create("release") {
val ksPath = System.getenv("KEYSTORE_PATH")
if (ksPath != null) {
storeFile = file(ksPath)
storePassword = System.getenv("KEYSTORE_PASSWORD")
keyAlias = System.getenv("KEY_ALIAS")
keyPassword = System.getenv("KEY_PASSWORD")
}
}
}
buildTypes {
release {
signingConfig = signingConfigs.getByName("release")
optimization {
enable = false
}
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_25
targetCompatibility = JavaVersion.VERSION_25
}
buildFeatures {
compose = true
}
}
kotlin {
jvmToolchain(25)
}
dependencies {
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.activity.compose)
+1 -1
View File
@@ -1,5 +1,5 @@
[versions]
agp = "9.4.1"
agp = "9.4.0"
coreKtx = "1.10.1"
junit = "4.13.2"
junitVersion = "1.1.5"