From 22e5e8034d2891f04568e724baa8b5c95660b897 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Mon, 16 May 2022 16:26:36 +0200
Subject: -upgrade gradle

---
 wallet/build.gradle                 | 17 ++++++++++-------
 wallet/src/main/AndroidManifest.xml |  3 +--
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'wallet')

diff --git a/wallet/build.gradle b/wallet/build.gradle
index 4bc22b9..2aaea01 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -99,19 +99,22 @@ android {
         viewBinding true
         compose true
     }
-
     packagingOptions {
-        doNotStrip '**/*.so'
-        exclude("META-INF/*.kotlin_module")
+        jniLibs {
+            keepDebugSymbols += ['**/*.so']
+        }
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
     }
 
-    lintOptions {
+    lint {
         abortOnError true
+        ignore 'WrongConstant'
         ignoreWarnings false
-        // TODO remove once com.google.android.material fixed this
-        //      https://github.com/material-components/material-components-android/issues/504
-        ignore "WrongConstant"
     }
+    namespace 'net.taler.wallet'
+
 }
 
 dependencies {
diff --git a/wallet/src/main/AndroidManifest.xml b/wallet/src/main/AndroidManifest.xml
index 963032c..285908a 100644
--- a/wallet/src/main/AndroidManifest.xml
+++ b/wallet/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.taler.wallet">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-- 
cgit v1.2.3