From dff81125db79827f2f47b342bce452365249c43a Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Sun, 22 Jan 2023 13:45:29 +0100
Subject: [PATCH] Gradle update

---
 app/build.gradle                         | 17 +++++++----------
 app/src/main/AndroidManifest.xml         |  1 -
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 388b4d79..a2ce9618 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,6 +7,7 @@ plugins {
 android {
 	compileSdkVersion 33
 	buildToolsVersion '33.0.0'
+	namespace 'org.nuclearfog.twidda'
 
 	defaultConfig {
 		applicationId 'org.nuclearfog.twidda'
@@ -32,16 +33,12 @@ android {
 	}
 
 	packagingOptions {
-		exclude '/META-INF/CHANGES'
-		exclude '/META-INF/DEPENDENCIES'
-		exclude '/META-INF/README.md'
-		exclude '/META-INF/androidx.*'
-		exclude '/META-INF/kotlin*'
-		exclude '/META-INF/com.*'
-		exclude '/META-INF/services/**'
-		exclude '/META-INF/com/**'
-		exclude '/kotlin/**'
-		exclude '/Debug*'
+		jniLibs {
+			excludes += ['/META-INF/androidx.*', '/META-INF/kotlin*', '/META-INF/com.*', '/META-INF/services/**', '/META-INF/com/**', '/kotlin/**', '/Debug*']
+		}
+		resources {
+			excludes += ['/META-INF/CHANGES', '/META-INF/DEPENDENCIES', '/META-INF/README.md', '/META-INF/androidx.*', '/META-INF/kotlin*', '/META-INF/com.*', '/META-INF/services/**', '/META-INF/com/**', '/kotlin/**', '/Debug*']
+		}
 	}
 
 	paranoid {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c7ef41bd..782c05e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	package="org.nuclearfog.twidda"
 	tools:ignore="LockedOrientationActivity">
 
 	<uses-permission android:name="android.permission.INTERNET" />
diff --git a/build.gradle b/build.gradle
index c8b4e894..7fe44a77 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath 'io.michaelrocks:paranoid-gradle-plugin:0.3.7'
         classpath 'gradle.plugin.ru.cleverpumpkin.proguard-dictionaries-generator:plugin:1.0.8'
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb879..dfbabe2c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
\ No newline at end of file