summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2015-11-01 16:03:33 +0100
committerMartin Fietz <Martin.Fietz@gmail.com>2015-11-01 17:13:24 +0100
commitb1b1df3cdc8bdc75da4f29a72f0153d5df243603 (patch)
tree508c3177b62dba05cb047bbd0417cf729fe0d99c
parentf53b181fe848ad27a620b4bbc65c4f49c9ff0cf6 (diff)
downloadAntennaPod-b1b1df3cdc8bdc75da4f29a72f0153d5df243603.zip
Upgrade libraries
-rw-r--r--app/build.gradle15
-rw-r--r--core/build.gradle12
2 files changed, 15 insertions, 12 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 9ec87acc2..e938579ae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,20 +14,23 @@ dependencies {
compile 'com.android.support:gridlayout-v7:22.2.1'
compile 'com.android.support:cardview-v7:22.2.1'
compile 'com.android.support:design:22.2.1'
- compile 'org.apache.commons:commons-lang3:3.3.2'
+ compile 'org.apache.commons:commons-lang3:3.4'
compile('org.shredzone.flattr4j:flattr4j-core:2.12') {
exclude group: 'org.json', module: 'json'
}
compile 'commons-io:commons-io:2.4'
compile 'org.jsoup:jsoup:1.7.3'
compile 'com.github.bumptech.glide:glide:3.6.1'
- compile 'com.squareup.okhttp:okhttp:2.4.0'
- compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0'
- compile 'com.squareup.okio:okio:1.2.0'
+ compile 'com.squareup.okhttp:okhttp:2.5.0'
+ compile 'com.squareup.okhttp:okhttp-urlconnection:2.5.0'
+ compile 'com.squareup.okio:okio:1.6.0'
compile 'de.greenrobot:eventbus:2.4.0'
compile 'io.reactivex:rxandroid:1.0.1'
- compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.0.3'
- compile 'com.afollestad:material-dialogs:0.7.8.1'
+ compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.1.0'
+ compile('com.afollestad.material-dialogs:core:0.8.5.0@aar') {
+ transitive = true;
+ exclude group: 'com.android.support', module: 'appcompat-v7';
+ }
compile 'com.github.AntennaPod:AntennaPod-AudioPlayer:v1.0.2'
diff --git a/core/build.gradle b/core/build.gradle
index 87e91898d..c26e86fb3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -41,18 +41,18 @@ dependencies {
compile 'com.android.support:support-v4:22.2.1'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:design:22.2.1'
- compile 'org.apache.commons:commons-lang3:3.3.2'
+ compile 'org.apache.commons:commons-lang3:3.4'
compile ('org.shredzone.flattr4j:flattr4j-core:2.12') {
exclude group: 'org.json', module: 'json'
}
compile 'commons-io:commons-io:2.4'
- compile 'com.jayway.android.robotium:robotium-solo:5.2.1'
+ compile 'com.jayway.android.robotium:robotium-solo:5.5.2'
compile 'org.jsoup:jsoup:1.7.3'
compile 'com.github.bumptech.glide:glide:3.6.1'
- compile 'com.github.bumptech.glide:okhttp-integration:1.3.0'
- compile 'com.squareup.okhttp:okhttp:2.4.0'
- compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0'
- compile 'com.squareup.okio:okio:1.2.0'
+ compile 'com.github.bumptech.glide:okhttp-integration:1.3.1'
+ compile 'com.squareup.okhttp:okhttp:2.5.0'
+ compile 'com.squareup.okhttp:okhttp-urlconnection:2.5.0'
+ compile 'com.squareup.okio:okio:1.6.0'
compile 'com.nineoldandroids:library:2.4.0'
compile 'de.greenrobot:eventbus:2.4.0'
compile 'io.reactivex:rxandroid:1.0.1'