summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cashier/build.gradle7
-rw-r--r--cashier/src/main/java/net/taler/cashier/ConfigFragment.kt2
-rw-r--r--merchant-terminal/build.gradle3
-rw-r--r--merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt2
-rw-r--r--merchant-terminal/src/main/java/net/taler/merchantpos/history/MerchantHistoryFragment.kt2
-rw-r--r--wallet/build.gradle12
6 files changed, 24 insertions, 4 deletions
diff --git a/cashier/build.gradle b/cashier/build.gradle
index 5fe7e16..e256396 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -44,6 +44,13 @@ android {
jvmTarget = "1.8"
}
+ lintOptions {
+ abortOnError true
+ ignoreWarnings false
+ // TODO remove once com.google.android.material fixed this
+ // https://github.com/material-components/material-components-android/issues/504
+ ignore "WrongConstant"
+ }
}
dependencies {
diff --git a/cashier/src/main/java/net/taler/cashier/ConfigFragment.kt b/cashier/src/main/java/net/taler/cashier/ConfigFragment.kt
index b9a97e5..2225ff6 100644
--- a/cashier/src/main/java/net/taler/cashier/ConfigFragment.kt
+++ b/cashier/src/main/java/net/taler/cashier/ConfigFragment.kt
@@ -31,8 +31,8 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.Observer
import androidx.navigation.fragment.findNavController
+import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_LONG
import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
import kotlinx.android.synthetic.main.fragment_config.*
private const val URL_BANK_TEST = "https://bank.test.taler.net"
diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index dd2527e..8a7eac7 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -42,6 +42,9 @@ android {
lintOptions {
abortOnError true
ignoreWarnings false
+ // TODO remove once com.google.android.material fixed this
+ // https://github.com/material-components/material-components-android/issues/504
+ ignore "WrongConstant"
}
}
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt
index c0c87dc..7f322fd 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt
@@ -23,8 +23,8 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.Observer
+import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_SHORT
import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.snackbar.Snackbar.LENGTH_SHORT
import net.taler.common.navigate
import net.taler.merchantpos.MainViewModel
import net.taler.merchantpos.R
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/history/MerchantHistoryFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/history/MerchantHistoryFragment.kt
index 1099eda..589a549 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/history/MerchantHistoryFragment.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/history/MerchantHistoryFragment.kt
@@ -31,8 +31,8 @@ import androidx.recyclerview.widget.DividerItemDecoration.VERTICAL
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView.Adapter
import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_SHORT
import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.snackbar.Snackbar.LENGTH_SHORT
import kotlinx.android.synthetic.main.fragment_merchant_history.*
import net.taler.common.exhaustive
import net.taler.common.navigate
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 3b8e13d..e3013ce 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -20,7 +20,9 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 29
- buildToolsVersion "29.0.3"
+ //noinspection GradleDependency
+ buildToolsVersion "$build_tools_version"
+
defaultConfig {
applicationId "net.taler.wallet"
minSdkVersion 24
@@ -44,6 +46,14 @@ android {
kotlinOptions {
jvmTarget = "1.8"
}
+
+ lintOptions {
+ abortOnError true
+ ignoreWarnings false
+ // TODO remove once com.google.android.material fixed this
+ // https://github.com/material-components/material-components-android/issues/504
+ ignore "WrongConstant"
+ }
}
dependencies {