Compare commits
1
Commits
v1.0.5
..
e1e7742ecb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1e7742ecb |
No files matched your search
@@ -1,75 +1,32 @@
|
|||||||
# .gitea/workflows/build-release.yml
|
|
||||||
name: Build & Release Android App
|
name: Build & Release Android App
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- 'v*' # Startet bei Tags wie v1.0.0, v1.0.1 etc.
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
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
|
- name: Code auschecken
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Java/JDK 17 einrichten
|
# HIER IST DIE LÖSUNG: Java 25 statt 17 bereitstellen
|
||||||
uses: actions/setup-java@v5
|
- name: Java/JDK 25 einrichten
|
||||||
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '17'
|
java-version: '25'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
cache: gradle
|
|
||||||
|
|
||||||
- name: Rechte für gradlew setzen
|
- name: Gradle einrichten
|
||||||
run: chmod +x gradlew
|
uses: gradle/actions/setup-gradle@v3
|
||||||
|
|
||||||
- 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
|
- name: Android Release APK bauen
|
||||||
run: ./gradlew assembleRelease --no-daemon
|
# Keine fehleranfälligen Flags mehr nötig!
|
||||||
env:
|
run: |
|
||||||
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
chmod +x gradlew
|
||||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
./gradlew assembleRelease
|
||||||
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
|
|
||||||
|
|
||||||
- name: Release in Gitea erstellen
|
- name: Release in Gitea erstellen
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
|
|||||||
+1
-2
@@ -1,14 +1,13 @@
|
|||||||
*.iml
|
*.iml
|
||||||
.gradle
|
.gradle
|
||||||
|
.idea
|
||||||
/local.properties
|
/local.properties
|
||||||
/.idea
|
|
||||||
/.idea/caches
|
/.idea/caches
|
||||||
/.idea/libraries
|
/.idea/libraries
|
||||||
/.idea/modules.xml
|
/.idea/modules.xml
|
||||||
/.idea/workspace.xml
|
/.idea/workspace.xml
|
||||||
/.idea/navEditor.xml
|
/.idea/navEditor.xml
|
||||||
/.idea/assetWizardSettings.xml
|
/.idea/assetWizardSettings.xml
|
||||||
/.idea/misc.xml
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
/build
|
/build
|
||||||
/captures
|
/captures
|
||||||
|
|||||||
Generated
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<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" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
# Changelog
|
|
||||||
|
|
||||||
## [1.0.1] - 2026-09-29
|
|
||||||
### Neu
|
|
||||||
- Erste stabile Version mit automatischen APK-Builds
|
|
||||||
- CHANGELOG.md als Release-Body
|
|
||||||
|
|
||||||
### Behoben
|
|
||||||
- VersionCode und -Name
|
|
||||||
+8
-15
@@ -3,17 +3,6 @@ plugins {
|
|||||||
alias(libs.plugins.kotlin.compose)
|
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 {
|
android {
|
||||||
namespace = "de.schanbro.weekfocus"
|
namespace = "de.schanbro.weekfocus"
|
||||||
compileSdk {
|
compileSdk {
|
||||||
@@ -24,8 +13,8 @@ android {
|
|||||||
applicationId = "de.schanbro.weekfocus"
|
applicationId = "de.schanbro.weekfocus"
|
||||||
minSdk = 29
|
minSdk = 29
|
||||||
targetSdk = 37
|
targetSdk = 37
|
||||||
versionCode = major * 10000 + minor * 100 + patch
|
versionCode = 1
|
||||||
versionName = tagVersion
|
versionName = "1.0"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
@@ -38,14 +27,18 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = JavaVersion.VERSION_25
|
||||||
targetCompatibility = JavaVersion.VERSION_11
|
targetCompatibility = JavaVersion.VERSION_25
|
||||||
}
|
}
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
compose = true
|
compose = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kotlin {
|
||||||
|
jvmToolchain(25)
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(platform(libs.androidx.compose.bom))
|
implementation(platform(libs.androidx.compose.bom))
|
||||||
implementation(libs.androidx.activity.compose)
|
implementation(libs.androidx.activity.compose)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
[versions]
|
[versions]
|
||||||
agp = "9.4.1"
|
agp = "9.4.0"
|
||||||
coreKtx = "1.10.1"
|
coreKtx = "1.10.1"
|
||||||
junit = "4.13.2"
|
junit = "4.13.2"
|
||||||
junitVersion = "1.1.5"
|
junitVersion = "1.1.5"
|
||||||
|
|||||||
Reference in new issue
Block a user