diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-16 22:33:11 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-16 22:33:11 +0100 |
| commit | ca95cb9a43d594979213a54c90662ac4f3e384b5 (patch) | |
| tree | 57e676ef8cc282789a8487251d0237decde0499f /OpenPGP-Keychain | |
| parent | 16b753accacfbf15fce02b8b9708803af39f7ca2 (diff) | |
| download | open-keychain-ca95cb9a43d594979213a54c90662ac4f3e384b5.tar.gz open-keychain-ca95cb9a43d594979213a54c90662ac4f3e384b5.tar.bz2 open-keychain-ca95cb9a43d594979213a54c90662ac4f3e384b5.zip | |
Update gradle build files to 0.7.3 android plugin, add Gradle 1.9 wrapper, add information about build to readme
Diffstat (limited to 'OpenPGP-Keychain')
| -rw-r--r-- | OpenPGP-Keychain/build.gradle | 11 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/values/strings.xml | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle index 566559a00..852bfef38 100644 --- a/OpenPGP-Keychain/build.gradle +++ b/OpenPGP-Keychain/build.gradle @@ -4,8 +4,7 @@ buildscript { } dependencies { - // NOTE: Avoid using dynamic versions (+). This breaks offline builds! - classpath 'com.android.tools.build:gradle:0.6.3' + classpath 'com.android.tools.build:gradle:0.7.3' } } @@ -15,9 +14,6 @@ repositories { mavenCentral() } -/* - * NOTE: Avoid dependencies from Maven. Include as much sources as possible for F-Droid! - */ dependencies { compile fileTree(dir: 'libs', includes: ['*.jar'], excludes: ['android-support-v4.jar']) compile 'com.android.support:support-v4:19.0.+' // already in actionbarsherlock @@ -79,4 +75,9 @@ android { } else { buildTypes.release.signingConfig = null } + + // Do not abort build if lint finds errors + lintOptions { + abortOnError false + } } diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index ab2c638fe..190dcfa53 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -333,7 +333,7 @@ <string name="import_qr_code_wrong">QR Code malformed! Please try again!</string> <string name="import_qr_code_finished">QR Code scanning finished!</string> <string name="import_qr_scan_button">Scan QR Code with \'Barcode Scanner\'</string> - <string name="import_nfc_text">To exchange keys via NFC, the device needs to be unlocked.</string> + <string name="import_nfc_text">To receive keys via NFC, the device needs to be unlocked.</string> <string name="import_nfc_help_button">Help</string> <string name="import_clipboard_button">Get key from clipboard</string> |