From a26f9083708923d6e7a62c9f38024e89be2ae5b9 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Sun, 9 Apr 2017 18:25:05 +0200
Subject: [PATCH] Dependency updates

---
 app/build.gradle                              | 22 ++++++++++++++-----
 .../kanade/tachiyomi/ui/main/MainActivity.kt  |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6e423385e..9f31c603e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,7 +105,7 @@ dependencies {
     compile 'com.github.inorichi:junrar-android:634c1f5'
 
     // Android support library
-    final support_library_version = '25.2.0'
+    final support_library_version = '25.3.1'
     compile "com.android.support:support-v4:$support_library_version"
     compile "com.android.support:appcompat-v7:$support_library_version"
     compile "com.android.support:cardview-v7:$support_library_version"
@@ -120,7 +120,7 @@ dependencies {
 
     // ReactiveX
     compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'io.reactivex:rxjava:1.2.7'
+    compile 'io.reactivex:rxjava:1.2.9'
     compile 'com.jakewharton.rxrelay:rxrelay:1.2.0'
     compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
     compile 'com.github.pwittchen:reactivenetwork:0.7.0'
@@ -153,7 +153,7 @@ dependencies {
     compile 'org.jsoup:jsoup:1.10.2'
 
     // Job scheduling
-    compile 'com.evernote:android-job:1.1.7'
+    compile 'com.evernote:android-job:1.1.8'
     compile 'com.google.android.gms:play-services-gcm:10.2.0'
 
     // Changelog
@@ -175,7 +175,7 @@ dependencies {
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
     // Transformations
-    compile 'jp.wasabeef:glide-transformations:2.0.1'
+    compile 'jp.wasabeef:glide-transformations:2.0.2'
 
     // Logging
     compile 'com.jakewharton.timber:timber:4.5.1'
@@ -193,7 +193,7 @@ dependencies {
     compile 'com.github.inorichi:FlexibleAdapter:93985fe' // v4.2.0 to be removed
     compile 'com.nononsenseapps:filepicker:2.5.2'
     compile 'com.github.amulyakhare:TextDrawable:558677e'
-    compile 'com.afollestad.material-dialogs:core:0.9.4.1'
+    compile 'com.afollestad.material-dialogs:core:0.9.4.2'
     compile 'net.xpece.android:support-preference:1.2.5'
     compile 'me.zhanghai.android.systemuihelper:library:1.0.0'
     compile 'de.hdodenhof:circleimageview:2.1.0'
@@ -225,6 +225,18 @@ repositories {
     mavenCentral()
 }
 
+// Workaround to force a support lib version
+configurations.all {
+    resolutionStrategy.eachDependency { details ->
+        def requested = details.requested
+        if (requested.group == 'com.android.support') {
+            if (!requested.name.startsWith("multidex")) {
+                details.useVersion '25.3.1'
+            }
+        }
+    }
+}
+
 // add support for placeholders in resource files
 //https://code.google.com/p/android/issues/detail?id=69224
 def replacePlaceholdersInFile(basePath, fileName, placeholders) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index e5fbb5c6f..e40a8144e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -78,7 +78,7 @@ class MainActivity : BaseActivity() {
 
         if (savedState == null) {
             // Set start screen
-            when(intent.action){
+            when (intent.action) {
                 SHORTCUT_LIBRARY -> setSelectedDrawerItem(R.id.nav_drawer_library)
                 SHORTCUT_RECENTLY_UPDATED -> setSelectedDrawerItem(R.id.nav_drawer_recent_updates)
                 SHORTCUT_RECENTLY_READ -> setSelectedDrawerItem(R.id.nav_drawer_recently_read)