aboutsummaryrefslogtreecommitdiff
path: root/merchant-terminal
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2022-05-16 16:26:36 +0200
committerFlorian Dold <florian@dold.me>2022-05-16 16:26:36 +0200
commit22e5e8034d2891f04568e724baa8b5c95660b897 (patch)
treeea8c756f38958609e54e6c45deff508b9df15615 /merchant-terminal
parentd32573aad045c76c6ae75269eaa6591ce6fb4ae9 (diff)
downloadtaler-android-22e5e8034d2891f04568e724baa8b5c95660b897.tar.gz
taler-android-22e5e8034d2891f04568e724baa8b5c95660b897.tar.bz2
taler-android-22e5e8034d2891f04568e724baa8b5c95660b897.zip
-upgrade gradle
Diffstat (limited to 'merchant-terminal')
-rw-r--r--merchant-terminal/build.gradle18
-rw-r--r--merchant-terminal/src/main/AndroidManifest.xml3
2 files changed, 10 insertions, 11 deletions
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 {
diff --git a/merchant-terminal/src/main/AndroidManifest.xml b/merchant-terminal/src/main/AndroidManifest.xml
index 1518293..eb7940f 100644
--- a/merchant-terminal/src/main/AndroidManifest.xml
+++ b/merchant-terminal/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.merchantpos">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.NFC" />