From 957fe8115ee72cdaa8c18fc3456e09c755b931d2 Mon Sep 17 00:00:00 2001
From: Amab <juanmi1982@gmail.com>
Date: Sat, 2 Dec 2023 12:19:36 +0100
Subject: [PATCH] Fix APK paths (#432)

## What changes were proposed in this pull request?

* Fix APK paths
* Upgrade to Gradle 8.5 & Gradle Plugin 8.2.0

## How was this patch tested?

CI/CD.

Reviewed-on: https://git.cuernodehipnos.es/Marown/SWADroid/pulls/432
Co-authored-by: Amab <juanmi1982@gmail.com>
Co-committed-by: Amab <juanmi1982@gmail.com>
---
 .drone.yml                               | 6 +++---
 SWADroid/build.gradle                    | 3 +++
 build.gradle                             | 2 +-
 gradle.properties                        | 1 -
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f98e98dd..8eb45cb1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -125,7 +125,7 @@ steps:
       # Encrypt keystore & set $RELEASE_KEYSTORE_BASE64 environment variable in Drone CI
       # - openssl base64 -A -in keystore.jks
       # Decrypt keystore
-      - echo $RELEASE_KEYSTORE_BASE64 | base64 -d > /drone/src/SWADroid/keystore.jks
+      - echo $RELEASE_KEYSTORE_BASE64 | base64 -d > SWADroid/keystore.jks
       # Assemble APK
       - ./gradlew assembleRelease
 
@@ -136,8 +136,8 @@ steps:
         from_secret: gitea_api_key
       base_url: https://git.cuernodehipnos.es
       files:
-        - /drone/src/SWADroid/SWADroid/build/outputs/apk/release/SWADroid-release.apk
-        - /drone/src/SWADroid/SWADroid/build/outputs/apk/release/SWADroid-release.apk.idsig
+        - SWADroid/build/outputs/apk/release/SWADroid-release.apk
+        - SWADroid/build/outputs/apk/release/SWADroid-release.apk.idsig
       checksum:
         - md5
         - sha1
diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 1503a63b..ada1f537 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -58,6 +58,9 @@ android {
     }
 
     def RELEASE_STORE_FILE = System.getenv("RELEASE_STORE_FILE")
+    buildFeatures {
+        buildConfig true
+    }
 
     if (RELEASE_STORE_FILE) {
         signingConfigs {
diff --git a/build.gradle b/build.gradle
index cbda70db..b17d5b14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.2.0'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 9441af80..bff65e68 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,6 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f49abc3e..638d57b9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
-distributionSha256Sum=0336f591bc0ec9aa0c9988929b93ecc916b3c1d52aed202c7381db144aa0ef15
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME