diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-06-01 10:50:02 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-06-01 10:50:02 +0200 |
| commit | 21aa11e5e04ffef3111010140cd7336fe181de39 (patch) | |
| tree | 6af11a281ce9fd4c8e70863d10093d910751bf66 /app/build.gradle | |
| parent | e5e9ac6e43b9cdec0f362711bb33747ab73fc297 (diff) | |
| parent | 03973cf7f9b0f8635b6835c548b192eb53a2be35 (diff) | |
Merge branch 'feature/Look-for-a-better-solution-to-the-VPN-slider-#6863' into develop
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle index c4286d29..1d942584 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'android' android { compileSdkVersion 21 - buildToolsVersion "21.1.2" + buildToolsVersion "22.0.1" signingConfigs { release { @@ -39,13 +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.1.1' } def processFileInplace(file, Closure processText) { |