Compare commits
6
Commits
v0.0.1-alpha7
...
v1.0.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3d5cc10a1a | ||
|
|
52a758ff16 | ||
|
|
7dde81a715 | ||
|
|
e563b2e796 | ||
|
|
c27184551c | ||
|
|
f275ffe0ba |
No files matched your search
@@ -14,7 +14,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Java/JDK 17 einrichten
|
||||
uses: actions/setup-java@v4
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'temurin'
|
||||
@@ -23,21 +23,62 @@ jobs:
|
||||
- name: Rechte für gradlew setzen
|
||||
run: chmod +x gradlew
|
||||
|
||||
- name: Android SDK Pfad prüfen & 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"
|
||||
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
|
||||
fi
|
||||
|
||||
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
|
||||
echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV
|
||||
echo "sdk.dir=$SDK_PATH" > local.properties
|
||||
|
||||
- name: Android SDK Lizenzen vorab akzeptieren
|
||||
run: |
|
||||
mkdir -p $ANDROID_HOME/licenses
|
||||
echo -e "\n24333f8a637b37ea6d1270c750f0160576065016" > $ANDROID_HOME/licenses/android-sdk-license
|
||||
echo -e "\n84831b9409646a456e88576d19212d3582701724" >> $ANDROID_HOME/licenses/android-sdk-license
|
||||
echo -e "\nd975f751698a7780098d5c6814341db27684b376" > $ANDROID_HOME/licenses/android-sdk-preview-license
|
||||
echo -e "\n33b6a2b64607f11b759f320ef9dff4ae5e40007e" > $ANDROID_HOME/licenses/android-googletv-license
|
||||
echo -e "\n6010077ebe6b4f930974d1266684e201b8723913" > $ANDROID_HOME/licenses/android-googlexr-license
|
||||
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"
|
||||
|
||||
- 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 }}
|
||||
+2
-1
@@ -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
|
||||
|
||||
Generated
+1
-1
@@ -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_1_7">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_25" project-jdk-name="jbr-25" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
||||
@@ -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
|
||||
+21
-2
@@ -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"
|
||||
}
|
||||
@@ -52,3 +68,6 @@ 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) }
|
||||
@@ -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"
|
||||
|
||||
Reference in new issue
Block a user