From 9de08c8166749a8959f27c78185060b00269e372 Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 20 Sep 2021 14:33:35 -0400 Subject: [PATCH] Update dependencies --- app/build.gradle.kts | 15 +++++++++------ app/src/main/java/eu/kanade/tachiyomi/App.kt | 13 +++++-------- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6c00c80be4..aa2dc6c9cb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -141,16 +141,17 @@ dependencies { implementation("androidx.annotation:annotation:1.3.0-alpha01") implementation("androidx.appcompat:appcompat:1.4.0-alpha03") implementation("androidx.biometric:biometric-ktx:1.2.0-alpha03") - implementation("androidx.browser:browser:1.3.0") + implementation("androidx.browser:browser:1.4.0-alpha01") implementation("androidx.constraintlayout:constraintlayout:2.1.0") implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0") - implementation("androidx.core:core-ktx:1.7.0-alpha02") + implementation("androidx.core:core-ktx:1.7.0-beta01") implementation("androidx.core:core-splashscreen:1.0.0-alpha01") - implementation("androidx.recyclerview:recyclerview:1.2.1") + implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01") + implementation("androidx.viewpager:viewpager:1.1.0-alpha01") - val lifecycleVersion = "2.4.0-alpha01" - implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion") + val lifecycleVersion = "2.4.0-beta01" + implementation("androidx.lifecycle:lifecycle-common:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-process:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") @@ -231,7 +232,9 @@ dependencies { implementation("eu.davidea:flexible-adapter-ui:1.0.0") implementation("com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0") implementation("com.github.chrisbanes:PhotoView:2.3.0") - implementation("com.github.tachiyomiorg:DirectionalViewPager:1.0.0") + implementation("com.github.tachiyomiorg:DirectionalViewPager:1.0.0") { + exclude(group = "androidx.viewpager", module = "viewpager") + } implementation("dev.chrisbanes.insetter:insetter:0.6.0") // Conductor diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index 6f5f488d5a..ef2b269fc3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -12,9 +12,8 @@ import android.webkit.WebView import androidx.appcompat.app.AppCompatDelegate import androidx.core.app.NotificationManagerCompat import androidx.core.content.getSystemService -import androidx.lifecycle.Lifecycle -import androidx.lifecycle.LifecycleObserver -import androidx.lifecycle.OnLifecycleEvent +import androidx.lifecycle.DefaultLifecycleObserver +import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner import androidx.lifecycle.lifecycleScope import coil.ImageLoader @@ -45,14 +44,14 @@ import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy import java.security.Security -open class App : Application(), LifecycleObserver, ImageLoaderFactory { +open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { private val preferences: PreferencesHelper by injectLazy() private val disableIncognitoReceiver = DisableIncognitoReceiver() override fun onCreate() { - super.onCreate() + super.onCreate() if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree()) // TLS 1.3 support for Android < 10 @@ -131,9 +130,7 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory { }.build() } - @OnLifecycleEvent(Lifecycle.Event.ON_STOP) - @Suppress("unused") - fun onAppBackgrounded() { + override fun onStop(owner: LifecycleOwner) { if (!AuthenticatorUtil.isAuthenticating && preferences.lockAppAfter().get() >= 0) { SecureActivityDelegate.locked = true } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 00ee25118d..1142d00643 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,6 +1,6 @@ object BuildPluginsVersion { const val AGP = "7.0.2" - const val KOTLIN = "1.5.30" + const val KOTLIN = "1.5.31" const val KOTLINTER = "3.6.0" const val VERSIONS_PLUGIN = "0.39.0" const val ABOUTLIB_PLUGIN = "8.9.1"