Explorar o código

Dependency updates

inorichi %!s(int64=7) %!d(string=hai) anos
pai
achega
49eb638e15

+ 15 - 16
app/build.gradle

@@ -29,14 +29,14 @@ ext {
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "27.0.1"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.2"
     publishNonDefault true
 
     defaultConfig {
         applicationId "eu.kanade.tachiyomi"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         versionCode 32
         versionName "0.6.8"
@@ -122,14 +122,14 @@ dependencies {
 
     // ReactiveX
     implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'io.reactivex:rxjava:1.3.4'
+    implementation 'io.reactivex:rxjava:1.3.6'
     implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0'
     implementation 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
     implementation 'com.github.pwittchen:reactivenetwork:0.7.0'
 
     // Network client
     implementation "com.squareup.okhttp3:okhttp:3.9.1"
-    implementation 'com.squareup.okio:okio:1.13.0'
+    implementation 'com.squareup.okio:okio:1.14.0'
 
     // REST
     final retrofit_version = '2.3.0'
@@ -152,8 +152,8 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.10.2'
 
     // Job scheduling
-    implementation 'com.evernote:android-job:1.2.1'
-    implementation 'com.google.android.gms:play-services-gcm:11.6.2'
+    implementation 'com.evernote:android-job:1.2.4'
+    implementation 'com.google.android.gms:play-services-gcm:11.8.0'
 
     // Changelog
     implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
@@ -170,16 +170,16 @@ dependencies {
     implementation "com.github.inorichi.injekt:injekt-core:65b0440"
 
     // Image library
-    final glide_version = '4.3.1'
+    final glide_version = '4.6.1'
     implementation "com.github.bumptech.glide:glide:$glide_version"
     implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
     kapt "com.github.bumptech.glide:compiler:$glide_version"
 
     // Transformations
-    implementation 'jp.wasabeef:glide-transformations:3.0.1'
+    implementation 'jp.wasabeef:glide-transformations:3.1.1'
 
     // Logging
-    implementation 'com.jakewharton.timber:timber:4.6.0'
+    implementation 'com.jakewharton.timber:timber:4.6.1'
 
     // Crash reports
     implementation 'ch.acra:acra:4.9.2'
@@ -194,9 +194,7 @@ dependencies {
     implementation 'eu.davidea:flexible-adapter-ui:1.0.0-b1'
     implementation 'com.nononsenseapps:filepicker:2.5.2'
     implementation 'com.github.amulyakhare:TextDrawable:558677e'
-    implementation('com.afollestad.material-dialogs:core:0.9.4.7') {
-        exclude group: "com.android.support", module: "support-v13"
-    }
+    implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
     implementation 'me.zhanghai.android.systemuihelper:library:1.0.0'
     implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.0.4'
     implementation 'com.github.mthli:Slice:v1.2'
@@ -204,7 +202,7 @@ dependencies {
 
     // Conductor
     implementation "com.bluelinelabs:conductor:2.1.4"
-    implementation 'com.github.inorichi:conductor-support-preference:26.0.2'
+    implementation 'com.github.inorichi:conductor-support-preference:27.0.2'
 
     // RxBindings
     final rxbindings_version = '1.0.1'
@@ -225,13 +223,13 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    final coroutines_version = '0.19.1'
+    final coroutines_version = '0.22.2'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 }
 
 buildscript {
-    ext.kotlin_version = '1.2.0'
+    ext.kotlin_version = '1.2.21'
     repositories {
         mavenCentral()
     }
@@ -249,6 +247,7 @@ kotlin {
         coroutines 'enable'
     }
 }
+
 androidExtensions {
     experimental = true
 }

+ 1 - 1
app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaModelLoader.kt

@@ -79,7 +79,7 @@ class MangaModelLoader : ModelLoader<Manga, InputStream> {
      * @param height the height of the view where the resource will be loaded.
      */
     override fun buildLoadData(manga: Manga, width: Int, height: Int,
-                               options: Options?): ModelLoader.LoadData<InputStream>? {
+                               options: Options): ModelLoader.LoadData<InputStream>? {
         // Check thumbnail is not null or empty
         val url = manga.thumbnail_url
         if (url == null || url.isEmpty()) {

+ 3 - 2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt

@@ -439,7 +439,8 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
      * @param i The shape index to apply. Defaults to circle crop transformation.
      */
     private fun createShortcutForShape(i: Int = 0) {
-        GlideApp.with(activity)
+        if (activity == null) return
+        GlideApp.with(activity!!)
                 .asBitmap()
                 .load(presenter.manga)
                 .diskCacheStrategy(DiskCacheStrategy.NONE)
@@ -534,4 +535,4 @@ class MangaInfoController : NucleusController<MangaInfoPresenter>(),
         }
     }
 
-}
+}

+ 2 - 2
app/src/main/java/eu/kanade/tachiyomi/util/CoroutinesExtensions.kt

@@ -7,7 +7,7 @@ import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.launch
 
 fun launchUI(block: suspend CoroutineScope.() -> Unit): Job =
-        launch(UI, CoroutineStart.DEFAULT, block)
+        launch(UI, CoroutineStart.DEFAULT, null, block)
 
 fun launchNow(block: suspend CoroutineScope.() -> Unit): Job =
-        launch(UI, CoroutineStart.UNDISPATCHED, block)
+        launch(UI, CoroutineStart.UNDISPATCHED, null, block)

+ 2 - 2
app/src/main/java/eu/kanade/tachiyomi/widget/StateImageViewTarget.kt

@@ -55,10 +55,10 @@ class StateImageViewTarget(view: ImageView,
         super.onLoadCleared(placeholder)
     }
 
-    override fun onResourceReady(resource: Drawable?, transition: Transition<in Drawable>?) {
+    override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
         progress?.gone()
         view.scaleType = imageScaleType
         super.onResourceReady(resource, transition)
         this.resource = resource
     }
-}
+}

+ 1 - 1
build.gradle

@@ -9,7 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
-        classpath 'com.github.zellius:android-shortcut-gradle-plugin:0.1.1'
+        classpath 'com.github.zellius:android-shortcut-gradle-plugin:0.1.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }