Compare commits

..
16 Commits
Author SHA1 Message Date
robin 4a43dbccaf Merge branch 'chore' 2026-10-03 15:37:54 +02:00
robin 57f1c727be chore: feat: add CHANGELOG
Build & Release Android App / build (push) Successful in 12m19s
2026-10-03 15:17:25 +02:00
robin 78d23f9cda fix
Build & Release Android App / build (push) Successful in 29m7s
2026-10-03 12:39:37 +02:00
robin 3472dc5e7f README.md hinzugefügt 2026-10-03 10:11:10 +00:00
robin 1bfe36309c fix
Build & Release Android App / build (push) Successful in 11m10s
2026-09-29 20:39:36 +02:00
robin 9ad23b2a3b fix
Build & Release Android App / build (push) Failing after 8m48s
2026-09-29 20:30:18 +02:00
robin 658f6a9506 fix
Build & Release Android App / build (push) Failing after 10m18s
2026-09-29 20:17:41 +02:00
robin f9b666fe15 chore: fix for 1.0.3 2026-09-29 20:10:43 +02:00
robin b1977d790d chore: fix for v1.0.2
Build & Release Android App / build (push) Successful in 12m16s
2026-09-29 19:53:01 +02:00
robin 2d70201c25 Merge pull request 'Feat/list improvement' (#7) from feat/list-improvement into main
Build & Release Android App / build (push) Successful in 13m6s
Reviewed-on: #7
2026-09-29 16:37:47 +00:00
robin 9b0a05e5ad Merge branch 'main' into feat/list-improvement 2026-09-29 16:37:38 +00:00
robin ea8294174e fix worklow 19
Build & Release Android App / build (push) Successful in 11m31s
2026-09-29 17:30:26 +02:00
robin 7059c63207 fix workflow 18
Build & Release Android App / build (push) Canceled after 7m31s
2026-09-29 17:21:23 +02:00
robin 261b2c332f fix workflow 17
Build & Release Android App / build (push) Failing after 14m32s
2026-09-29 17:01:40 +02:00
robin 7c584aa456 chore: update to gradle 9.7.1 2026-09-20 13:31:36 +02:00
robin e1e7742ecb Merge pull request 'Initial' (#4) from initial into main
Reviewed-on: #4
2026-09-19 17:29:57 +00:00
9 changed files with 128 additions and 79 deletions

No files matched your search

+92 -31
View File
@@ -10,6 +10,15 @@ 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
@@ -23,62 +32,114 @@ 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"
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
# 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" > local.properties
echo "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties"
- name: Android SDK Lizenzen vorab akzeptieren
- name: Keystore dekodieren
env:
KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
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"
echo "$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"
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 extrahieren
- name: Release-Notes aus CHANGELOG.md 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
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"
- 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
body_path: ${{ runner.temp }}/release_notes.md
files: app/build/outputs/apk/release/WeekFocus-*.apk
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+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_25" default="true" project-jdk-name="jbr-25" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
+3 -6
View File
@@ -1,9 +1,6 @@
# Changelog
## [1.0.1] - 2026-09-29
### Neu
- Erste stabile Version mit automatischen APK-Builds
- CHANGELOG.md als Release-Body
## [1.1.0] - 2026-10-03
### Behoben
- VersionCode und -Name
### New
- chore: auto-generate apk files #6
+1
View File
@@ -0,0 +1 @@
[![Get it on Obtainium](https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png)](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://git.schamagusa.de/Schanbro/WeekFocus/releases)
+13 -8
View File
@@ -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 {
@@ -35,8 +30,21 @@ android {
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
}
@@ -68,6 +76,3 @@ dependencies {
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) }
Binary file not shown.
+3 -3
View File
@@ -1,9 +1,9 @@
#Fri Sep 18 14:50:25 CEST 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Vendored
+3 -6
View File
@@ -20,7 +20,7 @@
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
# gradlew start up script for POSIX generated by Gradle.
#
# Important for running:
#
@@ -29,7 +29,7 @@
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
# ksh gradlew
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
Vendored
+12 -24
View File
@@ -19,12 +19,12 @@
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem gradlew startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Set local scope for the variables, and ensure extensions are enabled
setlocal EnableExtensions
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
"%COMSPEC%" /c exit 1
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,30 +65,18 @@ echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
"%COMSPEC%" /c exit 1
:execute
@rem Setup the command line
set CLASSPATH=
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
@rem Execute gradlew
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
@rem which allows us to clear the local environment before executing the java command
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
:exitWithErrorLevel
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
"%COMSPEC%" /c exit %ERRORLEVEL%