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

---
 cashier/build.gradle                 | 13 +++++++------
 cashier/src/main/AndroidManifest.xml |  3 +--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'cashier')

diff --git a/cashier/build.gradle b/cashier/build.gradle
index ae7a5a9..1c9c2b6 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -58,18 +58,19 @@ android {
     buildFeatures {
         viewBinding = true
     }
-
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        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.cashier'
+
 }
 
 dependencies {
diff --git a/cashier/src/main/AndroidManifest.xml b/cashier/src/main/AndroidManifest.xml
index 1d8b810..3093358 100644
--- a/cashier/src/main/AndroidManifest.xml
+++ b/cashier/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="net.taler.cashier">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
-- 
cgit v1.2.3