From d5ad186095243438d17ccee7adfb01f12db14af7 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 3 May 2023 19:27:40 -0400 Subject: [PATCH] Bug 1831023 - Update AndroidX Appcompat to version 1.6.1 (#1884) * Bug 1831023 - Update AndroidX Appcompat to version 1.6.1 * Bug 1831023 - Add manifest entry for push notification permission * Bug 1831023 - Add suppression for MissingPermission linter failure * Bug 1831023 - Add super.onBackPressed() to TrackingProtectionPanelDialogFragment.kt --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .../trackingprotection/TrackingProtectionPanelDialogFragment.kt | 2 ++ buildSrc/src/main/java/FenixDependencies.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 d6fe262a7e..33c4da6f98 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelDialogFragment.kt @@ -169,6 +169,8 @@ class TrackingProtectionPanelDialogFragment : AppCompatDialogFragment(), UserInt object : BottomSheetDialog(requireContext(), this.theme) { @Deprecated("Deprecated in Java") override fun onBackPressed() { + @Suppress("DEPRECATION") + super.onBackPressed() this@TrackingProtectionPanelDialogFragment.onBackPressed() } }.apply { diff --git a/buildSrc/src/main/java/FenixDependencies.kt b/buildSrc/src/main/java/FenixDependencies.kt index 7dbec016b5..ebeeb495c7 100644 --- a/buildSrc/src/main/java/FenixDependencies.kt +++ b/buildSrc/src/main/java/FenixDependencies.kt @@ -22,7 +22,7 @@ object FenixVersions { const val androidx_activity = "1.6.1" const val androidx_compose = "1.4.2" const val androidx_compose_compiler = "1.4.6" - const val androidx_appcompat = "1.3.0" + const val androidx_appcompat = "1.6.1" const val androidx_benchmark = "1.1.1" const val androidx_biometric = "1.1.0" const val androidx_coordinator_layout = "1.1.0"