From 9721cca1e47bf757c527aa9a407b25882814d04b Mon Sep 17 00:00:00 2001
From: OMGeeky <aalaalgmx@gmail.com>
Date: Sat, 13 Apr 2024 19:38:11 +0200
Subject: [PATCH] Gradle upgrade

---
 AndorsTrail/app/build.gradle                         | 7 ++++---
 AndorsTrail/app/src/main/AndroidManifest.xml         | 3 +--
 AndorsTrail/build.gradle                             | 6 +++---
 AndorsTrail/gradle.properties                        | 3 +++
 AndorsTrail/gradle/wrapper/gradle-wrapper.properties | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/AndorsTrail/app/build.gradle b/AndorsTrail/app/build.gradle
index 70d04d735..81c4975da 100644
--- a/AndorsTrail/app/build.gradle
+++ b/AndorsTrail/app/build.gradle
@@ -1,9 +1,6 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 34
-    buildToolsVersion "30.0.3"
-
     defaultConfig {
         applicationId "com.gpl.rpg.AndorsTrail"
         minSdkVersion 14
@@ -63,11 +60,15 @@ task cleanup(type: Delete) {
 afterEvaluate {
     project.tasks.copyRes.dependsOn project.tasks.copyResValuesIn
 
+    generateDebugResources.dependsOn project.tasks.copyRes
+    mapDebugSourceSetPaths.dependsOn project.tasks.copyRes
     mergeDebugResources.dependsOn project.tasks.copyRes
     extractDeepLinksDebug.dependsOn project.tasks.copyRes
     mergeReleaseResources.dependsOn project.tasks.copyRes
     extractDeepLinksRelease.dependsOn project.tasks.copyRes
 
+    generateDebugResources.dependsOn project.tasks.copyTranslation
+    mapDebugSourceSetPaths.dependsOn project.tasks.copyTranslation
     mergeDebugAssets.dependsOn project.tasks.copyTranslation
     mergeReleaseAssets.dependsOn project.tasks.copyTranslation
     extractDeepLinksDebug.dependsOn project.tasks.copyTranslation
diff --git a/AndorsTrail/app/src/main/AndroidManifest.xml b/AndorsTrail/app/src/main/AndroidManifest.xml
index b987814f9..c35dd34cd 100644
--- a/AndorsTrail/app/src/main/AndroidManifest.xml
+++ b/AndorsTrail/app/src/main/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest 
-	xmlns:android="http://schemas.android.com/apk/res/android" 
-	package="com.gpl.rpg.AndorsTrail"
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:versionCode="75"
 	android:versionName="0.8.9"
 	android:installLocation="auto"
diff --git a/AndorsTrail/build.gradle b/AndorsTrail/build.gradle
index d27bb317e..a2f57fbcc 100644
--- a/AndorsTrail/build.gradle
+++ b/AndorsTrail/build.gradle
@@ -1,17 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:8.3.1'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }
diff --git a/AndorsTrail/gradle.properties b/AndorsTrail/gradle.properties
index 2d8d1e4dd..31c5e979b 100644
--- a/AndorsTrail/gradle.properties
+++ b/AndorsTrail/gradle.properties
@@ -1 +1,4 @@
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
\ No newline at end of file
diff --git a/AndorsTrail/gradle/wrapper/gradle-wrapper.properties b/AndorsTrail/gradle/wrapper/gradle-wrapper.properties
index 07dfd9a2c..4de0c4917 100644
--- a/AndorsTrail/gradle/wrapper/gradle-wrapper.properties
+++ b/AndorsTrail/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Jan 30 18:12:43 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME