mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-30 12:32:17 -05:00
Merge pull request #1238 from wfaulk/fix-tests
updated robolectric to support new android support libs
This commit is contained in:
commit
6ba4160786
@ -17,7 +17,8 @@ dependencies {
|
|||||||
testCompile 'junit:junit:4.11'
|
testCompile 'junit:junit:4.11'
|
||||||
testCompile 'com.google.android:android:4.1.1.4'
|
testCompile 'com.google.android:android:4.1.1.4'
|
||||||
testCompile('com.squareup:fest-android:1.0.8') { exclude module: 'support-v4' }
|
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: 'classworlds'
|
||||||
exclude module: 'maven-artifact'
|
exclude module: 'maven-artifact'
|
||||||
exclude module: 'maven-artifact-manager'
|
exclude module: 'maven-artifact-manager'
|
||||||
|
Loading…
Reference in New Issue
Block a user