From 40c37e67efd4bb5a8e5522f0bfd25b9dcb8b3075 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Thu, 27 Jul 2023 13:30:14 +0300
Subject: [PATCH] Bug 1850316 - Remove navigation library duplication from
 FenixDependencies.

---
 app/build.gradle                                              | 4 ++--
 build.gradle                                                  | 2 +-
 .../src/main/java/FenixDependenciesPlugin.kt                  | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bacca9711..4a689a89a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -640,8 +640,8 @@ dependencies {
     implementation ComponentsDependencies.androidx_paging
     implementation ComponentsDependencies.androidx_preferences
     implementation ComponentsDependencies.androidx_fragment
-    implementation FenixDependencies.androidx_navigation_fragment
-    implementation FenixDependencies.androidx_navigation_ui
+    implementation ComponentsDependencies.androidx_navigation_fragment
+    implementation ComponentsDependencies.androidx_navigation_ui
     implementation ComponentsDependencies.androidx_compose_navigation
     implementation ComponentsDependencies.androidx_recyclerview
 
diff --git a/build.gradle b/build.gradle
index cb9ff542e..bd002d017 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,7 +78,7 @@ buildscript {
         classpath ComponentsDependencies.tools_androidgradle
         classpath ComponentsDependencies.tools_kotlingradle
         classpath FenixDependencies.tools_benchmarkgradle
-        classpath FenixDependencies.androidx_safeargs
+        classpath ComponentsDependencies.androidx_safeargs
         classpath FenixDependencies.osslicenses_plugin
         classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
         classpath "${ApplicationServicesConfig.groupId}:tooling-nimbus-gradle:${ApplicationServicesConfig.version}"
diff --git a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
index efc00ff77..a8657de94 100644
--- a/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+++ b/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
@@ -22,6 +22,7 @@ object FenixVersions {
     const val androidx_benchmark = "1.2.2"
     const val androidx_profileinstaller = "1.3.1"
     const val androidx_legacy = "1.0.0"
+    const val androidx_lifecycle = "2.6.1"
     const val androidx_navigation = "2.5.3"
     const val androidx_splash_screen = "1.0.1"
     const val androidx_transition = "1.4.1"
@@ -55,6 +56,7 @@ object FenixDependencies {
     const val androidx_profileinstaller = "androidx.profileinstaller:profileinstaller:${FenixVersions.androidx_profileinstaller}"
     const val androidx_activity_ktx = "androidx.activity:activity-ktx:${FenixVersions.androidx_activity}"
     const val androidx_legacy = "androidx.legacy:legacy-support-v4:${FenixVersions.androidx_legacy}"
+    const val androidx_lifecycle_common = "androidx.lifecycle:lifecycle-common:${FenixVersions.androidx_lifecycle}"
     const val androidx_safeargs = "androidx.navigation:navigation-safe-args-gradle-plugin:${FenixVersions.androidx_navigation}"
     const val androidx_navigation_fragment = "androidx.navigation:navigation-fragment-ktx:${FenixVersions.androidx_navigation}"
     const val androidx_navigation_ui = "androidx.navigation:navigation-ui:${FenixVersions.androidx_navigation}"