From 3e132f102c5c818beac9e167bd80e1af152a9728 Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Mon, 16 Sep 2019 15:30:28 -0700 Subject: [PATCH] No issue: Update androidx libraries Sept 5 2019 --- .../mozilla/fenix/settings/SignOutFragment.kt | 2 +- .../QuickSettingsSheetDialogFragment.kt | 2 +- .../TrackingProtectionPanelDialogFragment.kt | 2 +- buildSrc/src/main/java/Dependencies.kt | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/SignOutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SignOutFragment.kt index 10eaaa37b..02206ba3a 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SignOutFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SignOutFragment.kt @@ -35,7 +35,7 @@ class SignOutFragment : BottomSheetDialogFragment() { dialog.setOnShowListener { val bottomSheet = dialog.findViewById( com.google.android.material.R.id.design_bottom_sheet - ) as? FrameLayout + ) as FrameLayout val behavior = BottomSheetBehavior.from(bottomSheet) behavior.state = BottomSheetBehavior.STATE_EXPANDED } diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt index 51ee7636b..70c1b23e2 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt @@ -111,7 +111,7 @@ class QuickSettingsSheetDialogFragment : AppCompatDialogFragment() { BottomSheetDialog(requireContext(), this.theme).apply { setOnShowListener { val bottomSheet = - findViewById(MaterialR.id.design_bottom_sheet) as? FrameLayout + findViewById(MaterialR.id.design_bottom_sheet) as FrameLayout val behavior = BottomSheetBehavior.from(bottomSheet) behavior.state = BottomSheetBehavior.STATE_EXPANDED } diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt index 0576ae426..1b89a6e83 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt @@ -181,7 +181,7 @@ class TrackingProtectionPanelDialogFragment : AppCompatDialogFragment(), BackHan }.apply { setOnShowListener { val bottomSheet = - findViewById(com.google.android.material.R.id.design_bottom_sheet) as? FrameLayout + findViewById(com.google.android.material.R.id.design_bottom_sheet) as FrameLayout val behavior = BottomSheetBehavior.from(bottomSheet) behavior.state = BottomSheetBehavior.STATE_EXPANDED } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 0e858488b..a4ee6ef85 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -17,23 +17,23 @@ object Versions { const val osslicenses_plugin = "0.9.5" const val osslicenses_library = "17.0.0" - const val androidx_appcompat = "1.1.0-rc01" + const val androidx_appcompat = "1.1.0" const val androidx_coordinator_layout = "1.1.0-beta01" const val androidx_constraint_layout = "2.0.0-beta2" - const val androidx_preference = "1.1.0-rc01" + const val androidx_preference = "1.1.0" const val androidx_legacy = "1.0.0" const val androidx_annotation = "1.1.0" - const val androidx_lifecycle = "2.2.0-alpha03" - const val androidx_fragment = "1.2.0-alpha02" - const val androidx_navigation = "2.2.0-alpha01" - const val androidx_recyclerview = "1.1.0-beta01" + const val androidx_lifecycle = "2.2.0-alpha04" + const val androidx_fragment = "1.2.0-alpha03" + const val androidx_navigation = "2.2.0-alpha02" + const val androidx_recyclerview = "1.1.0-beta04" const val androidx_testing = "1.2.1-alpha02" const val androidx_test_ext = "1.0.0" - const val androidx_core = "1.2.0-alpha03" + const val androidx_core = "1.2.0-alpha04" const val androidx_paging = "2.1.0" const val androidx_transition = "1.1.0" const val androidx_work = "2.0.1" - const val google_material = "1.1.0-alpha07" + const val google_material = "1.1.0-alpha10" const val mozilla_android_components = "13.0.0-SNAPSHOT" // Note that android-components also depends on application-services,