From 078053ce2baf2ec00eb8e25935cf02dabeda3ec5 Mon Sep 17 00:00:00 2001
From: 12aw <arnev@gmx.de>
Date: Mon, 23 May 2022 19:17:59 +0200
Subject: [PATCH] update Gradle (Christian Schneppe)

---
 build.gradle                      | 31 +++++++++++++------------------
 src/git/AndroidManifest.xml       |  3 +--
 src/main/AndroidManifest.xml      |  3 +--
 src/playstore/AndroidManifest.xml |  3 +--
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/build.gradle b/build.gradle
index 212c9cd31..c240aee63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
     }
 }
 
@@ -97,7 +97,7 @@ ext {
 }
 
 android {
-
+    namespace 'eu.siacs.conversations'
     //noinspection GradleCompatible
     compileSdkVersion 31
 
@@ -128,12 +128,12 @@ android {
     }
 
     packagingOptions {
-        //X86
-        exclude "lib/x86/**"
-        //X86_64
-        exclude "lib/x86_64/**"
-        //armeabi
-        //exclude "lib/armeabi/**"
+        jniLibs {
+            excludes += ['lib/x86/**', 'lib/x86_64/**']
+        }
+        resources {
+            excludes += ['lib/x86/**', 'lib/x86_64/**', 'META-INF/BCKEY.DSA', 'META-INF/BCKEY.SF']
+        }
     }
 
     compileOptions {
@@ -190,13 +190,6 @@ android {
         }
     }
 
-    lintOptions {
-        error 'StringFormatInvalid' , 'StringFormatMatches'
-        disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource', 'RestrictedApi'
-        checkReleaseBuilds true
-        abortOnError false
-    }
-
     subprojects {
 
         afterEvaluate {
@@ -211,8 +204,10 @@ android {
         }
     }
 
-    packagingOptions {
-        exclude 'META-INF/BCKEY.DSA'
-        exclude 'META-INF/BCKEY.SF'
+    lint {
+        abortOnError false
+        checkReleaseBuilds true
+        disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource', 'RestrictedApi'
+        error 'StringFormatInvalid', 'StringFormatMatches'
     }
 }
diff --git a/src/git/AndroidManifest.xml b/src/git/AndroidManifest.xml
index 2d1f23459..bbccabbd9 100644
--- a/src/git/AndroidManifest.xml
+++ b/src/git/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.siacs.conversations">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 5c0a22c08..13d9f95d0 100644
--- a/src/main/AndroidManifest.xml
+++ b/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="eu.siacs.conversations">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
diff --git a/src/playstore/AndroidManifest.xml b/src/playstore/AndroidManifest.xml
index 6eec42061..c6adf5356 100644
--- a/src/playstore/AndroidManifest.xml
+++ b/src/playstore/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="eu.siacs.conversations">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />