From 598efe2c1bb5564ac96cd31a5ba27d57e6be1150 Mon Sep 17 00:00:00 2001
From: "Emmanuele (WolfSolver)" <wolfsolver@prudenzano.org>
Date: Mon, 21 Oct 2024 19:27:08 +0200
Subject: [PATCH] Upgrade to Gradle 8.5.1

---
 app/build.gradle                         | 1 +
 app/src/beta/AndroidManifest.xml         | 3 +--
 app/src/main/AndroidManifest.xml         | 3 +--
 build.gradle                             | 2 +-
 gradle.properties                        | 3 +++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a0a8da88a2..d26c50dd5e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -139,6 +139,7 @@ android {
             includeAndroidResources = true
         }
     }
+    namespace 'com.money.manager.ex'
 }
 
 dependencies {
diff --git a/app/src/beta/AndroidManifest.xml b/app/src/beta/AndroidManifest.xml
index 99553ae2fe..f244a0be45 100644
--- a/app/src/beta/AndroidManifest.xml
+++ b/app/src/beta/AndroidManifest.xml
@@ -15,8 +15,7 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.money.manager.ex" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name=".MmexApplication"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bc4a2e8eba..3350d9167b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.money.manager.ex">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- xmlns:tools="http://schemas.android.com/tools" -->
 
diff --git a/build.gradle b/build.gradle
index a7d85669e8..d94ca21d8c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index c3cee20196..e0001e053d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,6 +23,9 @@ org.gradle.caching=true
 # Migration to androidx
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
 # tip from gradle
 #android.enableSeparateAnnotationProcessing=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dec632d70a..8f2ba0d2c9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu May 13 11:51:25 NZST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME