diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-06-01 10:46:53 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-06-01 10:46:53 +0200 |
| commit | 03973cf7f9b0f8635b6835c548b192eb53a2be35 (patch) | |
| tree | 6af11a281ce9fd4c8e70863d10093d910751bf66 /app/build.gradle | |
| parent | ff679b7f20700cec2c08cb8026c585b47df3612f (diff) | |
| parent | 4560bda1f5c6e5974973f0f3f815e7d6fcf9afb2 (diff) | |
Merge branch 'feature/simplify-user-session-layout-and-update-dependencies' into feature/Look-for-a-better-solution-to-the-VPN-slider-#6863
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/build.gradle b/app/build.gradle index 06af82c8..1d942584 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,15 +39,14 @@ android { } dependencies { - androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.3.1' - compile 'com.jakewharton:butterknife:6.0.0+' - provided 'com.squareup.dagger:dagger-compiler:1.2.2+' - compile 'com.github.pedrovgs:renderers:1.3+' + androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.4.1' + compile 'com.jakewharton:butterknife:6.1.0' + 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+' + compile 'com.google.code.gson:gson:2.3.1' compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0' - compile 'mbanje.kurt:fabbutton:1.0.9' - compile "com.wefika:flowlayout:0.3.0" + compile 'mbanje.kurt:fabbutton:1.1.1' } def processFileInplace(file, Closure processText) { |