diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-04 13:31:38 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-04 13:31:38 +0200 |
| commit | 02e86c90b6ccfc70a832592287d95245df5f8707 (patch) | |
| tree | df4095b65946caedefd80a985684a346157f0063 | |
| parent | aa68c41f5a3867d98c2539698546d5ff6de8391c (diff) | |
| parent | 6ba416078698f83ba33dea630e106dcfcca061fa (diff) | |
| download | open-keychain-02e86c90b6ccfc70a832592287d95245df5f8707.tar.gz open-keychain-02e86c90b6ccfc70a832592287d95245df5f8707.tar.bz2 open-keychain-02e86c90b6ccfc70a832592287d95245df5f8707.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
| -rw-r--r-- | OpenKeychain-Test/build.gradle | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain-Test/build.gradle b/OpenKeychain-Test/build.gradle index 1c87fcb4d..2bf35b3d1 100644 --- a/OpenKeychain-Test/build.gradle +++ b/OpenKeychain-Test/build.gradle @@ -17,7 +17,8 @@ dependencies { testCompile 'junit:junit:4.11' testCompile 'com.google.android:android:4.1.1.4' testCompile('com.squareup:fest-android:1.0.8') { exclude module: 'support-v4' } - testCompile ('org.robolectric:robolectric:2.3') { + testCompile 'org.apache.maven:maven-ant-tasks:2.1.3' + testCompile ('org.robolectric:robolectric:2.4') { exclude module: 'classworlds' exclude module: 'maven-artifact' exclude module: 'maven-artifact-manager' |