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

---
 merchant-terminal/build.gradle | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'merchant-terminal/build.gradle')

diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index 5354da5..19b0136 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -48,19 +48,19 @@ android {
             includeAndroidResources = true
         }
     }
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/common.kotlin_module', '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"
-    }
-
-    packagingOptions {
-        exclude 'META-INF/common.kotlin_module'
-        exclude 'META-INF/*.kotlin_module'
     }
+    namespace 'net.taler.merchantpos'
 }
 
 dependencies {
-- 
cgit v1.2.3