forked from Schanbro/WeekFocus
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b1977d790d | ||
|
|
3d5cc10a1a | ||
|
|
52a758ff16 | ||
|
|
7dde81a715 | ||
|
|
e563b2e796 | ||
|
|
c27184551c |
No files matched your search
@@ -9,6 +9,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Code auschecken
|
- name: Code auschecken
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -23,43 +24,101 @@ jobs:
|
|||||||
- name: Rechte für gradlew setzen
|
- name: Rechte für gradlew setzen
|
||||||
run: chmod +x gradlew
|
run: chmod +x gradlew
|
||||||
|
|
||||||
- name: Android SDK Pfad prüfen & einrichten
|
- name: Android SDK einrichten
|
||||||
run: |
|
run: |
|
||||||
if [ -d "/usr/local/lib/android/sdk" ]; then
|
set -euo pipefail
|
||||||
SDK_PATH="/usr/local/lib/android/sdk"
|
|
||||||
elif [ -d "/opt/android-sdk" ]; then
|
SDK_PATH="$HOME/android-sdk"
|
||||||
SDK_PATH="/opt/android-sdk"
|
SDKMANAGER="$SDK_PATH/cmdline-tools/latest/bin/sdkmanager"
|
||||||
else
|
|
||||||
echo "Android SDK nicht gefunden. Installiere cmdline-tools..."
|
if [ ! -x "$SDKMANAGER" ]; then
|
||||||
SDK_PATH="$HOME/android-sdk"
|
echo "Installiere Android cmdline-tools..."
|
||||||
|
|
||||||
mkdir -p "$SDK_PATH/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
|
curl -sSL \
|
||||||
unzip -q tools.zip
|
-o /tmp/tools.zip \
|
||||||
mv cmdline-tools latest
|
https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
|
||||||
rm tools.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
|
fi
|
||||||
|
|
||||||
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
|
echo "Akzeptiere Android-SDK-Lizenzen..."
|
||||||
echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV
|
"$SDKMANAGER" \
|
||||||
echo "sdk.dir=$SDK_PATH" > local.properties
|
--sdk_root="$SDK_PATH" \
|
||||||
|
--licenses < <(yes) > /dev/null
|
||||||
|
|
||||||
- name: Android SDK Lizenzen vorab akzeptieren
|
echo "Installiere benötigte Android-SDK-Pakete..."
|
||||||
|
"$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: |
|
run: |
|
||||||
LIC_DIR="${ANDROID_HOME:-$HOME/android-sdk}/licenses"
|
set -euo pipefail
|
||||||
mkdir -p "$LIC_DIR"
|
|
||||||
echo -e "\n24333f8a637b37ea6d1270c750f0160576065016" > "$LIC_DIR/android-sdk-license"
|
echo "${{ secrets.KEYSTORE_BASE64 }}" \
|
||||||
echo -e "\n84831b9409646a456e88576d19212d3582701724" >> "$LIC_DIR/android-sdk-license"
|
| base64 -d > "$RUNNER_TEMP/release.keystore"
|
||||||
echo -e "\nd975f751698a7780098d5c6814341db27684b376" > "$LIC_DIR/android-sdk-preview-license"
|
|
||||||
echo -e "\n33b6a2b64607f11b759f320ef9dff4ae5e40007e" > "$LIC_DIR/android-googletv-license"
|
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> "$GITHUB_ENV"
|
||||||
echo -e "\n6010077ebe6b4f930974d1266684e201b8723913" > "$LIC_DIR/android-googlexr-license"
|
|
||||||
|
|
||||||
- name: Android Release APK bauen
|
- name: Android Release APK bauen
|
||||||
run: ./gradlew assembleRelease --no-daemon
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
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: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
if [ ! -s release-notes.md ]; then
|
||||||
|
echo "Keine Release-Notes für Version $VERSION vorhanden." \
|
||||||
|
> release-notes.md
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Release in Gitea erstellen
|
- name: Release in Gitea erstellen
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
|
tag_name: ${{ github.ref_name }}
|
||||||
|
name: ${{ github.ref_name }}
|
||||||
|
body_path: release-notes.md
|
||||||
files: app/build/outputs/apk/release/*.apk
|
files: app/build/outputs/apk/release/*.apk
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
+2
-1
@@ -1,13 +1,14 @@
|
|||||||
*.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_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" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<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
|
||||||
+13
-2
@@ -3,6 +3,17 @@ 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 {
|
||||||
@@ -13,8 +24,8 @@ android {
|
|||||||
applicationId = "de.schanbro.weekfocus"
|
applicationId = "de.schanbro.weekfocus"
|
||||||
minSdk = 29
|
minSdk = 29
|
||||||
targetSdk = 37
|
targetSdk = 37
|
||||||
versionCode = 1
|
versionCode = major * 10000 + minor * 100 + patch
|
||||||
versionName = "1.0"
|
versionName = tagVersion
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
[versions]
|
[versions]
|
||||||
agp = "9.4.0"
|
agp = "9.4.1"
|
||||||
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