chore(android): migrate build.gradle.kts to use Kotlin idioms for properties and improve readability

# Conflicts:
#	.gitea/workflows/release.yaml

.gitea/workflows/release.yaml

@@ -3,11 +3,15 @@ name: Build and Release to F-Droid
 on:
   push:
     tags:
-      - 'v*'
+      - '*'
+  workflow_dispatch:
 
 jobs:
   build-and-deploy:
-    runs-on: ubuntu-latest
+    runs-on: docker
+    env:
+      ANDROID_HOME: /opt/android-sdk
+      ANDROID_SDK_ROOT: /opt/android-sdk
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -18,12 +22,67 @@ jobs:
           distribution: 'zulu'
           java-version: '17'
 
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Install Android SDK packages
+        run: |
+          sdkmanager --licenses >/dev/null <<'EOF'
+          y
+          y
+          y
+          y
+          y
+          y
+          y
+          y
+          y
+          y
+          EOF
+          sdkmanager "platform-tools" "platforms;android-36" "build-tools;36.0.0"
+
+      - name: Install jq
+        run: |
+          set -e
+          SUDO=""
+          if command -v sudo >/dev/null 2>&1; then
+            SUDO="sudo"
+          fi
+
+          if command -v apt-get >/dev/null 2>&1; then
+            $SUDO apt-get update
+            $SUDO apt-get install -y jq
+          elif command -v apk >/dev/null 2>&1; then
+            $SUDO apk add --no-cache jq
+          elif command -v dnf >/dev/null 2>&1; then
+            $SUDO dnf install -y jq
+          elif command -v yum >/dev/null 2>&1; then
+            $SUDO yum install -y jq
+          else
+            echo "Could not find a supported package manager to install jq"
+            exit 1
+          fi
+
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.11.0'
           channel: 'stable'
 
+      - name: Trust Flutter SDK git directory
+        run: |
+          set -e
+          FLUTTER_BIN_DIR="$(dirname "$(command -v flutter)")"
+          FLUTTER_SDK_DIR="$(cd "$FLUTTER_BIN_DIR/.." && pwd -P)"
+          git config --global --add safe.directory "$FLUTTER_SDK_DIR"
+          if [ -n "${FLUTTER_ROOT:-}" ]; then
+            git config --global --add safe.directory "$FLUTTER_ROOT"
+          fi
+          # Runner-specific fallback observed in failing logs
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.41.4-x64 || true
+
+      - name: Verify Android + Flutter toolchain
+        run: flutter doctor -v
+
       - name: Install dependencies
         run: flutter pub get
 

android/app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.io.FileInputStream
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -31,25 +34,25 @@ android {
         versionName = flutter.versionName
     }
 
-    def keystorePropertiesFile = rootProject.file("key.properties")
+    val keystorePropertiesFile = rootProject.file("key.properties")
-    def keystoreProperties = new Properties()
+    val keystoreProperties = Properties()
     if (keystorePropertiesFile.exists()) {
-        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+        keystoreProperties.load(FileInputStream(keystorePropertiesFile))
     }
 
     signingConfigs {
-        release {
+        create("release") {
-            keyAlias = keystoreProperties['keyAlias']
+            keyAlias = keystoreProperties.getProperty("keyAlias")
-            keyPassword = keystoreProperties['keyPassword']
+            keyPassword = keystoreProperties.getProperty("keyPassword")
-            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storeFile = keystoreProperties.getProperty("storeFile")?.let { file(it) }
-            storePassword = keystoreProperties['storePassword']
+            storePassword = keystoreProperties.getProperty("storePassword")
         }
     }
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.release
+            signingConfig = signingConfigs.getByName("release")
         }
     }
 }