From 166063104818ed66a423a81ba147f6b233a32525 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 14 Dec 2021 08:11:48 +0100
Subject: [PATCH] Updated gradle

---
 app/build.gradle | 32 ++++++++++++++++++++------------
 build.gradle     |  2 +-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cfece9478f..5526ca8c5e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,21 +76,29 @@ android {
         includeInApk = false
         includeInBundle = false
     }
-
     packagingOptions {
-        exclude 'LICENSES'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/README.md'
-        exclude 'META-INF/CHANGES'
-        exclude 'META-INF/jersey-module-version'
-        exclude 'META-INF/COPYRIGHT.html'
-        exclude 'META-INF/LICENSE.gpl.txt'
-        exclude 'META-INF/LICENSE.commercial.txt'
-        exclude 'org/apache/**'
-        exclude 'LICENSE-2.0.txt'
-        exclude 'RELEASE.txt'
+        jniLibs {
+            excludes += [
+                    'org/apache/**'
+            ]
+        }
+        resources {
+            excludes += [
+                    'LICENSES',
+                    'META-INF/LICENSE.txt',
+                    'META-INF/README.md',
+                    'META-INF/CHANGES',
+                    'META-INF/jersey-module-version',
+                    'META-INF/COPYRIGHT.html',
+                    'META-INF/LICENSE.gpl.txt',
+                    'META-INF/LICENSE.commercial.txt',
+                    'LICENSE-2.0.txt',
+                    'RELEASE.txt'
+            ]
+        }
     }
 
+
     // https://google.github.io/android-gradle-dsl/current/com.android.build.gradle.internal.dsl.SigningConfig.html
     signingConfigs {
         release {
diff --git a/build.gradle b/build.gradle
index 68d738153f..5d863b44a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
     dependencies {
         // https://developer.android.com/studio/releases/gradle-plugin
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         // https://github.com/bugsnag/bugsnag-android-gradle-plugin
         // https://mvnrepository.com/artifact/com.bugsnag/bugsnag-android-gradle-plugin
         classpath 'com.bugsnag:bugsnag-android-gradle-plugin:7.1.0'