From 0ced10a5a006348cc2e33ac10d554eb4feeee1f1 Mon Sep 17 00:00:00 2001
From: Neel Doshi <neeldoshi147@gmail.com>
Date: Fri, 5 Jul 2024 09:37:21 +0530
Subject: [PATCH] Deps: Migrated Compose Navigation to Version Catlog & Changed
 webkit Naming Convention

---
 WordPress/build.gradle    | 2 +-
 build.gradle              | 1 -
 gradle/libs.versions.toml | 6 ++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 3fa098a17ee5..a33f583ad13b 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -351,7 +351,7 @@ static def addBuildConfigFieldsFromPrefixedProperties(variant, properties, prefi
 
 dependencies {
     implementation libs.androidx.webkit
-    implementation "androidx.navigation:navigation-compose:$androidxComposeNavigationVersion"
+    implementation libs.androidx.navigation
     compileOnly project(path: ':libs:annotations')
     ksp project(':libs:processors')
     implementation (project(path:':libs:networking')) {
diff --git a/build.gradle b/build.gradle
index b37bf0bbf4d8..c543995e735a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,6 @@ ext {
     androidxCameraVersion = '1.3.4'
     androidxComposeBomVersion = '2023.10.00'
     androidxComposeCompilerVersion = '1.5.9'
-    androidxComposeNavigationVersion = '2.7.6'
     androidxCardviewVersion = '1.0.0'
     androidxConstraintlayoutVersion = '2.1.4'
     androidxConstraintlayoutComposeVersion = '1.0.1'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 51b6f8c1a963..9e06ee358a41 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,8 +1,10 @@
 [versions]
-androidxWebkitVersion =  '1.11.0'
+androidxComposeNavigation = '2.7.6'
+androidxWebkit =  '1.11.0'
 
 [libraries]
-androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkitVersion"}
+androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" }
+androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"}
 
 [plugins]