diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-26 23:06:32 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-26 23:06:32 +0200 |
| commit | 8132b9ac745f6eedd4a7746f1e67358a61e9e4a7 (patch) | |
| tree | f1c8c520a449f3ef306e1e1e7e2b1bc70a3240ad /OpenKeychain/build.gradle | |
| parent | d8f278229352a58dbdcf49bb65538249f8c4ccc0 (diff) | |
| parent | 45722d7cfbb2996ff994b3f2143e5871c2e564ba (diff) | |
| download | open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.tar.gz open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.tar.bz2 open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.zip | |
Merge branch 'master' into ditch-appmsg
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
Diffstat (limited to 'OpenKeychain/build.gradle')
| -rw-r--r-- | OpenKeychain/build.gradle | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 1136f669b..f42787806 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'android' -apply plugin: 'robolectric' dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information @@ -20,13 +19,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 { @@ -85,7 +77,7 @@ android { // NOTE: This disables Lint! tasks.whenTaskAdded { task -> - if (task.name.equals("lint")) { + if (task.name.contains("lint")) { task.enabled = false } } |