From 5904a916d863b40e1406f62f43ca5e94b88d9fde Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Wed, 8 May 2019 12:16:52 -0700 Subject: [PATCH] No issue: Update Androidx dependencies 5-8-2019 (#2350) * No issue: Update Androidx dependencies 5-8-2019 * Update TrackingProtectionPreference --- .../fenix/settings/TrackingProtectionFragment.kt | 4 ++-- buildSrc/src/main/java/Dependencies.kt | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt index 90ff034a1..3ad13ea4f 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt @@ -55,8 +55,8 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() { val exceptions = it.getPreferenceKey(R.string.pref_key_tracking_protection_exceptions) val preferenceExceptions = findPreference(exceptions) - preferenceExceptions.shouldDisableView = true - preferenceExceptions.isEnabled = !exceptionsEmpty + preferenceExceptions?.shouldDisableView = true + preferenceExceptions?.isEnabled = !exceptionsEmpty preferenceExceptions?.onPreferenceClickListener = getClickListenerForExceptions() } } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index ea00a2510..a8810808a 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -14,15 +14,15 @@ private object Versions { const val leakcanary = "1.6.3" const val leanplum = "4.3.1" - const val androidx_appcompat = "1.1.0-alpha04" + const val androidx_appcompat = "1.1.0-alpha05" const val androidx_constraint_layout = "2.0.0-alpha5" - const val androidx_preference = "1.1.0-alpha03" + const val androidx_preference = "1.1.0-alpha05" const val androidx_legacy = "1.0.0" - const val androidx_annotation = "1.1.0-beta01" - const val androidx_lifecycle = "2.1.0-alpha04" - const val androidx_fragment = "1.1.0-alpha07" - const val androidx_navigation = "2.1.0-alpha02" - const val androidx_recyclerview = "1.1.0-alpha04" + const val androidx_annotation = "1.1.0-rc01" + const val androidx_lifecycle = "2.2.0-alpha01" + const val androidx_fragment = "1.1.0-alpha08" + const val androidx_navigation = "2.1.0-alpha03" + const val androidx_recyclerview = "1.1.0-alpha05" const val androidx_testing = "1.1.0-alpha08" const val appservices_gradle_plugin = "0.4.4"