diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-04 13:29:43 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-04 13:29:43 +0200 |
| commit | 6ba416078698f83ba33dea630e106dcfcca061fa (patch) | |
| tree | e5af59de4ea0212cff2524b4223bb9011b9ca3ef | |
| parent | f3870cee290a7f8f996c14d457cba3be4127cd3e (diff) | |
| parent | 971ceb07d4fd8cba92a1ec32cc2a163cf11c3559 (diff) | |
| download | open-keychain-6ba416078698f83ba33dea630e106dcfcca061fa.tar.gz open-keychain-6ba416078698f83ba33dea630e106dcfcca061fa.tar.bz2 open-keychain-6ba416078698f83ba33dea630e106dcfcca061fa.zip | |
Merge pull request #1238 from wfaulk/fix-tests
updated robolectric to support new android support libs
| -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' |