summaryrefslogtreecommitdiff
path: root/cashier
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-03-18 15:00:45 -0300
committerTorsten Grote <t@grobox.de>2020-03-18 15:22:18 -0300
commitd20a5a81af4fa88eb26ea9678ecc13a0dd3d64a5 (patch)
treef09b9584c5523a184a45fe48b34a6de3d8616449 /cashier
parenta4796ec47d89a851b260b6fc195494547208a025 (diff)
downloadtaler-android-d20a5a81af4fa88eb26ea9678ecc13a0dd3d64a5.tar.gz
taler-android-d20a5a81af4fa88eb26ea9678ecc13a0dd3d64a5.tar.bz2
taler-android-d20a5a81af4fa88eb26ea9678ecc13a0dd3d64a5.zip
Fix lint issues and CI dependencies
Diffstat (limited to 'cashier')
-rw-r--r--cashier/.gitlab-ci.yml5
-rw-r--r--cashier/build.gradle2
-rw-r--r--cashier/src/main/res/values/strings.xml4
3 files changed, 8 insertions, 3 deletions
diff --git a/cashier/.gitlab-ci.yml b/cashier/.gitlab-ci.yml
index f8cc7f3..ba64ccc 100644
--- a/cashier/.gitlab-ci.yml
+++ b/cashier/.gitlab-ci.yml
@@ -6,6 +6,10 @@ cashier_test:
changes:
- "cashier"
script: ./gradlew :cashier:lint :cashier:assembleRelease
+ artifacts:
+ paths:
+ - cashier/build/reports/lint-results.html
+ expire_in: 1 week
cashier_deploy_nightly:
stage: deploy
@@ -14,6 +18,7 @@ cashier_deploy_nightly:
- master
changes:
- "cashier"
+ needs: ["cashier_test"]
script:
# Ensure that key exists
- test -z "$DEBUG_KEYSTORE" && exit 0
diff --git a/cashier/build.gradle b/cashier/build.gradle
index 5915f8a..b77dc30 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -50,7 +50,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core-ktx:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- implementation 'androidx.security:security-crypto:1.0.0-alpha02'
+ implementation 'androidx.security:security-crypto:1.0.0-beta01'
implementation 'com.google.android.material:material:1.1.0'
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
diff --git a/cashier/src/main/res/values/strings.xml b/cashier/src/main/res/values/strings.xml
index 5df5bfa..98f686c 100644
--- a/cashier/src/main/res/values/strings.xml
+++ b/cashier/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
<string name="app_name">Taler Cashier</string>
<string name="config_bank_url">Bank API address</string>
@@ -9,7 +9,7 @@
<string name="config_username_error">Please enter your username</string>
<string name="config_error">Error retrieving configuration</string>
<string name="config_error_auth">Invalid username or password</string>
- <string name="config_demo_hint">For testing, you can <![CDATA[<a href="%s">create a test account at the demo bank</a>]]>.</string>
+ <string name="config_demo_hint" tools:ignore="StringFormatInvalid">For testing, you can <![CDATA[<a href="%s">create a test account at the demo bank</a>]]>.</string>
<string name="balance_current_label">Current balance</string>
<string name="balance_error">ERROR</string>