From b4ba56bfb4db31ce121975e4f04db3b666cc4009 Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 18 Nov 2021 10:42:09 -0500 Subject: [PATCH] Update dependencies --- app/build.gradle.kts | 6 +++--- .../eu/kanade/tachiyomi/ui/setting/SettingsController.kt | 2 +- .../eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt | 2 +- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d4e05b0d04..2983289cf4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -149,10 +149,10 @@ dependencies { // AndroidX libraries implementation("androidx.annotation:annotation:1.3.0") implementation("androidx.appcompat:appcompat:1.4.0-rc01") - implementation("androidx.biometric:biometric-ktx:1.2.0-alpha03") + implementation("androidx.biometric:biometric-ktx:1.2.0-alpha04") implementation("androidx.browser:browser:1.4.0") implementation("androidx.constraintlayout:constraintlayout:2.1.1") - implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0") + implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0-beta01") implementation("androidx.core:core-ktx:1.7.0") implementation("androidx.core:core-splashscreen:1.0.0-alpha02") implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01") @@ -210,7 +210,7 @@ dependencies { implementation("com.github.requery:sqlite-android:3.36.0") // Preferences - implementation("androidx.preference:preference-ktx:1.1.1") + implementation("androidx.preference:preference-ktx:1.2.0-beta01") implementation("com.github.tfcporciuncula.flow-preferences:flow-preferences:1.4.0") // Model View Presenter diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt index b340bf1c7f..cd30fb776b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt @@ -94,7 +94,7 @@ abstract class SettingsController : PreferenceController() { activity!!.theme.resolveAttribute(R.attr.preferenceTheme, tv, true) themedContext = ContextThemeWrapper(activity, tv.resourceId) - val screen = preferenceManager.createPreferenceScreen(themedContext) + val screen = preferenceManager.createPreferenceScreen(themedContext!!) preferenceScreen = screen setupPreferenceScreen(screen) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt b/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt index 81dbcf3c12..d16cf9f0c9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt @@ -189,7 +189,7 @@ var Preference.summaryRes: Int var Preference.iconTint: Int get() = 0 // set only set(value) { - icon.setTint(value) + icon?.setTint(value) } var ListPreference.entriesRes: Array diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index fe4e3f08ad..a2b42e3268 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.3" - const val KOTLIN = "1.5.31" + const val KOTLIN = "1.6.0" const val KOTLINTER = "3.6.0" const val VERSIONS_PLUGIN = "0.39.0" const val ABOUTLIB_PLUGIN = "8.9.3"