ci: prefer github token for release asset upload

.gitea/workflows/android-build.yml

@@ -0,0 +1,179 @@
+name: Android build
+
+permissions:
+  contents: write
+  releases: write
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+  release:
+    types:
+      - published
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Java 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: '17'
+
+      - name: Install Android SDK command-line tools and packages
+        shell: bash
+        run: |
+          set -euxo pipefail
+          export ANDROID_SDK_ROOT="$HOME/.android/sdk"
+          export ANDROID_HOME="$ANDROID_SDK_ROOT"
+          mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools"
+          if [ ! -x "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" ]; then
+            tools_url="$(curl -fsSL https://developer.android.com/studio | grep -o 'https://dl.google.com/android/repository/commandlinetools-linux-[0-9][0-9]*_latest.zip' | head -n 1)"
+            test -n "$tools_url"
+            curl -fsSL -o /tmp/commandlinetools.zip "$tools_url"
+            rm -rf "$ANDROID_SDK_ROOT/cmdline-tools/latest" "$ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools"
+            unzip -q /tmp/commandlinetools.zip -d "$ANDROID_SDK_ROOT/cmdline-tools"
+            mv "$ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools" "$ANDROID_SDK_ROOT/cmdline-tools/latest"
+          fi
+          export PATH="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$PATH"
+          set +o pipefail
+          yes | sdkmanager --licenses >/dev/null
+          set -o pipefail
+          sdkmanager \
+            "platform-tools" \
+            "platforms;android-36" \
+            "build-tools;36.0.0" \
+            "ndk;27.2.12479018" \
+            "cmake;3.22.1"
+
+      - name: Prepare optional release signing
+        if: github.event_name == 'release'
+        continue-on-error: true
+        env:
+          ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+          ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          missing=()
+          for key in ANDROID_KEYSTORE_BASE64 ANDROID_KEYSTORE_PASSWORD ANDROID_KEY_ALIAS ANDROID_KEY_PASSWORD; do
+            if [ -z "${!key:-}" ]; then
+              missing+=("$key")
+            fi
+          done
+          if [ ${#missing[@]} -gt 0 ]; then
+            printf -v missing_csv '%s, ' "${missing[@]}"
+            missing_csv="${missing_csv%, }"
+            echo "::error::Release signing secrets missing: ${missing_csv}. Continuing with unsigned/default-signed release AAB."
+            exit 1
+          fi
+          mkdir -p .ci-secrets
+          printf '%s' "$ANDROID_KEYSTORE_BASE64" | base64 -d > .ci-secrets/release-keystore.jks
+          cat > keystore.properties <<EOF
+          storeFile=.ci-secrets/release-keystore.jks
+          storePassword=$ANDROID_KEYSTORE_PASSWORD
+          keyAlias=$ANDROID_KEY_ALIAS
+          keyPassword=$ANDROID_KEY_PASSWORD
+          EOF
+
+      - name: Make Gradle wrapper executable
+        run: chmod +x gradlew
+
+      - name: Write Android SDK location
+        shell: bash
+        run: |
+          set -euxo pipefail
+          printf 'sdk.dir=%s/.android/sdk\n' "$HOME" > local.properties
+
+      - name: Prepare CI build metadata
+        id: build_meta
+        shell: bash
+        run: |
+          set -euxo pipefail
+          timestamp_utc="$(date -u +%Y%m%d-%H%M%S)"
+          version_code="$(date -u +%s)"
+          project_name="$(basename "$GITHUB_REPOSITORY")"
+          python3 - "$version_code" <<'PY'
+          from pathlib import Path
+          import re, sys
+          path = Path('app/build.gradle.kts')
+          text = path.read_text(encoding='utf-8')
+          new_text, count = re.subn(r'(\bversionCode\s*=\s*)\d+', rf'\g<1>{sys.argv[1]}', text, count=1)
+          if count != 1:
+              raise SystemExit('versionCode not found in app/build.gradle.kts')
+          path.write_text(new_text, encoding='utf-8')
+          PY
+          echo "Using CI versionCode: $version_code"
+          echo "project_name=$project_name" >> "$GITHUB_OUTPUT"
+          echo "timestamp_utc=$timestamp_utc" >> "$GITHUB_OUTPUT"
+          echo "version_code=$version_code" >> "$GITHUB_OUTPUT"
+
+      - name: Build debug APK
+        if: github.event_name != 'release'
+        shell: bash
+        run: |
+          set -euxo pipefail
+          export ANDROID_SDK_ROOT="$HOME/.android/sdk"
+          export ANDROID_HOME="$ANDROID_SDK_ROOT"
+          ./gradlew --no-daemon clean assembleDebug
+
+      - name: Build release AAB
+        if: github.event_name == 'release'
+        shell: bash
+        run: |
+          set -euxo pipefail
+          export ANDROID_SDK_ROOT="$HOME/.android/sdk"
+          export ANDROID_HOME="$ANDROID_SDK_ROOT"
+          ./gradlew --no-daemon bundleRelease
+
+      - name: Rename release AAB for upload
+        if: github.event_name == 'release'
+        id: release_aab
+        shell: bash
+        run: |
+          set -euxo pipefail
+          aab="$(find app/build/outputs/bundle/release -name '*.aab' | head -n 1)"
+          renamed="app/build/outputs/bundle/release/${{ steps.build_meta.outputs.project_name }}-${{ steps.build_meta.outputs.timestamp_utc }}-release.aab"
+          mv -f "$aab" "$renamed"
+          echo "Renamed release AAB to $(basename "$renamed")"
+          echo "path=$renamed" >> "$GITHUB_OUTPUT"
+
+      - name: Upload debug APK
+        if: github.event_name != 'release'
+        uses: actions/upload-artifact@v3
+        with:
+          name: debug-apk
+          path: app/build/outputs/apk/debug/*.apk
+          if-no-files-found: error
+
+      - name: Attach release AAB to Gitea release
+        if: github.event_name == 'release'
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
+        shell: bash
+        run: |
+          set -euxo pipefail
+          token="${GITHUB_TOKEN:-${GITEA_TOKEN:-}}"
+          if [ -z "$token" ]; then
+            echo "::error::No release upload token is available from secrets.GITEA_TOKEN or github.token"
+            exit 1
+          fi
+          release_id="$(python3 -c 'import json, os; print(json.load(open(os.environ["GITHUB_EVENT_PATH"], encoding="utf-8"))["release"]["id"])')"
+          aab="${{ steps.release_aab.outputs.path }}"
+          curl --fail-with-body \
+            --request POST \
+            --header "Authorization: token ${token}" \
+            --form "attachment=@${aab}" \
+            "${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}/releases/${release_id}/assets?name=$(basename "$aab")"

AndroidProjectTooling.sh

@@ -30,8 +30,8 @@ GRADLE_DIST_URL="https://services.gradle.org/distributions/gradle-8.7-bin.zip"
 JDK_DIST_URL="https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse"
 ANDROID_NDK_PACKAGE="ndk;27.2.12479018"
 ANDROID_CMAKE_PACKAGE="cmake;3.22.1"
-ANDROID_EMULATOR_SYSTEM_IMAGE="system-images;android-35;google_apis;x86_64"
+ANDROID_EMULATOR_SYSTEM_IMAGE="system-images;android-36;google_apis;x86_64"
-ANDROID_TEST_AVD_NAME="githug_android_api35"
+ANDROID_TEST_AVD_NAME="githug_android_api36"
 ANDROID_NDK_DIR="$SDK_DIR/ndk/27.2.12479018"
 ANDROID_CMAKE_DIR="$SDK_DIR/cmake/3.22.1"
 ANDROID_TOOLBIN="$ANDROID_NDK_DIR/toolchains/llvm/prebuilt/linux-x86_64/bin"
@@ -139,8 +139,8 @@ mark_successful_check() {
 
 required_sdk_packages_present() {
   [ -d "$SDK_DIR/platform-tools" ] \
-    && [ -d "$SDK_DIR/platforms/android-35" ] \
+    && [ -d "$SDK_DIR/platforms/android-36" ] \
-    && [ -d "$SDK_DIR/build-tools/35.0.0" ] \
+    && [ -d "$SDK_DIR/build-tools/36.0.0" ] \
     && [ -d "$ANDROID_NDK_DIR" ] \
     && [ -d "$ANDROID_CMAKE_DIR" ]
 }
@@ -148,7 +148,7 @@ required_sdk_packages_present() {
 required_emulator_packages_present() {
   required_sdk_packages_present \
     && [ -x "$SDK_DIR/emulator/emulator" ] \
-    && [ -d "$SDK_DIR/system-images/android-35/google_apis/x86_64" ]
+    && [ -d "$SDK_DIR/system-images/android-36/google_apis/x86_64" ]
 }
 
 auto_commit_if_needed() {
@@ -598,8 +598,8 @@ ensure_sdk_packages() {
   log "Installing required Android SDK packages"
   "$CMDLINE_TOOLS_LATEST_DIR/bin/sdkmanager" --sdk_root="$SDK_DIR" \
     "platform-tools" \
-    "platforms;android-35" \
+    "platforms;android-36" \
-    "build-tools;35.0.0" \
+    "build-tools;36.0.0" \
     "$ANDROID_NDK_PACKAGE" \
     "$ANDROID_CMAKE_PACKAGE"
 
@@ -629,8 +629,8 @@ ensure_emulator_sdk_packages() {
   log "Installing Android emulator SDK packages"
   "$CMDLINE_TOOLS_LATEST_DIR/bin/sdkmanager" --sdk_root="$SDK_DIR" \
     "platform-tools" \
-    "platforms;android-35" \
+    "platforms;android-36" \
-    "build-tools;35.0.0" \
+    "build-tools;36.0.0" \
     "$ANDROID_NDK_PACKAGE" \
     "$ANDROID_CMAKE_PACKAGE" \
     "emulator" \

HERMES_PUSH_TRIGGER_TEST.txt

@@ -0,0 +1 @@
+trigger test 2026-08-30T10:01:44-05:00

app/build.gradle.kts

@@ -1,10 +1,16 @@
 import java.util.Properties
 
-val keystoreProperties = Properties()
 val keystorePropertiesFile = rootProject.file("keystore.properties")
+val keystoreProperties = Properties()
 if (keystorePropertiesFile.exists()) {
     keystorePropertiesFile.inputStream().use { keystoreProperties.load(it) }
 }
+val hasReleaseSigning = listOf(
+    "storeFile",
+    "storePassword",
+    "keyAlias",
+    "keyPassword",
+).all { !keystoreProperties.getProperty(it).isNullOrBlank() }
 
 plugins {
     id("com.android.application")
@@ -13,13 +19,13 @@ plugins {
 
 android {
     namespace = "solutions.tretter.githugandroid"
-    compileSdk = 35
+    compileSdk = 36
     ndkVersion = "27.2.12479018"
 
     defaultConfig {
         applicationId = "solutions.tretter.githugandroid"
         minSdk = 26
-        targetSdk = 35
+        targetSdk = 36
         versionCode = 184
         versionName = "0.1.183"
 
@@ -34,9 +40,9 @@ android {
     }
 
     signingConfigs {
-        if (keystorePropertiesFile.exists()) {
+        if (hasReleaseSigning) {
             create("release") {
-                storeFile = file(keystoreProperties.getProperty("storeFile"))
+                storeFile = rootProject.file(keystoreProperties.getProperty("storeFile"))
                 storePassword = keystoreProperties.getProperty("storePassword")
                 keyAlias = keystoreProperties.getProperty("keyAlias")
                 keyPassword = keystoreProperties.getProperty("keyPassword")
@@ -45,9 +51,11 @@ android {
     }
 
     buildTypes {
+        debug {
+        }
         release {
             isMinifyEnabled = false
-            if (signingConfigs.findByName("release") != null) {
+            if (hasReleaseSigning) {
                 signingConfig = signingConfigs.getByName("release")
             }
             proguardFiles(

build.gradle.kts

@@ -1,4 +1,4 @@
 plugins {
-    id("com.android.application") version "8.6.1" apply false
+    id("com.android.application") version "8.10.0" apply false
     id("org.jetbrains.kotlin.android") version "1.9.24" apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME