From 90f908f3b9ed75b322cc462c5b7c185bddafea3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mirko=20Sandon=C3=A0?= <favouriteuser@tiscali.it>
Date: Mon, 24 Nov 2025 09:50:41 +0100
Subject: [PATCH 1/2] Update android.yml

---
 .github/workflows/android.yml | 49 ++++++++---------------------------
 1 file changed, 11 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index c2369c99..2f60bf42 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -7,8 +7,7 @@ jobs:
   build-signed:
     runs-on: ubuntu-latest
     
-    # PROMOZIONE DEI SECRETS ALL'AMBIENTE DEL JOB (FIX ERRORE)
-    # Questo rende i segreti disponibili e stabili nel contesto 'env'
+    # Rendiamo le variabili disponibili a tutto il job
     env:
       APP_KEYSTORE_BASE64: ${{ secrets.APP_KEYSTORE_BASE64 }}
       KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -19,49 +18,23 @@ jobs:
     - name: Checkout sources
       uses: actions/checkout@v4
 
-    - name: Read Versions from properties
-      id: config
-      run: |
-        # Estrae versioni pulendo eventuali spazi bianchi
-        GO_VER=$(grep -E "^de\.felixnuesse\.extract\.goVersion=" gradle.properties | cut -d'=' -f2 | tr -d '[:space:]')
-        NDK_VER=$(grep -E "^de\.felixnuesse\.extract\.ndkVersion=" gradle.properties | cut -d'=' -f2 | tr -d '[:space:]')
-        
-        if [ -z "$GO_VER" ]; then GO_VER="1.23.0"; fi
-        
-        echo "GO_VERSION=$GO_VER" >> $GITHUB_ENV
-        echo "NDK_VERSION=$NDK_VER" >> $GITHUB_ENV
-        echo "Detected -> Go: $GO_VER, NDK: $NDK_VER"
-
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ env.GO_VERSION }}
-        cache: true
-
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4
-
-    - name: Install NDK
-      run: |
-        echo "y" | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.NDK_VERSION }}"
+    # ... (Setup Versioni, JDK, Go, Gradle, NDK rimangono uguali) ...
+    # (Ometto per brevità, copia quelli che avevi già)
+    
+    # ---------------------------------------------------------
+    # CORREZIONE QUI SOTTO
+    # ---------------------------------------------------------
 
-    # --- DECODIFICA KEYSTORE ---
     - name: Decode Keystore
       if: ${{ env.APP_KEYSTORE_BASE64 }} 
       run: |
-        # Decodifica il file keystore nella radice del progetto.
-        echo "$APP_KEYSTORE_BASE64" | base64 --decode > release.keystore
+        # 1. Creiamo il file DENTRO la cartella 'app'
+        echo "$APP_KEYSTORE_BASE64" | base64 --decode > app/release.keystore
 
-    # --- BUILD ---
     - name: Build Signed Release APK
       env:
-        # Passiamo il nome del file che si trova nella radice
+        # 2. Diciamo a Gradle che il file si chiama 'release.keystore'.
+        # Poiché build.gradle è dentro 'app/', cercherà in 'app/release.keystore', dove lo abbiamo appena messo.
         CMD_RELEASE_KEYSTORE: release.keystore
         CMD_RELEASE_KEYSTORE_PASSWORD: ${{ env.KEY_STORE_PASSWORD }}
         CMD_RELEASE_KEY_ALIAS: ${{ env.KEY_ALIAS }}

From f4caf6e76c01d7c662ee16bac4421d6ff54029f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mirko=20Sandon=C3=A0?= <favouriteuser@tiscali.it>
Date: Thu, 11 Dec 2025 15:34:09 +0100
Subject: [PATCH 2/2] Update gradle.properties

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index fe33e0e0..d22834d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx4096M"
 android.enableJetifier=false
 android.useAndroidX=true
 de.felixnuesse.extract.goVersion=1.25
-de.felixnuesse.extract.rCloneVersion=1.72.0
+de.felixnuesse.extract.rCloneVersion=1.72.1
 de.felixnuesse.extract.ndkVersion=25.2.9519653
 de.felixnuesse.extract.ndkToolchainVersion=33
 android.defaults.buildfeatures.buildconfig=true