From 70c0e4b7fdfc4a762a5702cf1798a464678c7fae Mon Sep 17 00:00:00 2001
From: devgianlu <altomanigianluca@gmail.com>
Date: Wed, 6 Dec 2023 14:08:24 +0100
Subject: [PATCH] Upgrade to Gradle 8

---
 CommonUtils                              | 2 +-
 app/build.gradle                         | 6 ++++++
 aria2lib                                 | 2 +-
 build.gradle                             | 6 +++---
 gradle.properties                        | 6 ++++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CommonUtils b/CommonUtils
index 102d3060..4aea8f0c 160000
--- a/CommonUtils
+++ b/CommonUtils
@@ -1 +1 @@
-Subproject commit 102d3060f61f353f4df671d2211a4c8de8b66d30
+Subproject commit 4aea8f0c43cc58f80cdbc8b0f909d03f2ad62976
diff --git a/app/build.gradle b/app/build.gradle
index f055e59c..1e6b82f3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -82,6 +82,12 @@ android {
             enabled.set(false)
         }
     }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
 }
 
 play {
diff --git a/aria2lib b/aria2lib
index 9acb2559..0860a592 160000
--- a/aria2lib
+++ b/aria2lib
@@ -1 +1 @@
-Subproject commit 9acb2559b8bce375218b302c0be4ec085fcc9154
+Subproject commit 0860a592d03467b1b65c973705c887a8ec42de10
diff --git a/build.gradle b/build.gradle
index 751cd904..639bb64c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.google.gms:google-services:4.4.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
     }
 }
@@ -19,6 +19,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle.properties b/gradle.properties
index 9981978a..e3dfef4e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,5 @@
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
-android.useAndroidX=true
-android.bundle.enableUncompressedNativeLibs=false
\ No newline at end of file
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6a196aba..a5285d34 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip