From 70b3ba310a8b88b1262249b782f47cbbf57bdfd0 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 20 Apr 2023 10:24:19 +0200
Subject: [PATCH] Upgrade to Gradle 8.0

---
 app/build.gradle                         | 9 +++++----
 build.gradle                             | 2 +-
 gradle.properties                        | 3 +++
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6662b3846..6df7214a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -98,10 +98,11 @@ android {
     }
 
     packagingOptions {
-        // remove two files which belong to jsoup
-        // no idea how they ended up in the META-INF dir...
-        exclude 'META-INF/README.md'
-        exclude 'META-INF/CHANGES'
+        resources {
+            // remove two files which belong to jsoup
+            // no idea how they ended up in the META-INF dir...
+            excludes += ['META-INF/README.md', 'META-INF/CHANGES']
+        }
     }
 }
 
diff --git a/build.gradle b/build.gradle
index 1384d0a9c..f5d1a323c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 032d70cee..3b6624de1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,7 @@
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=false
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048M
 systemProp.file.encoding=utf-8
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5116c5b18..86eb34367 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionSha256Sum=4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists