diff options
| author | cyberta <cyberta@riseup.net> | 2017-11-01 05:43:36 -0700 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2017-11-01 05:43:36 -0700 |
| commit | dac004b0e2fcebe06f39b8d855d6cdae1c5764fa (patch) | |
| tree | 116faeebbda7e94ae28c33d15064e92831f7477f /app/build.gradle | |
| parent | a07834375b76127d9ebabfda265386ecdc2ffc90 (diff) | |
| parent | 5df197df4b82251467465815f503a2b38a36166b (diff) | |
Merge branch '8757_login_fails' into 'master'
8757 login fails
See merge request leap/bitmask_android!14
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/build.gradle b/app/build.gradle index 2614c6fb..7a2fa73a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ android { dependencies { testCompile 'org.mockito:mockito-core:2.6.3' - androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.5.4' + androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.6.3' testCompile 'junit:junit:4.12' testCompile 'org.json:json:20170516' compile 'com.jakewharton:butterknife:6.1.0' @@ -60,6 +60,7 @@ dependencies { 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.squareup.okhttp3:okhttp:3.9.0' compile 'mbanje.kurt:fabbutton:1.1.4' compile 'com.android.support:support-annotations:25.3.1' compile 'com.android.support:support-v4:26.0.0-alpha1' |