diff options
| author | cyberta <cyberta@riseup.net> | 2017-10-13 11:08:54 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2017-10-13 11:08:54 +0000 |
| commit | ef98b18734c25da77abe4f0067635cf795218c65 (patch) | |
| tree | c0d4e87751f8720f27c2c1f0b5c5b97bd959c163 /app/build.gradle | |
| parent | ee442a9ee54face7a8f71fc0428ff6d1184e382f (diff) | |
| parent | de722d9c14a0ce4353d677081b077efe15eb9525 (diff) | |
Merge branch '8746_client_must_honor_specified_protocol' into 'master'
#8746 fixes client must honor the protocol default specified by the provider
See merge request leap/bitmask_android!10
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/build.gradle b/app/build.gradle index 97ce9c35..5b33dff8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,12 +43,16 @@ android { debug { assets.srcDirs = ['src/debug/assets'] } + test { + resources.srcDirs += ['src/test/resources'] + } } } dependencies { androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.5.4' testCompile 'junit:junit:4.12' + testCompile 'org.json:json:20170516' compile 'com.jakewharton:butterknife:6.1.0' provided 'com.squareup.dagger:dagger-compiler:1.2.2' compile 'com.github.pedrovgs:renderers:1.5' |