From cbc1050a61959598363f9cbd814e9aa0f11b3b9b Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 09:46:57 +0530 Subject: [PATCH] Deps: Migrated `AutomatticRest` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/networking/build.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index a33f583ad13b..f0a3ebaee05a 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -390,7 +390,7 @@ dependencies { } } - implementation ("com.automattic:rest:$automatticRestVersion") { + implementation (libs.automattic.rest) { exclude group: 'com.mcxiaoke.volley' } implementation "org.wordpress:persistentedittext:$wordPressPersistentEditTextVersion" diff --git a/build.gradle b/build.gradle index c543995e735a..e37eefafa73c 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,6 @@ ext { ext { // libs automatticAboutVersion = '1.4.0' - automatticRestVersion = '1.0.8' automatticTracksVersion = '5.1.0' gutenbergMobileVersion = 'v1.120.1' wordPressAztecVersion = 'v2.1.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9e06ee358a41..d08ce185c6f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,11 @@ [versions] androidxComposeNavigation = '2.7.6' +automatticRest = '1.0.8' androidxWebkit = '1.11.0' [libraries] androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } +automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} [plugins] diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle index 457a92785de9..f88dff748c38 100644 --- a/libs/networking/build.gradle +++ b/libs/networking/build.gradle @@ -27,7 +27,7 @@ repositories { } dependencies { - implementation ("com.automattic:rest:$automatticRestVersion") { + implementation (libs.automattic.rest) { exclude group: 'com.mcxiaoke.volley' } implementation "org.wordpress:utils:$wordPressUtilsVersion"