Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d9c1942f2a | ||
|
|
bc6edc4a04 | ||
|
|
d03f9eee67 | ||
|
|
7eff7300d0 | ||
|
|
8458f0fce5 | ||
|
|
e444abecae | ||
|
|
3bac488893 | ||
|
|
b8195b74f1 | ||
|
|
f431fb272d |
No files matched your search
@@ -50,7 +50,7 @@ jobs:
|
|||||||
|
|
||||||
"$SDKMANAGER" --sdk_root="$SDK_PATH" \
|
"$SDKMANAGER" --sdk_root="$SDK_PATH" \
|
||||||
"platform-tools" \
|
"platform-tools" \
|
||||||
"platforms;android-35" \
|
"platforms;android-37" \
|
||||||
"build-tools;35.0.0"
|
"build-tools;35.0.0"
|
||||||
|
|
||||||
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
|
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
|
||||||
@@ -64,7 +64,7 @@ jobs:
|
|||||||
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
|
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
|
||||||
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
|
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Android Release APKs bauen
|
- name: Android Release APK bauen
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
@@ -74,37 +74,28 @@ jobs:
|
|||||||
./gradlew assembleRelease \
|
./gradlew assembleRelease \
|
||||||
--no-daemon \
|
--no-daemon \
|
||||||
-Dorg.gradle.java.home="$JAVA_HOME" \
|
-Dorg.gradle.java.home="$JAVA_HOME" \
|
||||||
|
-Porg.gradle.java.installations.auto-download=false \
|
||||||
-PversionNameOverride="$VERSION"
|
-PversionNameOverride="$VERSION"
|
||||||
|
|
||||||
APK_DIR="app/build/outputs/apk/release"
|
APK_DIR="app/build/outputs/apk/release"
|
||||||
|
|
||||||
echo "Gefundene Original-APKs in $APK_DIR:"
|
echo "Gefundene APKs in $APK_DIR:"
|
||||||
ls -lh "$APK_DIR"
|
ls -lh "$APK_DIR"
|
||||||
|
|
||||||
for APK in "$APK_DIR"/*.apk; do
|
SRC="$APK_DIR/app-release.apk"
|
||||||
[ -e "$APK" ] || continue
|
if [ ! -f "$SRC" ]; then
|
||||||
|
echo "app-release.apk nicht gefunden (evtl. unsigniert oder anderer Name)"
|
||||||
if [[ "$APK" == *"unsigned"* || "$APK" == *"WeekFocus-"* ]]; then
|
exit 1
|
||||||
continue
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
FILENAME=$(basename "$APK")
|
TARGET_PATH="$APK_DIR/WeekFocus-${VERSION}.apk"
|
||||||
VARIANT=$(echo "$FILENAME" | sed -E 's/^app-(.*)-release\.apk$/\1/')
|
mv "$SRC" "$TARGET_PATH"
|
||||||
if [ "$VARIANT" = "$FILENAME" ]; then
|
|
||||||
VARIANT="release"
|
|
||||||
fi
|
|
||||||
|
|
||||||
TARGET_NAME="WeekFocus-${VERSION}-${VARIANT}.apk"
|
echo "Signatur prüfen für $(basename "$TARGET_PATH")..."
|
||||||
TARGET_PATH="$APK_DIR/$TARGET_NAME"
|
|
||||||
|
|
||||||
mv "$APK" "$TARGET_PATH"
|
|
||||||
|
|
||||||
echo "Signatur prüfen für $TARGET_NAME..."
|
|
||||||
"$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH"
|
"$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH"
|
||||||
done
|
|
||||||
|
|
||||||
echo "Finale Release-APKs:"
|
echo "Finale Release-APK:"
|
||||||
ls -lh "$APK_DIR"/WeekFocus-*.apk
|
ls -lh "$TARGET_PATH"
|
||||||
env:
|
env:
|
||||||
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
||||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
||||||
@@ -141,7 +132,7 @@ jobs:
|
|||||||
echo "Release-Notes:"
|
echo "Release-Notes:"
|
||||||
cat "$NOTES_FILE"
|
cat "$NOTES_FILE"
|
||||||
|
|
||||||
- name: Release in Gitea erstellen und APKs hochladen
|
- name: Release in Gitea erstellen und APK hochladen
|
||||||
env:
|
env:
|
||||||
TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
||||||
|
|||||||
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" default="true" project-jdk-name="jbr-25" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" 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">
|
||||||
|
|||||||
@@ -27,14 +27,15 @@ android {
|
|||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
||||||
splits {
|
// not necessary
|
||||||
|
/*splits {
|
||||||
abi {
|
abi {
|
||||||
isEnable = true
|
isEnable = true
|
||||||
reset()
|
reset()
|
||||||
include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
|
include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
|
||||||
isUniversalApk = true
|
isUniversalApk = true
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
create("release") {
|
create("release") {
|
||||||
@@ -56,8 +57,13 @@ android {
|
|||||||
release {
|
release {
|
||||||
signingConfig = signingConfigs.getByName("release")
|
signingConfig = signingConfigs.getByName("release")
|
||||||
optimization {
|
optimization {
|
||||||
enable = false
|
enable = true
|
||||||
}
|
}
|
||||||
|
isShrinkResources = true
|
||||||
|
proguardFiles(
|
||||||
|
getDefaultProguardFile("proguard-android-optimize.txt"),
|
||||||
|
"proguard-rules.pro"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
#This file is generated by updateDaemonJvm
|
|
||||||
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
|
|
||||||
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
|
|
||||||
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
|
|
||||||
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
|
|
||||||
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
|
|
||||||
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
|
|
||||||
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
|
|
||||||
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
|
|
||||||
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
|
|
||||||
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
|
|
||||||
toolchainVersion=25
|
|
||||||
Reference in new issue
Block a user