summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2016-03-16 20:53:33 +0100
committerMartin Fietz <Martin.Fietz@gmail.com>2016-03-16 20:53:33 +0100
commitc9f232ca5e449b93d3a8439c2871e218bfd3888e (patch)
treebb05d38b908b720ac49c36803f29c204763d1acb
parent49d4e2de157a00e0405cd7625c408adee6aab157 (diff)
parent36213fa94e6a7638d974b89bac04ecf0e22ad868 (diff)
downloadAntennaPod-c9f232ca5e449b93d3a8439c2871e218bfd3888e.zip
Merge pull request #1761 from mfietz/support-23.2.1
Upgrade Support libs, Glide, Iconify, OkHttp, Robotium
-rw-r--r--build.gradle8
-rw-r--r--core/build.gradle4
2 files changed, 7 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle
index dd7cd4385..2d42a5759 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,13 +46,15 @@ project.ext {
commonslangVersion = "3.4"
eventbusVersion = "2.4.0"
flattr4jVersion = "2.12"
- glideVersion = "3.6.1"
- iconifyVersion = "2.1.1"
+ glideVersion = "3.7.0"
+ glideOkhttpIntegrationVersion = "1.4.0"
+ iconifyVersion = "2.2.1"
jsoupVersion = "1.7.3"
materialDialogsVersion = "0.8.5.6@aar"
- okhttpVersion = "2.7.4"
+ okhttpVersion = "2.7.5"
okioVersion = "1.6.0"
recyclerviewFlexibledividerVersion = "1.2.6"
+ robotiumSoloVersion = "5.5.3"
rxAndroidVersion = "1.1.0"
rxJavaVersion = "1.1.0"
rxJavaRulesVersion = "1.1.0.0"
diff --git a/core/build.gradle b/core/build.gradle
index 09d13a476..f79ea8fc8 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -45,10 +45,10 @@ dependencies {
exclude group: "org.json", module: "json"
}
compile "commons-io:commons-io:$commonsioVersion"
- compile "com.jayway.android.robotium:robotium-solo:5.5.3"
+ compile "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
compile "org.jsoup:jsoup:$jsoupVersion"
compile "com.github.bumptech.glide:glide:$glideVersion"
- compile "com.github.bumptech.glide:okhttp-integration:1.3.1"
+ compile "com.github.bumptech.glide:okhttp-integration:$glideOkhttpIntegrationVersion"
compile "com.squareup.okhttp:okhttp:$okhttpVersion"
compile "com.squareup.okhttp:okhttp-urlconnection:$okhttpVersion"
compile "com.squareup.okio:okio:$okioVersion"