diff options
| author | fupduck <fupduck@riseup.net> | 2018-01-11 06:37:01 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-01-11 06:37:01 -0800 |
| commit | 68d6eb91436d0d145fd340056fd8000f7dd1ff34 (patch) | |
| tree | 2f37b74f259915d1b04facd0d0f59856f112f8b8 /app/build.gradle | |
| parent | 67ff3447f10c43770dc9ee4dccf358321063d131 (diff) | |
| parent | 1e94e6e1403d97e47119318bd43b173ef20658b1 (diff) | |
Merge branch '8773_certificate_pinning' into '0.9.8'
8773 certificate pinning
See merge request leap/bitmask_android!21
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/app/build.gradle b/app/build.gradle index 048eb597..52c64ab7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,7 +64,16 @@ android { } dependencies { - testCompile 'org.mockito:mockito-core:2.6.3' + testCompile 'junit:junit:4.12' + testCompile 'org.mockito:mockito-core:2.8.0' + testCompile 'org.powermock:powermock-api-mockito2:1.7.3' + testCompile 'org.powermock:powermock-module-junit4:1.7.3' + testCompile 'org.powermock:powermock-core:1.7.3' + testCompile 'org.powermock:powermock-module-junit4-rule:1.7.3' + //testCompile 'com.madgag.spongycastle:bctls-jdk15on:1.58.0.0' + //testCompile 'com.madgag.spongycastle:bcpkix-jdk15on:1.58.0.0' + //testCompile 'com.madgag.spongycastle:bcpg-jdk15on:1.58.0.0' + androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.6.3' testCompile 'junit:junit:4.12' testCompile 'org.json:json:20170516' @@ -72,8 +81,7 @@ dependencies { provided 'com.squareup.dagger:dagger-compiler:1.2.2' compile 'com.github.pedrovgs:renderers:1.5' compile 'com.intellij:annotations:12.0' - compile 'com.google.code.gson:gson:2.4' - compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0' + compile 'com.google.code.gson:gson:2.8.2' compile 'com.squareup.okhttp3:okhttp:3.9.0' compile 'mbanje.kurt:fabbutton:1.1.4' compile "com.android.support:support-core-utils:26.1.0" |