diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 252985d..f931db1 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -1,32 +1,75 @@ +# .gitea/workflows/build-release.yml name: Build & Release Android App on: push: tags: - - 'v*' # Startet bei Tags wie v1.0.0, v1.0.1 etc. + - 'v*' 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 - # HIER IST DIE LÖSUNG: Java 25 statt 17 bereitstellen - - name: Java/JDK 25 einrichten - uses: actions/setup-java@v4 + - name: Java/JDK 17 einrichten + uses: actions/setup-java@v5 with: - java-version: '25' + java-version: '17' distribution: 'temurin' + cache: gradle - - name: Gradle einrichten - uses: gradle/actions/setup-gradle@v3 + - 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 + run: | + echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > "$RUNNER_TEMP/release.keystore" + echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV - name: Android Release APK bauen - # Keine fehleranfälligen Flags mehr nötig! - run: | - chmod +x gradlew - ./gradlew assembleRelease + run: ./gradlew assembleRelease --no-daemon + env: + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - name: Release in Gitea erstellen uses: softprops/action-gh-release@v2 diff --git a/.gitignore b/.gitignore index 565a541..7f59393 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,14 @@ *.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 diff --git a/.idea/misc.xml b/.idea/misc.xml index c2b3ddc..29a5cc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e3a9ded..89b1fe0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -19,26 +19,35 @@ 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 } } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_25 - targetCompatibility = JavaVersion.VERSION_25 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } buildFeatures { compose = true } } -kotlin { - jvmToolchain(25) -} - dependencies { implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.activity.compose) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5906617..d90d9f3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "9.4.0" +agp = "9.4.1" coreKtx = "1.10.1" junit = "4.13.2" junitVersion = "1.1.5" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60..eddabd2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d214e..ad7845b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index ef07e01..249efbb 100755 --- a/gradlew +++ b/gradlew @@ -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" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index 5eed7ee..8508ef6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -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%