diff options
| author | Daniel Albert <albert_daniel@t-online.de> | 2014-07-16 18:49:16 +0200 |
|---|---|---|
| committer | Daniel Albert <albert_daniel@t-online.de> | 2014-07-16 18:49:16 +0200 |
| commit | d63534d6559f846b670f07bcc99fdd85ebe9cb3a (patch) | |
| tree | 85d0135e80668347f5438ef4f85e134049491e8c /OpenKeychain/build.gradle | |
| parent | e375cde7e1a09df33c65a44ba57f3f75f2f98b15 (diff) | |
| parent | 82af9672fdc7f548eb801c29d123c824ea286cdc (diff) | |
| download | open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.tar.gz open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.tar.bz2 open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
Diffstat (limited to 'OpenKeychain/build.gradle')
| -rw-r--r-- | OpenKeychain/build.gradle | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index f419141b4..a6c01543c 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -21,13 +21,6 @@ dependencies { compile project(':extern:minidns') compile project(':extern:KeybaseLib:Lib') - - // Unit tests are run with Robolectric - testCompile 'junit:junit:4.11' - testCompile 'org.robolectric:robolectric:2.3' - testCompile 'com.squareup:fest-android:1.0.8' - testCompile 'com.google.android:android:4.1.1.4' - // compile dependencies are automatically also included in testCompile } android { @@ -86,7 +79,7 @@ android { // NOTE: This disables Lint! tasks.whenTaskAdded { task -> - if (task.name.equals("lint")) { + if (task.name.contains("lint")) { task.enabled = false } } |