From b909a095b26361352d8e65aaf1a3093537f064dd Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 27 Sep 2024 15:30:00 +0300 Subject: [PATCH 01/86] Deps: Migrate androidx lifecycle to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 4 ++-- WooCommerce/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 8 ++++++++ quicklogin/build.gradle | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 9af1466b7fb..a140ae66d51 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -167,8 +167,8 @@ dependencies { // Android Support implementation "androidx.work:work-runtime-ktx:$workManagerVersion" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion" + implementation(libs.androidx.lifecycle.viewmodel.savedstate) + implementation(libs.androidx.lifecycle.livedata.ktx) implementation 'androidx.core:core-splashscreen:1.0.1' implementation "androidx.navigation:navigation-compose:2.7.7" implementation 'androidx.activity:activity-compose' diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 53282e4f365..884843298c2 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -409,8 +409,8 @@ dependencies { // ViewModel and LiveData implementation "androidx.fragment:fragment-ktx:1.8.2" implementation "androidx.activity:activity-ktx:1.8.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion" - implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion" + implementation(libs.androidx.lifecycle.viewmodel.savedstate) + implementation(libs.androidx.lifecycle.process) // Coroutines implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" @@ -448,7 +448,7 @@ dependencies { implementation 'androidx.hilt:hilt-navigation-compose:1.1.0' implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2' + implementation(libs.androidx.lifecycle.viewmodel.compose) implementation "io.coil-kt:coil-compose:$coilVersion" implementation "io.coil-kt:coil-svg:$coilVersion" diff --git a/build.gradle b/build.gradle index cf6ae22a421..43704514632 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,6 @@ ext { googlePlayCoreVersion = '1.10.3' googlePlayWearableVersion = '18.1.0' coroutinesVersion = '1.8.1' - lifecycleVersion = '2.7.0' aztecVersion = 'v2.1.4' flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000000..e99bb38f184 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,8 @@ +[versions] +androidx-lifecycle = '2.7.0' + +[libraries] +androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } +androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } +androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" } diff --git a/quicklogin/build.gradle b/quicklogin/build.gradle index d650e446700..52418400a3e 100644 --- a/quicklogin/build.gradle +++ b/quicklogin/build.gradle @@ -78,7 +78,7 @@ android { } dependencies { - implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion" + implementation(libs.androidx.lifecycle.process) implementation "androidx.test.uiautomator:uiautomator:2.2.0" implementation "junit:junit:$jUnitVersion" From 74382711e98bf280eeb988748210866da2001d41 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 15:55:40 +0300 Subject: [PATCH 02/86] Deps: Migrate androidx test uiautomator to version catalogs on all mods --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ quicklogin/build.gradle | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 884843298c2..f73029ae984 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -373,7 +373,7 @@ dependencies { } androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion" kspAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion" - androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' + androidTestImplementation(libs.androidx.test.uiautomator) // Dependencies for screenshots androidTestImplementation 'tools.fastlane:screengrab:2.1.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e99bb38f184..99ba8b5d578 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,10 @@ [versions] androidx-lifecycle = '2.7.0' +androidx-test-uiautomator = '2.2.0' [libraries] androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" } +androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } diff --git a/quicklogin/build.gradle b/quicklogin/build.gradle index 52418400a3e..9abd0157617 100644 --- a/quicklogin/build.gradle +++ b/quicklogin/build.gradle @@ -80,7 +80,7 @@ android { dependencies { implementation(libs.androidx.lifecycle.process) - implementation "androidx.test.uiautomator:uiautomator:2.2.0" + implementation(libs.androidx.test.uiautomator) implementation "junit:junit:$jUnitVersion" implementation "androidx.test.ext:junit:$jUnitExtVersion" implementation "androidx.test:runner:$androidxTestCoreVersion" From ca33ceff035ed7a4f9d67e7ba95536515649f20e Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 15:57:18 +0300 Subject: [PATCH 03/86] Deps: Migrate junit to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/iap/build.gradle | 2 +- quicklogin/build.gradle | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index a140ae66d51..bc12c2fcdd9 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -195,7 +195,7 @@ dependencies { ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion" // Testing - testImplementation "junit:junit:$jUnitVersion" + testImplementation(libs.junit) testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "org.mockito:mockito-inline:$mockitoVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index f73029ae984..ca1a6831151 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -352,7 +352,7 @@ dependencies { } // Dependencies for local unit tests - testImplementation "junit:junit:$jUnitVersion" + testImplementation(libs.junit) testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "org.mockito:mockito-inline:$mockitoVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" diff --git a/build.gradle b/build.gradle index 43704514632..b1fdc7b0015 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,6 @@ ext { wearComposeVersion = "1.3.1" // Testing - jUnitVersion = '4.13.2' jUnitExtVersion = '1.1.5' androidxTestCoreVersion = '1.4.0' assertjVersion = '3.24.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 99ba8b5d578..79d9b716a59 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] androidx-lifecycle = '2.7.0' androidx-test-uiautomator = '2.2.0' +junit = '4.13.2' [libraries] androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } @@ -8,3 +9,4 @@ androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-p androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } +junit = { group = "junit", name = "junit", version.ref = "junit" } diff --git a/libs/iap/build.gradle b/libs/iap/build.gradle index 54032e4795a..81ec7fe6919 100644 --- a/libs/iap/build.gradle +++ b/libs/iap/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation("com.android.billingclient:billing-ktx:$billingVersion") implementation "androidx.appcompat:appcompat:$appCompatVersion" - testImplementation "junit:junit:$jUnitVersion" + testImplementation(libs.junit) testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "org.mockito:mockito-inline:$mockitoVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" diff --git a/quicklogin/build.gradle b/quicklogin/build.gradle index 9abd0157617..0c8818cbaf7 100644 --- a/quicklogin/build.gradle +++ b/quicklogin/build.gradle @@ -81,7 +81,7 @@ dependencies { implementation(libs.androidx.lifecycle.process) implementation(libs.androidx.test.uiautomator) - implementation "junit:junit:$jUnitVersion" + implementation(libs.junit) implementation "androidx.test.ext:junit:$jUnitExtVersion" implementation "androidx.test:runner:$androidxTestCoreVersion" implementation "androidx.test:rules:$androidxTestCoreVersion" From b62244b4e806fdd6a2dd6e83234c97633b181e18 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 15:59:25 +0300 Subject: [PATCH 04/86] Deps: Migrate androidx test ext to version catalogs on all modules --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ quicklogin/build.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index ca1a6831151..c2e0c31abf4 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -364,7 +364,7 @@ dependencies { }) // Dependencies for Espresso UI tests - androidTestImplementation "androidx.test.ext:junit:$jUnitExtVersion" + androidTestImplementation(libs.androidx.test.ext.junit) androidTestImplementation "androidx.test:rules:$androidxTestCoreVersion" androidTestImplementation "org.assertj:assertj-core:$assertjVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" diff --git a/build.gradle b/build.gradle index b1fdc7b0015..befa80c4c38 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,6 @@ ext { wearComposeVersion = "1.3.1" // Testing - jUnitExtVersion = '1.1.5' androidxTestCoreVersion = '1.4.0' assertjVersion = '3.24.1' espressoVersion = '3.4.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 79d9b716a59..f599407f03d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] androidx-lifecycle = '2.7.0' +androidx-test-ext = '1.1.5' androidx-test-uiautomator = '2.2.0' junit = '4.13.2' @@ -8,5 +9,6 @@ androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecy androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" } +androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } junit = { group = "junit", name = "junit", version.ref = "junit" } diff --git a/quicklogin/build.gradle b/quicklogin/build.gradle index 0c8818cbaf7..a7be0537114 100644 --- a/quicklogin/build.gradle +++ b/quicklogin/build.gradle @@ -82,7 +82,7 @@ dependencies { implementation(libs.androidx.test.uiautomator) implementation(libs.junit) - implementation "androidx.test.ext:junit:$jUnitExtVersion" + implementation(libs.androidx.test.ext.junit) implementation "androidx.test:runner:$androidxTestCoreVersion" implementation "androidx.test:rules:$androidxTestCoreVersion" implementation "androidx.test:core:$androidxTestCoreVersion" From 7719a7d65347cde2e5b2dbaad9737ce664a9f7d5 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:01:32 +0300 Subject: [PATCH 05/86] Deps: Migrate androidx test main to version catalogs on all modules --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ quicklogin/build.gradle | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index c2e0c31abf4..742e405010f 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -365,7 +365,7 @@ dependencies { // Dependencies for Espresso UI tests androidTestImplementation(libs.androidx.test.ext.junit) - androidTestImplementation "androidx.test:rules:$androidxTestCoreVersion" + androidTestImplementation(libs.androidx.test.main.rules) androidTestImplementation "org.assertj:assertj-core:$assertjVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion") { diff --git a/build.gradle b/build.gradle index befa80c4c38..f2ae3c55f3c 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,6 @@ ext { wearComposeVersion = "1.3.1" // Testing - androidxTestCoreVersion = '1.4.0' assertjVersion = '3.24.1' espressoVersion = '3.4.0' mockitoKotlinVersion = '4.0.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f599407f03d..463a94039ff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] androidx-lifecycle = '2.7.0' androidx-test-ext = '1.1.5' +androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' junit = '4.13.2' @@ -10,5 +11,8 @@ androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-p androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" } androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext" } +androidx-test-main-core = { group = "androidx.test", name = "core", version.ref = "androidx-test-main" } +androidx-test-main-rules = { group = "androidx.test", name = "rules", version.ref = "androidx-test-main" } +androidx-test-main-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-main" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } junit = { group = "junit", name = "junit", version.ref = "junit" } diff --git a/quicklogin/build.gradle b/quicklogin/build.gradle index a7be0537114..9c87d9faad6 100644 --- a/quicklogin/build.gradle +++ b/quicklogin/build.gradle @@ -83,9 +83,9 @@ dependencies { implementation(libs.androidx.test.uiautomator) implementation(libs.junit) implementation(libs.androidx.test.ext.junit) - implementation "androidx.test:runner:$androidxTestCoreVersion" - implementation "androidx.test:rules:$androidxTestCoreVersion" - implementation "androidx.test:core:$androidxTestCoreVersion" + implementation(libs.androidx.test.main.runner) + implementation(libs.androidx.test.main.rules) + implementation(libs.androidx.test.main.core) } if (project.hasProperty("debugStoreFile")) { From 831ff5cd0c04b69e1e8c371d194e6fb7078eb087 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:04:03 +0300 Subject: [PATCH 06/86] Deps: Migrate stripe terminal to version catalogs on cardreader --- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ libs/cardreader/build.gradle | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index f2ae3c55f3c..c402a2e52c3 100644 --- a/build.gradle +++ b/build.gradle @@ -124,7 +124,6 @@ ext { automatticTracksVersion = '5.0.0' workManagerVersion = '2.7.1' billingVersion = '5.0.0' - stripeTerminalVersion = '3.7.1' mlkitBarcodeScanningVersion = '17.2.0' mlkitTextRecognitionVersion = '16.0.0' androidxCameraVersion = '1.2.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 463a94039ff..b73ec84a01d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,6 +4,7 @@ androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' junit = '4.13.2' +stripe-terminal = '3.7.1' [libraries] androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } @@ -16,3 +17,5 @@ androidx-test-main-rules = { group = "androidx.test", name = "rules", version.re androidx-test-main-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-main" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } junit = { group = "junit", name = "junit", version.ref = "junit" } +stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } +stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } diff --git a/libs/cardreader/build.gradle b/libs/cardreader/build.gradle index e727516d5f3..63dff5d2dcb 100644 --- a/libs/cardreader/build.gradle +++ b/libs/cardreader/build.gradle @@ -27,8 +27,8 @@ android { } dependencies { - implementation "com.stripe:stripeterminal-localmobile:$stripeTerminalVersion" - implementation "com.stripe:stripeterminal-core:$stripeTerminalVersion" + implementation(libs.stripe.terminal.localmobile) + implementation(libs.stripe.terminal.core) // Coroutines implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" From ca0acb4ac2438cf110000a2fc11762cf7ebc3b60 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:11:22 +0300 Subject: [PATCH 07/86] Deps: Migrate kotlinx coroutines to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 8 ++++---- WooCommerce/build.gradle | 8 ++++---- build.gradle | 1 - gradle/libs.versions.toml | 5 +++++ libs/cardreader/build.gradle | 6 +++--- libs/iap/build.gradle | 6 +++--- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index bc12c2fcdd9..42ad89d85e8 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -178,10 +178,10 @@ dependencies { implementation 'com.google.code.gson:gson:2.10.1' // Coroutines - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion" + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.coroutines.android) + implementation(libs.kotlinx.coroutines.play.services) + testImplementation(libs.kotlinx.coroutines.test) // Dagger & Hilt implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion" diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 742e405010f..ece6a038826 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -413,10 +413,10 @@ dependencies { implementation(libs.androidx.lifecycle.process) // Coroutines - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion" + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.coroutines.android) + implementation(libs.kotlinx.coroutines.play.services) + testImplementation(libs.kotlinx.coroutines.test) testImplementation 'app.cash.turbine:turbine:1.0.0' diff --git a/build.gradle b/build.gradle index c402a2e52c3..777a099f5f7 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,6 @@ ext { eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' googlePlayWearableVersion = '18.1.0' - coroutinesVersion = '1.8.1' aztecVersion = 'v2.1.4' flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b73ec84a01d..70e58081405 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,6 +4,7 @@ androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' junit = '4.13.2' +kotlinx-coroutines = '1.8.1' stripe-terminal = '3.7.1' [libraries] @@ -17,5 +18,9 @@ androidx-test-main-rules = { group = "androidx.test", name = "rules", version.re androidx-test-main-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-main" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } junit = { group = "junit", name = "junit", version.ref = "junit" } +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } +kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" } +kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" } stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } diff --git a/libs/cardreader/build.gradle b/libs/cardreader/build.gradle index 63dff5d2dcb..17ff82347ae 100644 --- a/libs/cardreader/build.gradle +++ b/libs/cardreader/build.gradle @@ -31,12 +31,12 @@ dependencies { implementation(libs.stripe.terminal.core) // Coroutines - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.coroutines.android) testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "org.mockito:mockito-inline:$mockitoVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion" + testImplementation(libs.kotlinx.coroutines.test) } diff --git a/libs/iap/build.gradle b/libs/iap/build.gradle index 81ec7fe6919..13c4e60617d 100644 --- a/libs/iap/build.gradle +++ b/libs/iap/build.gradle @@ -26,8 +26,8 @@ android { } dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.coroutines.android) implementation("com.android.billingclient:billing-ktx:$billingVersion") implementation "androidx.appcompat:appcompat:$appCompatVersion" @@ -37,5 +37,5 @@ dependencies { testImplementation "org.mockito:mockito-inline:$mockitoVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion" + testImplementation(libs.kotlinx.coroutines.test) } From 43ac3f6d5d664c7fa9a65f0156b1897a9f8bde0a Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:21:48 +0300 Subject: [PATCH 08/86] Deps: Migrate mockito kotlin to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/cardreader/build.gradle | 2 +- libs/iap/build.gradle | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 42ad89d85e8..5ce491157cf 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -196,7 +196,7 @@ dependencies { // Testing testImplementation(libs.junit) - testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + testImplementation(libs.mockito.kotlin) testImplementation "org.mockito:mockito-inline:$mockitoVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index ece6a038826..17f5667c393 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -353,7 +353,7 @@ dependencies { // Dependencies for local unit tests testImplementation(libs.junit) - testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + testImplementation(libs.mockito.kotlin) testImplementation "org.mockito:mockito-inline:$mockitoVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" diff --git a/build.gradle b/build.gradle index 777a099f5f7..05d55b4da13 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,6 @@ ext { // Testing assertjVersion = '3.24.1' espressoVersion = '3.4.0' - mockitoKotlinVersion = '4.0.0' mockitoVersion = '4.6.1' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 70e58081405..538f7819de7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' junit = '4.13.2' kotlinx-coroutines = '1.8.1' +mockito-kotlin = '4.0.0' stripe-terminal = '3.7.1' [libraries] @@ -22,5 +23,6 @@ kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx- kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" } +mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } diff --git a/libs/cardreader/build.gradle b/libs/cardreader/build.gradle index 17ff82347ae..99d6e5eb18a 100644 --- a/libs/cardreader/build.gradle +++ b/libs/cardreader/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.coroutines.android) - testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + testImplementation(libs.mockito.kotlin) testImplementation "org.mockito:mockito-inline:$mockitoVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" diff --git a/libs/iap/build.gradle b/libs/iap/build.gradle index 13c4e60617d..a857a69ea3a 100644 --- a/libs/iap/build.gradle +++ b/libs/iap/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation "androidx.appcompat:appcompat:$appCompatVersion" testImplementation(libs.junit) - testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + testImplementation(libs.mockito.kotlin) testImplementation "org.mockito:mockito-inline:$mockitoVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" From f65ee2193342ff1ab3c7e2ad55712af721fec7f3 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:23:14 +0300 Subject: [PATCH 09/86] Deps: Migrate mockito inline to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/cardreader/build.gradle | 2 +- libs/iap/build.gradle | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 5ce491157cf..f6a716c919d 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -197,7 +197,7 @@ dependencies { // Testing testImplementation(libs.junit) testImplementation(libs.mockito.kotlin) - testImplementation "org.mockito:mockito-inline:$mockitoVersion" + testImplementation(libs.mockito.inline) testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" testImplementation("androidx.arch.core:core-testing:2.1.0", { diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 17f5667c393..076d93ed71f 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -354,7 +354,7 @@ dependencies { // Dependencies for local unit tests testImplementation(libs.junit) testImplementation(libs.mockito.kotlin) - testImplementation "org.mockito:mockito-inline:$mockitoVersion" + testImplementation(libs.mockito.inline) testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" testImplementation("androidx.arch.core:core-testing:2.1.0", { diff --git a/build.gradle b/build.gradle index 05d55b4da13..73218234245 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,6 @@ ext { // Testing assertjVersion = '3.24.1' espressoVersion = '3.4.0' - mockitoVersion = '4.6.1' } // Onboarding and dev env setup tasks diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 538f7819de7..12ca46d17aa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' junit = '4.13.2' kotlinx-coroutines = '1.8.1' +mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' stripe-terminal = '3.7.1' @@ -23,6 +24,7 @@ kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx- kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" } +mockito-inline = { group = "org.mockito", name = "mockito-inline", version.ref = "mockito-inline" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } diff --git a/libs/cardreader/build.gradle b/libs/cardreader/build.gradle index 99d6e5eb18a..685efa42fdb 100644 --- a/libs/cardreader/build.gradle +++ b/libs/cardreader/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation(libs.kotlinx.coroutines.android) testImplementation(libs.mockito.kotlin) - testImplementation "org.mockito:mockito-inline:$mockitoVersion" + testImplementation(libs.mockito.inline) testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" testImplementation(libs.kotlinx.coroutines.test) diff --git a/libs/iap/build.gradle b/libs/iap/build.gradle index a857a69ea3a..50b8a9c3875 100644 --- a/libs/iap/build.gradle +++ b/libs/iap/build.gradle @@ -34,7 +34,7 @@ dependencies { testImplementation(libs.junit) testImplementation(libs.mockito.kotlin) - testImplementation "org.mockito:mockito-inline:$mockitoVersion" + testImplementation(libs.mockito.inline) testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" testImplementation(libs.kotlinx.coroutines.test) From 2255b40171fbe17e0a673e756584abff2dd50513 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:25:36 +0300 Subject: [PATCH 10/86] Deps: Migrate assertj to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/cardreader/build.gradle | 2 +- libs/iap/build.gradle | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index f6a716c919d..6667e049cb5 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -199,7 +199,7 @@ dependencies { testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" - testImplementation "org.assertj:assertj-core:$assertjVersion" + testImplementation(libs.assertj.core) testImplementation("androidx.arch.core:core-testing:2.1.0", { exclude group: 'com.android.support', module: 'support-compat' exclude group: 'com.android.support', module: 'support-annotations' diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 076d93ed71f..1492d3e35cc 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -356,7 +356,7 @@ dependencies { testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" - testImplementation "org.assertj:assertj-core:$assertjVersion" + testImplementation(libs.assertj.core) testImplementation("androidx.arch.core:core-testing:2.1.0", { exclude group: 'com.android.support', module: 'support-compat' exclude group: 'com.android.support', module: 'support-annotations' @@ -366,7 +366,7 @@ dependencies { // Dependencies for Espresso UI tests androidTestImplementation(libs.androidx.test.ext.junit) androidTestImplementation(libs.androidx.test.main.rules) - androidTestImplementation "org.assertj:assertj-core:$assertjVersion" + androidTestImplementation(libs.assertj.core) androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion") { exclude group: "com.google.protobuf", module: "protobuf-lite" diff --git a/build.gradle b/build.gradle index 73218234245..34353168135 100644 --- a/build.gradle +++ b/build.gradle @@ -144,7 +144,6 @@ ext { wearComposeVersion = "1.3.1" // Testing - assertjVersion = '3.24.1' espressoVersion = '3.4.0' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 12ca46d17aa..cc7bc756494 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,7 @@ androidx-lifecycle = '2.7.0' androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' +assertj = '3.24.1' junit = '4.13.2' kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' @@ -19,6 +20,7 @@ androidx-test-main-core = { group = "androidx.test", name = "core", version.ref androidx-test-main-rules = { group = "androidx.test", name = "rules", version.ref = "androidx-test-main" } androidx-test-main-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-main" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } +assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" } junit = { group = "junit", name = "junit", version.ref = "junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } diff --git a/libs/cardreader/build.gradle b/libs/cardreader/build.gradle index 685efa42fdb..56d00f6cec5 100644 --- a/libs/cardreader/build.gradle +++ b/libs/cardreader/build.gradle @@ -37,6 +37,6 @@ dependencies { testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" - testImplementation "org.assertj:assertj-core:$assertjVersion" + testImplementation(libs.assertj.core) testImplementation(libs.kotlinx.coroutines.test) } diff --git a/libs/iap/build.gradle b/libs/iap/build.gradle index 50b8a9c3875..de3a8b4e4ee 100644 --- a/libs/iap/build.gradle +++ b/libs/iap/build.gradle @@ -36,6 +36,6 @@ dependencies { testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" - testImplementation "org.assertj:assertj-core:$assertjVersion" + testImplementation(libs.assertj.core) testImplementation(libs.kotlinx.coroutines.test) } From 03bd87556b20f2a565087c89496c6b69cd52d8b0 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:26:57 +0300 Subject: [PATCH 11/86] Deps: Migrate android billingclient to version catalogs on iap --- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/iap/build.gradle | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 34353168135..384ebf6d6de 100644 --- a/build.gradle +++ b/build.gradle @@ -122,7 +122,6 @@ ext { aboutAutomatticVersion = '0.0.6' automatticTracksVersion = '5.0.0' workManagerVersion = '2.7.1' - billingVersion = '5.0.0' mlkitBarcodeScanningVersion = '17.2.0' mlkitTextRecognitionVersion = '16.0.0' androidxCameraVersion = '1.2.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cc7bc756494..fd3b1f4e230 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,5 @@ [versions] +android-billingclient = '5.0.0' androidx-lifecycle = '2.7.0' androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' @@ -11,6 +12,7 @@ mockito-kotlin = '4.0.0' stripe-terminal = '3.7.1' [libraries] +android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } diff --git a/libs/iap/build.gradle b/libs/iap/build.gradle index de3a8b4e4ee..46c9f746a67 100644 --- a/libs/iap/build.gradle +++ b/libs/iap/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.coroutines.android) - implementation("com.android.billingclient:billing-ktx:$billingVersion") + implementation(libs.android.billingclient.ktx) implementation "androidx.appcompat:appcompat:$appCompatVersion" testImplementation(libs.junit) From 98b1d702428777834eda04020a7ca1f40c162f4d Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:29:13 +0300 Subject: [PATCH 12/86] Deps: Migrate androidx appcompat to version catalogs on all modules --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/iap/build.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 1492d3e35cc..875ca23302a 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -238,7 +238,7 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout:2.1.4" implementation "androidx.recyclerview:recyclerview:1.3.2" implementation "androidx.recyclerview:recyclerview-selection:1.1.0" - implementation "androidx.appcompat:appcompat:$appCompatVersion" + implementation(libs.androidx.appcompat) implementation "com.google.android.material:material:$materialVersion" implementation "androidx.transition:transition:$transitionVersion" implementation "androidx.cardview:cardview:1.0.0" diff --git a/build.gradle b/build.gradle index 384ebf6d6de..708cf328841 100644 --- a/build.gradle +++ b/build.gradle @@ -112,7 +112,6 @@ ext { flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' coreKtxVersion = '1.13.1' - appCompatVersion = '1.4.2' materialVersion = '1.12.0' transitionVersion = '1.5.1' hiltJetpackVersion = '1.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fd3b1f4e230..4419c6cf882 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] android-billingclient = '5.0.0' +androidx-appcompat = '1.4.2' androidx-lifecycle = '2.7.0' androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' @@ -13,6 +14,7 @@ stripe-terminal = '3.7.1' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } diff --git a/libs/iap/build.gradle b/libs/iap/build.gradle index 46c9f746a67..6f24abc5dfb 100644 --- a/libs/iap/build.gradle +++ b/libs/iap/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation(libs.kotlinx.coroutines.android) implementation(libs.android.billingclient.ktx) - implementation "androidx.appcompat:appcompat:$appCompatVersion" + implementation(libs.androidx.appcompat) testImplementation(libs.junit) testImplementation(libs.mockito.kotlin) From 4c7fcd564fe6105334394eab6f60d94ce7075b6d Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:30:44 +0300 Subject: [PATCH 13/86] Deps: Migrate wordpress libaddressinput to version catalogs on wc --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 875ca23302a..e64b1b41ebf 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -221,7 +221,7 @@ android { } dependencies { - implementation("org.wordpress:libaddressinput.common:$libaddressinputVersion") { + implementation(libs.wordpress.libaddressinput.common) { exclude group: "org.json", module: "json" exclude group: "com.google.guava", module: "guava" } diff --git a/build.gradle b/build.gradle index 708cf328841..d4438f7a455 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,6 @@ ext { glideVersion = '4.16.0' coilVersion = '2.1.0' constraintLayoutVersion = '1.2.0' - libaddressinputVersion = '0.0.2' eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' googlePlayWearableVersion = '18.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4419c6cf882..b7bdaaaab8e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,6 +11,7 @@ kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' stripe-terminal = '3.7.1' +wordpress-libaddressinput = '0.0.2' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } @@ -34,3 +35,4 @@ mockito-inline = { group = "org.mockito", name = "mockito-inline", version.ref = mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } +wordpress-libaddressinput-common = { group = "org.wordpress", name = "libaddressinput.common", version.ref = "wordpress-libaddressinput" } From ffd32093f33f7df5879657e509621cea2ccbda0e Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:32:47 +0300 Subject: [PATCH 14/86] Deps: Migrate google firebase to version catalogs on woocommerce --- WooCommerce/build.gradle | 8 ++++---- gradle/libs.versions.toml | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index e64b1b41ebf..8f460b57f84 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -226,10 +226,10 @@ dependencies { exclude group: "com.google.guava", module: "guava" } - implementation platform('com.google.firebase:firebase-bom:32.7.1') - implementation 'com.google.firebase:firebase-messaging' - implementation 'com.google.firebase:firebase-config' - implementation 'com.google.firebase:firebase-analytics' + implementation(platform(libs.google.firebase.bom)) + implementation(libs.google.firebase.messaging) + implementation(libs.google.firebase.config) + implementation(libs.google.firebase.analytics) implementation 'com.google.android.gms:play-services-auth:20.2.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b7bdaaaab8e..f72e280ab36 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' assertj = '3.24.1' +google-firebase-bom = '32.7.1' junit = '4.13.2' kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' @@ -26,6 +27,10 @@ androidx-test-main-rules = { group = "androidx.test", name = "rules", version.re androidx-test-main-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-main" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" } +google-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } +google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } +google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } +google-firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging" } junit = { group = "junit", name = "junit", version.ref = "junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } From 9838d5d0e070f255675f803b66070e51732dbf56 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:35:11 +0300 Subject: [PATCH 15/86] Deps: Migrate google play services to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 6 ++++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 6667e049cb5..b812cf6b8ab 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -143,7 +143,7 @@ dependencies { implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" // WearOS - implementation "com.google.android.gms:play-services-wearable:$googlePlayWearableVersion" + implementation(libs.google.play.services.wearable) implementation 'androidx.wear.tiles:tiles' implementation 'androidx.wear.tiles:tiles-material' implementation "com.google.android.horologist:horologist-compose-tools:$wearHorologistVersion" diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 8f460b57f84..d1a64287b53 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -231,7 +231,7 @@ dependencies { implementation(libs.google.firebase.config) implementation(libs.google.firebase.analytics) - implementation 'com.google.android.gms:play-services-auth:20.2.0' + implementation(libs.google.play.services.auth) // Support library implementation "androidx.core:core-ktx:$coreKtxVersion" @@ -325,7 +325,7 @@ dependencies { implementation 'com.google.android.play:app-update:2.1.0' implementation 'com.google.android.play:review:2.0.1' - implementation 'com.google.android.gms:play-services-code-scanner:16.1.0' + implementation(libs.google.play.services.code.scanner) implementation "com.google.mlkit:text-recognition:$mlkitTextRecognitionVersion" implementation "com.google.android.gms:play-services-mlkit-text-recognition-japanese:$mlkitTextRecognitionVersion" @@ -335,7 +335,7 @@ dependencies { implementation "com.google.mlkit:barcode-scanning:$mlkitBarcodeScanningVersion" implementation "com.google.zxing:core:3.5.3" - implementation "com.google.android.gms:play-services-wearable:$googlePlayWearableVersion" + implementation(libs.google.play.services.wearable) // Debug dependencies debugImplementation "com.facebook.flipper:flipper:$flipperVersion" diff --git a/build.gradle b/build.gradle index d4438f7a455..33e6be61f87 100644 --- a/build.gradle +++ b/build.gradle @@ -106,7 +106,6 @@ ext { constraintLayoutVersion = '1.2.0' eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' - googlePlayWearableVersion = '18.1.0' aztecVersion = 'v2.1.4' flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f72e280ab36..991044019c1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,9 @@ androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' assertj = '3.24.1' google-firebase-bom = '32.7.1' +google-play-services-auth = '20.2.0' +google-play-services-code-scanner = '16.1.0' +google-play-services-wearable = '18.1.0' junit = '4.13.2' kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' @@ -31,6 +34,9 @@ google-firebase-analytics = { group = "com.google.firebase", name = "firebase-an google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } google-firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging" } +google-play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "google-play-services-auth" } +google-play-services-code-scanner = { group = "com.google.android.gms", name = "play-services-code-scanner", version.ref = "google-play-services-code-scanner" } +google-play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "google-play-services-wearable" } junit = { group = "junit", name = "junit", version.ref = "junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } From 9df67a762b1613143c35af6bcf6583189a333cd2 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:40:25 +0300 Subject: [PATCH 16/86] Deps: Migrate google mlkit to version catalogs on woocommerce FYI: Notice that the Japanese, Chinese and Korea 'Text Recognition' related dependencies are not 'Google MLKit' related but actually 'Google Play Services' related. However, to keep things simple and since the version is coming from 'Google MLKit' and it main 'Text Recognition' dependency the overall version catalog is pointing to 'Google MLKit' and not 'Google Play Services'. --- WooCommerce/build.gradle | 10 +++++----- build.gradle | 2 -- gradle/libs.versions.toml | 7 +++++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index d1a64287b53..8bd63997cce 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -327,12 +327,12 @@ dependencies { implementation(libs.google.play.services.code.scanner) - implementation "com.google.mlkit:text-recognition:$mlkitTextRecognitionVersion" - implementation "com.google.android.gms:play-services-mlkit-text-recognition-japanese:$mlkitTextRecognitionVersion" - implementation "com.google.android.gms:play-services-mlkit-text-recognition-chinese:$mlkitTextRecognitionVersion" - implementation "com.google.android.gms:play-services-mlkit-text-recognition-korean:$mlkitTextRecognitionVersion" + implementation(libs.google.mlkit.text.recognition.main) + implementation(libs.google.mlkit.text.recognition.japanese) + implementation(libs.google.mlkit.text.recognition.chinese) + implementation(libs.google.mlkit.text.recognition.korean) - implementation "com.google.mlkit:barcode-scanning:$mlkitBarcodeScanningVersion" + implementation(libs.google.mlkit.barcode.scanning) implementation "com.google.zxing:core:3.5.3" implementation(libs.google.play.services.wearable) diff --git a/build.gradle b/build.gradle index 33e6be61f87..3b879e1f01c 100644 --- a/build.gradle +++ b/build.gradle @@ -119,8 +119,6 @@ ext { aboutAutomatticVersion = '0.0.6' automatticTracksVersion = '5.0.0' workManagerVersion = '2.7.1' - mlkitBarcodeScanningVersion = '17.2.0' - mlkitTextRecognitionVersion = '16.0.0' androidxCameraVersion = '1.2.3' guavaVersion = '33.1.0-android' protobufVersion = '3.25.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 991044019c1..07821b663cc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,8 @@ androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' assertj = '3.24.1' google-firebase-bom = '32.7.1' +google-mlkit-barcode-scanning = '17.2.0' +google-mlkit-text-recognition = '16.0.0' google-play-services-auth = '20.2.0' google-play-services-code-scanner = '16.1.0' google-play-services-wearable = '18.1.0' @@ -34,6 +36,11 @@ google-firebase-analytics = { group = "com.google.firebase", name = "firebase-an google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } google-firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging" } +google-mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref = "google-mlkit-barcode-scanning" } +google-mlkit-text-recognition-main = { group = "com.google.mlkit", name = "text-recognition", version.ref = "google-mlkit-text-recognition" } +google-mlkit-text-recognition-japanese = { group = "com.google.android.gms", name = "play-services-mlkit-text-recognition-japanese", version.ref = "google-mlkit-text-recognition" } +google-mlkit-text-recognition-chinese = { group = "com.google.android.gms", name = "play-services-mlkit-text-recognition-chinese", version.ref = "google-mlkit-text-recognition" } +google-mlkit-text-recognition-korean = { group = "com.google.android.gms", name = "play-services-mlkit-text-recognition-korean", version.ref = "google-mlkit-text-recognition" } google-play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "google-play-services-auth" } google-play-services-code-scanner = { group = "com.google.android.gms", name = "play-services-code-scanner", version.ref = "google-play-services-code-scanner" } google-play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "google-play-services-wearable" } From d967e755d837f837b3a693b4610ded7729f1fb89 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 2 Oct 2024 16:42:33 +0300 Subject: [PATCH 17/86] Deps: Migrate androidx core to version catalogs on all modules FYI: Notice that the 'AndroidX Core Splashscreen' version on the 'WooCommerce' module is pointing to '1.0.0', while on the 'WooCommerce-Wear' module it is pointing to '1.0.1'. This change also updates the 'WooCommerce' version to point to '1.0.1' as well, it being just a batch update that includes a single bugfix and no more. Release Notes: https://developer.android.com/jetpack/androidx/releases/ core#core-splashscreen-1.0.1 --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index b812cf6b8ab..26dbd39247a 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -169,7 +169,7 @@ dependencies { implementation "androidx.work:work-runtime-ktx:$workManagerVersion" implementation(libs.androidx.lifecycle.viewmodel.savedstate) implementation(libs.androidx.lifecycle.livedata.ktx) - implementation 'androidx.core:core-splashscreen:1.0.1' + implementation(libs.androidx.core.splashscreen) implementation "androidx.navigation:navigation-compose:2.7.7" implementation 'androidx.activity:activity-compose' implementation "androidx.preference:preference-ktx:1.2.1" diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 8bd63997cce..97b43a5f40f 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -234,7 +234,7 @@ dependencies { implementation(libs.google.play.services.auth) // Support library - implementation "androidx.core:core-ktx:$coreKtxVersion" + implementation(libs.androidx.core.ktx) implementation "androidx.constraintlayout:constraintlayout:2.1.4" implementation "androidx.recyclerview:recyclerview:1.3.2" implementation "androidx.recyclerview:recyclerview-selection:1.1.0" @@ -256,7 +256,7 @@ dependencies { implementation "androidx.work:work-runtime-ktx:$workManagerVersion" - implementation 'androidx.core:core-splashscreen:1.0.0' + implementation(libs.androidx.core.splashscreen) implementation("org.wordpress:utils:$wordPressUtilsVersion") { exclude group: "com.mcxiaoke.volley" diff --git a/build.gradle b/build.gradle index 3b879e1f01c..265ccd198e1 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,6 @@ ext { aztecVersion = 'v2.1.4' flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' - coreKtxVersion = '1.13.1' materialVersion = '1.12.0' transitionVersion = '1.5.1' hiltJetpackVersion = '1.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 07821b663cc..383f0f3a846 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,8 @@ [versions] android-billingclient = '5.0.0' androidx-appcompat = '1.4.2' +androidx-core-main = '1.13.1' +androidx-core-splashscreen = '1.0.1' androidx-lifecycle = '2.7.0' androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' @@ -22,6 +24,8 @@ wordpress-libaddressinput = '0.0.2' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-main" } +androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidx-core-splashscreen" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } From e7c49359739369775d631ddf277b7048f856d825 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 16:33:01 +0300 Subject: [PATCH 18/86] Deps: Migrate androidx constraintlayout to version catalogs on wc --- WooCommerce/build.gradle | 4 ++-- gradle/libs.versions.toml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 97b43a5f40f..562cabc1956 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -235,7 +235,7 @@ dependencies { // Support library implementation(libs.androidx.core.ktx) - implementation "androidx.constraintlayout:constraintlayout:2.1.4" + implementation(libs.androidx.constraintlayout.main) implementation "androidx.recyclerview:recyclerview:1.3.2" implementation "androidx.recyclerview:recyclerview-selection:1.1.0" implementation(libs.androidx.appcompat) @@ -447,7 +447,7 @@ dependencies { implementation 'androidx.navigation:navigation-compose' implementation 'androidx.hilt:hilt-navigation-compose:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.1' + implementation(libs.androidx.constraintlayout.compose) implementation(libs.androidx.lifecycle.viewmodel.compose) implementation "io.coil-kt:coil-compose:$coilVersion" implementation "io.coil-kt:coil-svg:$coilVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 383f0f3a846..208e6c2301b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,8 @@ [versions] android-billingclient = '5.0.0' androidx-appcompat = '1.4.2' +androidx-constraintlayout-compose = '1.0.1' +androidx-constraintlayout-main = '2.1.4' androidx-core-main = '1.13.1' androidx-core-splashscreen = '1.0.1' androidx-lifecycle = '2.7.0' @@ -24,6 +26,8 @@ wordpress-libaddressinput = '0.0.2' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } +androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "androidx-constraintlayout-compose" } +androidx-constraintlayout-main = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout-main" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-main" } androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidx-core-splashscreen" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } From 62cbe386ad8ad998fa1d5ac3ca987a9e0bf0f171 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 16:40:58 +0300 Subject: [PATCH 19/86] Deps: Migrate androidx recyclerview to version catalogs on woocommerce --- WooCommerce/build.gradle | 4 ++-- gradle/libs.versions.toml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 562cabc1956..0abe775b08f 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -236,8 +236,8 @@ dependencies { // Support library implementation(libs.androidx.core.ktx) implementation(libs.androidx.constraintlayout.main) - implementation "androidx.recyclerview:recyclerview:1.3.2" - implementation "androidx.recyclerview:recyclerview-selection:1.1.0" + implementation(libs.androidx.recyclerview.main) + implementation(libs.androidx.recyclerview.selection) implementation(libs.androidx.appcompat) implementation "com.google.android.material:material:$materialVersion" implementation "androidx.transition:transition:$transitionVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 208e6c2301b..5e4d70bb86d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,8 @@ androidx-constraintlayout-main = '2.1.4' androidx-core-main = '1.13.1' androidx-core-splashscreen = '1.0.1' androidx-lifecycle = '2.7.0' +androidx-recyclerview-main = '1.3.2' +androidx-recyclerview-selection = '1.1.0' androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' @@ -34,6 +36,8 @@ androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecy androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" } +androidx-recyclerview-main = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recyclerview-main" } +androidx-recyclerview-selection = { group = "androidx.recyclerview", name = "recyclerview-selection", version.ref = "androidx-recyclerview-selection" } androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext" } androidx-test-main-core = { group = "androidx.test", name = "core", version.ref = "androidx-test-main" } androidx-test-main-rules = { group = "androidx.test", name = "rules", version.ref = "androidx-test-main" } From 27a9195380873fcefd7f6292f7dc7b6108f58069 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 16:42:09 +0300 Subject: [PATCH 20/86] Deps: Migrate google material to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 0abe775b08f..206617093b1 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -239,7 +239,7 @@ dependencies { implementation(libs.androidx.recyclerview.main) implementation(libs.androidx.recyclerview.selection) implementation(libs.androidx.appcompat) - implementation "com.google.android.material:material:$materialVersion" + implementation(libs.google.material) implementation "androidx.transition:transition:$transitionVersion" implementation "androidx.cardview:cardview:1.0.0" implementation("androidx.browser:browser:1.5.0") { diff --git a/build.gradle b/build.gradle index 265ccd198e1..d3e6b5674d6 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,6 @@ ext { aztecVersion = 'v2.1.4' flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' - materialVersion = '1.12.0' transitionVersion = '1.5.1' hiltJetpackVersion = '1.1.0' wordPressUtilsVersion = '3.5.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5e4d70bb86d..428751e0060 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,6 +13,7 @@ androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' assertj = '3.24.1' google-firebase-bom = '32.7.1' +google-material = '1.12.0' google-mlkit-barcode-scanning = '17.2.0' google-mlkit-text-recognition = '16.0.0' google-play-services-auth = '20.2.0' @@ -48,6 +49,7 @@ google-firebase-analytics = { group = "com.google.firebase", name = "firebase-an google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } google-firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging" } +google-material = { group = "com.google.android.material", name = "material", version.ref = "google-material" } google-mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref = "google-mlkit-barcode-scanning" } google-mlkit-text-recognition-main = { group = "com.google.mlkit", name = "text-recognition", version.ref = "google-mlkit-text-recognition" } google-mlkit-text-recognition-japanese = { group = "com.google.android.gms", name = "play-services-mlkit-text-recognition-japanese", version.ref = "google-mlkit-text-recognition" } From 2ddfadc9ac8aad708444e431bd004379d0dcf039 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 16:44:02 +0300 Subject: [PATCH 21/86] Deps: Migrate androidx transition to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 206617093b1..4aec4bd8477 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -240,7 +240,7 @@ dependencies { implementation(libs.androidx.recyclerview.selection) implementation(libs.androidx.appcompat) implementation(libs.google.material) - implementation "androidx.transition:transition:$transitionVersion" + implementation(libs.androidx.transition) implementation "androidx.cardview:cardview:1.0.0" implementation("androidx.browser:browser:1.5.0") { exclude group: 'com.google.guava', module: 'listenablefuture' diff --git a/build.gradle b/build.gradle index d3e6b5674d6..658af21e3ea 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,6 @@ ext { aztecVersion = 'v2.1.4' flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' - transitionVersion = '1.5.1' hiltJetpackVersion = '1.1.0' wordPressUtilsVersion = '3.5.0' mediapickerVersion = '0.3.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 428751e0060..09fb7801045 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,6 +11,7 @@ androidx-recyclerview-selection = '1.1.0' androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' +androidx-transition = '1.5.1' assertj = '3.24.1' google-firebase-bom = '32.7.1' google-material = '1.12.0' @@ -44,6 +45,7 @@ androidx-test-main-core = { group = "androidx.test", name = "core", version.ref androidx-test-main-rules = { group = "androidx.test", name = "rules", version.ref = "androidx-test-main" } androidx-test-main-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-main" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } +androidx-transition = { group = "androidx.transition", name = "transition", version.ref = "androidx-transition" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" } google-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } From 2a8bd49eb4f7eafaea7379b13bd3826deed2b7ab Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 16:45:50 +0300 Subject: [PATCH 22/86] Deps: Migrate androidx cardview to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 4aec4bd8477..eb9ba8c415f 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -241,7 +241,7 @@ dependencies { implementation(libs.androidx.appcompat) implementation(libs.google.material) implementation(libs.androidx.transition) - implementation "androidx.cardview:cardview:1.0.0" + implementation(libs.androidx.cardview) implementation("androidx.browser:browser:1.5.0") { exclude group: 'com.google.guava', module: 'listenablefuture' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 09fb7801045..c1fb5dae7e7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] android-billingclient = '5.0.0' androidx-appcompat = '1.4.2' +androidx-cardview = '1.0.0' androidx-constraintlayout-compose = '1.0.1' androidx-constraintlayout-main = '2.1.4' androidx-core-main = '1.13.1' @@ -30,6 +31,7 @@ wordpress-libaddressinput = '0.0.2' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } +androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidx-cardview" } androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "androidx-constraintlayout-compose" } androidx-constraintlayout-main = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout-main" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-main" } From c77fff9f217867d4dad3234f31a533c97f8db77e Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 16:47:28 +0300 Subject: [PATCH 23/86] Deps: Migrate androidx browser to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index eb9ba8c415f..4293debd95c 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -242,7 +242,7 @@ dependencies { implementation(libs.google.material) implementation(libs.androidx.transition) implementation(libs.androidx.cardview) - implementation("androidx.browser:browser:1.5.0") { + implementation(libs.androidx.browser) { exclude group: 'com.google.guava', module: 'listenablefuture' } implementation "androidx.preference:preference:1.2.0" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c1fb5dae7e7..2dcbcd920c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] android-billingclient = '5.0.0' androidx-appcompat = '1.4.2' +androidx-browser = '1.5.0' androidx-cardview = '1.0.0' androidx-constraintlayout-compose = '1.0.1' androidx-constraintlayout-main = '2.1.4' @@ -31,6 +32,7 @@ wordpress-libaddressinput = '0.0.2' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } +androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidx-browser" } androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidx-cardview" } androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "androidx-constraintlayout-compose" } androidx-constraintlayout-main = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout-main" } From 42b9e11bb64b24bf48a1d86380030a7b55877298 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 16:51:20 +0300 Subject: [PATCH 24/86] Deps: Migrate androidx preference to version catalogs on all modules FYI: Notice that the 'AndroidX Preference KTX' version on the 'WooCommerce' module is pointing to '1.2.0', while on the 'WooCommerce-Wear' module it is pointing to '1.2.1'. This change also updates the 'WooCommerce' version to point to '1.2.1' as well, it being just a batch update that includes a few bugfixes and no more. Release Notes: https://developer.android.com/jetpack/androidx/releases/ preference#1.2.1 --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 26dbd39247a..e2948f38d1e 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -172,7 +172,7 @@ dependencies { implementation(libs.androidx.core.splashscreen) implementation "androidx.navigation:navigation-compose:2.7.7" implementation 'androidx.activity:activity-compose' - implementation "androidx.preference:preference-ktx:1.2.1" + implementation(libs.androidx.preference.ktx) implementation "androidx.datastore:datastore-preferences:1.1.0" implementation "androidx.datastore:datastore:1.1.0" implementation 'com.google.code.gson:gson:2.10.1' diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 4293debd95c..bb889ef7db9 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -245,7 +245,7 @@ dependencies { implementation(libs.androidx.browser) { exclude group: 'com.google.guava', module: 'listenablefuture' } - implementation "androidx.preference:preference:1.2.0" + implementation(libs.androidx.preference.main) implementation "androidx.datastore:datastore-preferences:1.0.0" implementation "androidx.datastore:datastore:1.0.0" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2dcbcd920c8..ebdc1f1e8bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ androidx-constraintlayout-main = '2.1.4' androidx-core-main = '1.13.1' androidx-core-splashscreen = '1.0.1' androidx-lifecycle = '2.7.0' +androidx-preference = '1.2.1' androidx-recyclerview-main = '1.3.2' androidx-recyclerview-selection = '1.1.0' androidx-test-ext = '1.1.5' @@ -42,6 +43,8 @@ androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecy androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" } +androidx-preference-main = { group = "androidx.preference", name = "preference", version.ref = "androidx-preference" } +androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "androidx-preference" } androidx-recyclerview-main = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recyclerview-main" } androidx-recyclerview-selection = { group = "androidx.recyclerview", name = "recyclerview-selection", version.ref = "androidx-recyclerview-selection" } androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext" } From 7f69b0c4c5eb37a934724aa87ae158ab68097b57 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 16:58:10 +0300 Subject: [PATCH 25/86] Deps: Migrate androidx datastore to version catalogs on all modules FYI: Notice that the 'AndroidX Datastore' versions on the 'WooCommerce' module are pointing to '1.0.0', while on the 'WooCommerce-Wear' module they are pointing to '1.1.0'. This change also updates the 'WooCommerce' versions to point to '1.1.0' as well, it having only additional features on top of '1.0.0' but no breaking changes. Release Notes: https://developer.android.com/jetpack/androidx/releases/ datastore#1.1.0 --- WooCommerce-Wear/build.gradle | 4 ++-- WooCommerce/build.gradle | 4 ++-- gradle/libs.versions.toml | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index e2948f38d1e..a031c79de6c 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -173,8 +173,8 @@ dependencies { implementation "androidx.navigation:navigation-compose:2.7.7" implementation 'androidx.activity:activity-compose' implementation(libs.androidx.preference.ktx) - implementation "androidx.datastore:datastore-preferences:1.1.0" - implementation "androidx.datastore:datastore:1.1.0" + implementation(libs.androidx.datastore.preferences) + implementation(libs.androidx.datastore.main) implementation 'com.google.code.gson:gson:2.10.1' // Coroutines diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index bb889ef7db9..ab5463014d1 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -246,8 +246,8 @@ dependencies { exclude group: 'com.google.guava', module: 'listenablefuture' } implementation(libs.androidx.preference.main) - implementation "androidx.datastore:datastore-preferences:1.0.0" - implementation "androidx.datastore:datastore:1.0.0" + implementation(libs.androidx.datastore.preferences) + implementation(libs.androidx.datastore.main) implementation "androidx.navigation:navigation-common:$gradle.ext.navigationVersion" implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ebdc1f1e8bd..8b4a4ea2d22 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,7 @@ androidx-constraintlayout-compose = '1.0.1' androidx-constraintlayout-main = '2.1.4' androidx-core-main = '1.13.1' androidx-core-splashscreen = '1.0.1' +androidx-datastore = '1.1.0' androidx-lifecycle = '2.7.0' androidx-preference = '1.2.1' androidx-recyclerview-main = '1.3.2' @@ -39,6 +40,8 @@ androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name androidx-constraintlayout-main = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout-main" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-main" } androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidx-core-splashscreen" } +androidx-datastore-main = { group = "androidx.datastore", name = "datastore", version.ref = "androidx-datastore" } +androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidx-datastore" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } From 2cb87df269928553189eaa1cae19b7fbfc6505e9 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 17:15:52 +0300 Subject: [PATCH 26/86] Deps: Migrate androidx work to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index a031c79de6c..e9f611ef0c3 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -166,7 +166,7 @@ dependencies { implementation 'androidx.compose.ui:ui-text-google-fonts' // Android Support - implementation "androidx.work:work-runtime-ktx:$workManagerVersion" + implementation(libs.androidx.work.runtime.ktx) implementation(libs.androidx.lifecycle.viewmodel.savedstate) implementation(libs.androidx.lifecycle.livedata.ktx) implementation(libs.androidx.core.splashscreen) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index ab5463014d1..8541338a553 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -254,7 +254,7 @@ dependencies { implementation "androidx.navigation:navigation-runtime:$gradle.ext.navigationVersion" implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion" - implementation "androidx.work:work-runtime-ktx:$workManagerVersion" + implementation(libs.androidx.work.runtime.ktx) implementation(libs.androidx.core.splashscreen) diff --git a/build.gradle b/build.gradle index 658af21e3ea..469c5c972b3 100644 --- a/build.gradle +++ b/build.gradle @@ -115,7 +115,6 @@ ext { wordPressLoginVersion = '1.18.0' aboutAutomatticVersion = '0.0.6' automatticTracksVersion = '5.0.0' - workManagerVersion = '2.7.1' androidxCameraVersion = '1.2.3' guavaVersion = '33.1.0-android' protobufVersion = '3.25.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8b4a4ea2d22..d45053cd38a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,6 +16,7 @@ androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' androidx-transition = '1.5.1' +androidx-work = '2.7.1' assertj = '3.24.1' google-firebase-bom = '32.7.1' google-material = '1.12.0' @@ -56,6 +57,7 @@ androidx-test-main-rules = { group = "androidx.test", name = "rules", version.re androidx-test-main-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-main" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } androidx-transition = { group = "androidx.transition", name = "transition", version.ref = "androidx-transition" } +androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" } google-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } From 7a2bf6ef29d61d5dc41064e8f180d9a90d4c8a7e Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 17:19:37 +0300 Subject: [PATCH 27/86] Deps: Migrate wordpress utils to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index e9f611ef0c3..dae7d1c01ae 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -135,7 +135,7 @@ dependencies { exclude group: "com.android.support" exclude group: "org.wordpress", module: "utils" } - implementation("org.wordpress:utils:$wordPressUtilsVersion") { + implementation(libs.wordpress.utils) { exclude group: "com.mcxiaoke.volley" exclude group: "com.android.support" } diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 8541338a553..40ee4836769 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -258,7 +258,7 @@ dependencies { implementation(libs.androidx.core.splashscreen) - implementation("org.wordpress:utils:$wordPressUtilsVersion") { + implementation(libs.wordpress.utils) { exclude group: "com.mcxiaoke.volley" exclude group: "com.android.support" } diff --git a/build.gradle b/build.gradle index 469c5c972b3..5d8b07e656a 100644 --- a/build.gradle +++ b/build.gradle @@ -110,7 +110,6 @@ ext { flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' hiltJetpackVersion = '1.1.0' - wordPressUtilsVersion = '3.5.0' mediapickerVersion = '0.3.1' wordPressLoginVersion = '1.18.0' aboutAutomatticVersion = '0.0.6' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d45053cd38a..c509e9e37f3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,6 +31,7 @@ mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' stripe-terminal = '3.7.1' wordpress-libaddressinput = '0.0.2' +wordpress-utils = '3.5.0' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } @@ -82,3 +83,4 @@ mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", versio stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } wordpress-libaddressinput-common = { group = "org.wordpress", name = "libaddressinput.common", version.ref = "wordpress-libaddressinput" } +wordpress-utils = { group = "org.wordpress", name = "utils", version.ref = "wordpress-utils" } From c323595404fe71e371b35c36874ed9ef1398d35b Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 3 Oct 2024 17:22:53 +0300 Subject: [PATCH 28/86] Deps: Migrate automattic tracks to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 4 ++-- WooCommerce/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index dae7d1c01ae..3e7e3625b6f 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -139,8 +139,8 @@ dependencies { exclude group: "com.mcxiaoke.volley" exclude group: "com.android.support" } - implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion" - implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" + implementation(libs.automattic.tracks.android) + implementation(libs.automattic.tracks.crashlogging) // WearOS implementation(libs.google.play.services.wearable) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 40ee4836769..f8a49a1bf5f 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -263,11 +263,11 @@ dependencies { exclude group: "com.android.support" } - implementation("com.automattic.tracks:experimentation:$automatticTracksVersion") { + implementation(libs.automattic.tracks.experimentation) { exclude group: "org.wordpress", module: "fluxc" } - implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion" - implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" + implementation(libs.automattic.tracks.android) + implementation(libs.automattic.tracks.crashlogging) implementation("${gradle.ext.fluxCBinaryPath}:$fluxCVersion") { exclude group: "com.android.support" diff --git a/build.gradle b/build.gradle index 5d8b07e656a..bb0c02139b1 100644 --- a/build.gradle +++ b/build.gradle @@ -113,7 +113,6 @@ ext { mediapickerVersion = '0.3.1' wordPressLoginVersion = '1.18.0' aboutAutomatticVersion = '0.0.6' - automatticTracksVersion = '5.0.0' androidxCameraVersion = '1.2.3' guavaVersion = '33.1.0-android' protobufVersion = '3.25.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c509e9e37f3..14db2072f2e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,6 +17,7 @@ androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' androidx-transition = '1.5.1' androidx-work = '2.7.1' +automattic-tracks = '5.0.0' assertj = '3.24.1' google-firebase-bom = '32.7.1' google-material = '1.12.0' @@ -60,6 +61,9 @@ androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiaut androidx-transition = { group = "androidx.transition", name = "transition", version.ref = "androidx-transition" } androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" } +automattic-tracks-android = { group = "com.automattic", name = "Automattic-Tracks-Android", version.ref = "automattic-tracks" } +automattic-tracks-experimentation = { group = "com.automattic.tracks", name = "experimentation", version.ref = "automattic-tracks" } +automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automattic-tracks" } google-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } From fd72fd6f3f9156c236b968f161b42667eb692124 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 15:28:58 +0300 Subject: [PATCH 29/86] Deps: Migrate wordpress fluxc to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 4 ++-- WooCommerce/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 3e7e3625b6f..2023db2981d 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -127,11 +127,11 @@ android { dependencies { // Project implementation project(":libs:commons") - implementation("${gradle.ext.fluxCBinaryPath}:$fluxCVersion") { + implementation("${gradle.ext.fluxCBinaryPath}:${libs.versions.wordpress.fluxc.get()}") { exclude group: "com.android.support" exclude group: "org.wordpress", module: "utils" } - implementation("${gradle.ext.fluxCWooCommercePluginBinaryPath}:$fluxCVersion") { + implementation("${gradle.ext.fluxCWooCommercePluginBinaryPath}:${libs.versions.wordpress.fluxc.get()}") { exclude group: "com.android.support" exclude group: "org.wordpress", module: "utils" } diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index f8a49a1bf5f..d46695c8ccb 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -269,11 +269,11 @@ dependencies { implementation(libs.automattic.tracks.android) implementation(libs.automattic.tracks.crashlogging) - implementation("${gradle.ext.fluxCBinaryPath}:$fluxCVersion") { + implementation("${gradle.ext.fluxCBinaryPath}:${libs.versions.wordpress.fluxc.get()}") { exclude group: "com.android.support" exclude group: "org.wordpress", module: "utils" } - implementation("${gradle.ext.fluxCWooCommercePluginBinaryPath}:$fluxCVersion") { + implementation("${gradle.ext.fluxCWooCommercePluginBinaryPath}:${libs.versions.wordpress.fluxc.get()}") { exclude group: "com.android.support" exclude group: "org.wordpress", module: "utils" } diff --git a/build.gradle b/build.gradle index bb0c02139b1..1ec4d3379f6 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,6 @@ tasks.register("installGitHooks", Copy) { } ext { - fluxCVersion = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' glideVersion = '4.16.0' coilVersion = '2.1.0' constraintLayoutVersion = '1.2.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 14db2072f2e..e9223902b5d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,6 +31,7 @@ kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' stripe-terminal = '3.7.1' +wordpress-fluxc = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' wordpress-libaddressinput = '0.0.2' wordpress-utils = '3.5.0' From be402c0a0dd09ed6838916e9e9a2edb4ac69ceda Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 15:40:11 +0300 Subject: [PATCH 30/86] Deps: Migrate wordpress login to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index d46695c8ccb..0c86dd479eb 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -278,7 +278,7 @@ dependencies { exclude group: "org.wordpress", module: "utils" } - implementation("$gradle.ext.loginFlowBinaryPath:$wordPressLoginVersion") { + implementation("$gradle.ext.loginFlowBinaryPath:${libs.versions.wordpress.login.get()}") { exclude group: "org.wordpress", module: "utils" exclude group: "org.wordpress", module: "fluxc" } diff --git a/build.gradle b/build.gradle index 1ec4d3379f6..7bc62963f13 100644 --- a/build.gradle +++ b/build.gradle @@ -110,7 +110,6 @@ ext { stateMachineVersion = '0.2.0' hiltJetpackVersion = '1.1.0' mediapickerVersion = '0.3.1' - wordPressLoginVersion = '1.18.0' aboutAutomatticVersion = '0.0.6' androidxCameraVersion = '1.2.3' guavaVersion = '33.1.0-android' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e9223902b5d..ce1cacaa21a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,6 +32,7 @@ mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' stripe-terminal = '3.7.1' wordpress-fluxc = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' +wordpress-login = '1.18.0' wordpress-libaddressinput = '0.0.2' wordpress-utils = '3.5.0' From 8034f12e0cee7e3dd19e04aa96a431d35935566c Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 15:48:52 +0300 Subject: [PATCH 31/86] Deps: Migrate wordpress aztec to version catalogs on woocommerce --- WooCommerce/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 0c86dd479eb..d0e638ea343 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -283,13 +283,13 @@ dependencies { exclude group: "org.wordpress", module: "fluxc" } - implementation("org.wordpress:aztec:$aztecVersion") { + implementation(libs.wordpress.aztec.main) { exclude group: "com.android.volley" exclude group: "com.android.support" exclude group: "org.wordpress", module: "utils" } - implementation("org.wordpress.aztec:glide-loader:$aztecVersion") { + implementation(libs.wordpress.aztec.glide.loader) { exclude group: "com.android.volley" exclude group: "com.android.support" exclude group: "org.wordpress", module: "utils" diff --git a/build.gradle b/build.gradle index 7bc62963f13..cfc7e113f63 100644 --- a/build.gradle +++ b/build.gradle @@ -105,7 +105,6 @@ ext { constraintLayoutVersion = '1.2.0' eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' - aztecVersion = 'v2.1.4' flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' hiltJetpackVersion = '1.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ce1cacaa21a..f69806b8aa6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,6 +31,7 @@ kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' stripe-terminal = '3.7.1' +wordpress-aztec = 'v2.1.4' wordpress-fluxc = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' wordpress-login = '1.18.0' wordpress-libaddressinput = '0.0.2' @@ -89,4 +90,6 @@ mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", versio stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } wordpress-libaddressinput-common = { group = "org.wordpress", name = "libaddressinput.common", version.ref = "wordpress-libaddressinput" } +wordpress-aztec-main = { group = "org.wordpress", name = "aztec", version.ref = "wordpress-aztec" } +wordpress-aztec-glide-loader = { group = "org.wordpress.aztec", name = "glide-loader", version.ref = "wordpress-aztec" } wordpress-utils = { group = "org.wordpress", name = "utils", version.ref = "wordpress-utils" } From 3270c2a0ee3f5ed0021668b086171aff5f749822 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 15:50:41 +0300 Subject: [PATCH 32/86] Deps: Migrate gravatar to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index d0e638ea343..cb75b971dfd 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -295,7 +295,7 @@ dependencies { exclude group: "org.wordpress", module: "utils" } - implementation("com.gravatar:gravatar:$gravatarVersion") + implementation(libs.gravatar) implementation project(":libs:commons") implementation project(":libs:cardreader") diff --git a/build.gradle b/build.gradle index cfc7e113f63..1e93617d406 100644 --- a/build.gradle +++ b/build.gradle @@ -113,7 +113,6 @@ ext { androidxCameraVersion = '1.2.3' guavaVersion = '33.1.0-android' protobufVersion = '3.25.3' - gravatarVersion = '0.2.0' wearHorologistVersion = '0.6.10' securityLintVersion = '1.0.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f69806b8aa6..da6a5a9bc57 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,6 +26,7 @@ google-mlkit-text-recognition = '16.0.0' google-play-services-auth = '20.2.0' google-play-services-code-scanner = '16.1.0' google-play-services-wearable = '18.1.0' +gravatar = '0.2.0' junit = '4.13.2' kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' @@ -80,6 +81,7 @@ google-mlkit-text-recognition-korean = { group = "com.google.android.gms", name google-play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "google-play-services-auth" } google-play-services-code-scanner = { group = "com.google.android.gms", name = "play-services-code-scanner", version.ref = "google-play-services-code-scanner" } google-play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "google-play-services-wearable" } +gravatar = { group = "com.gravatar", name = "gravatar", version.ref = "gravatar" } junit = { group = "junit", name = "junit", version.ref = "junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } From 043f001b9a1be026a54783f92c4c28fba1593ac1 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 15:52:48 +0300 Subject: [PATCH 33/86] Deps: Migrate facebook shimmer to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index cb75b971dfd..b802f1c24a3 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -301,7 +301,7 @@ dependencies { implementation project(":libs:cardreader") debugImplementation project(":libs:iap") - implementation 'com.facebook.shimmer:shimmer:0.5.0' + implementation(libs.facebook.shimmer) implementation 'com.github.chrisbanes:PhotoView:2.3.0' implementation "com.automattic:about:$aboutAutomatticVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index da6a5a9bc57..cb8a68fe98d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,6 +19,7 @@ androidx-transition = '1.5.1' androidx-work = '2.7.1' automattic-tracks = '5.0.0' assertj = '3.24.1' +facebook-shimmer = '0.5.0' google-firebase-bom = '32.7.1' google-material = '1.12.0' google-mlkit-barcode-scanning = '17.2.0' @@ -68,6 +69,7 @@ assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "as automattic-tracks-android = { group = "com.automattic", name = "Automattic-Tracks-Android", version.ref = "automattic-tracks" } automattic-tracks-experimentation = { group = "com.automattic.tracks", name = "experimentation", version.ref = "automattic-tracks" } automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automattic-tracks" } +facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref = "facebook-shimmer" } google-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } From cc32b51b9d33aef74d551968b0504d1d33b8d880 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 15:54:29 +0300 Subject: [PATCH 34/86] Deps: Migrate photoview to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index b802f1c24a3..fc41c8a4a4f 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -302,7 +302,7 @@ dependencies { debugImplementation project(":libs:iap") implementation(libs.facebook.shimmer) - implementation 'com.github.chrisbanes:PhotoView:2.3.0' + implementation(libs.photoview) implementation "com.automattic:about:$aboutAutomatticVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cb8a68fe98d..952cf992761 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,6 +32,7 @@ junit = '4.13.2' kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' +photoview = '2.3.0' stripe-terminal = '3.7.1' wordpress-aztec = 'v2.1.4' wordpress-fluxc = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' @@ -91,6 +92,7 @@ kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "ko kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" } mockito-inline = { group = "org.mockito", name = "mockito-inline", version.ref = "mockito-inline" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } +photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref = "photoview" } stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } wordpress-libaddressinput-common = { group = "org.wordpress", name = "libaddressinput.common", version.ref = "wordpress-libaddressinput" } From 794dc7dff8c360996e0e6b471138c07378dcc27c Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:04:11 +0300 Subject: [PATCH 35/86] Deps: Migrate automattic about to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index fc41c8a4a4f..080210c09ea 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -304,7 +304,7 @@ dependencies { implementation(libs.facebook.shimmer) implementation(libs.photoview) - implementation "com.automattic:about:$aboutAutomatticVersion" + implementation(libs.automattic.about) // Dagger implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion" diff --git a/build.gradle b/build.gradle index 1e93617d406..09442554187 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,6 @@ ext { stateMachineVersion = '0.2.0' hiltJetpackVersion = '1.1.0' mediapickerVersion = '0.3.1' - aboutAutomatticVersion = '0.0.6' androidxCameraVersion = '1.2.3' guavaVersion = '33.1.0-android' protobufVersion = '3.25.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 952cf992761..24ab5a02aca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,6 +17,7 @@ androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' androidx-transition = '1.5.1' androidx-work = '2.7.1' +automattic-about = '0.0.6' automattic-tracks = '5.0.0' assertj = '3.24.1' facebook-shimmer = '0.5.0' @@ -67,6 +68,7 @@ androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiaut androidx-transition = { group = "androidx.transition", name = "transition", version.ref = "androidx-transition" } androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" } +automattic-about = { group = "com.automattic", name = "about", version.ref = "automattic-about" } automattic-tracks-android = { group = "com.automattic", name = "Automattic-Tracks-Android", version.ref = "automattic-tracks" } automattic-tracks-experimentation = { group = "com.automattic.tracks", name = "experimentation", version.ref = "automattic-tracks" } automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automattic-tracks" } From e810a1f21d4d22566fe3eefdf066fd5d72bec316 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:12:36 +0300 Subject: [PATCH 36/86] Deps: Migrate androidx hilt to version catalogs on all modules FYI: Notice that the 'AndroidX Hilt Compose' version on the 'WooCommerce-Wear' module is pointing to '1.2.0', while on the 'WooCommerce' module it is pointing to '1.1.0', as well as all other 'AndroidX Hilt' dependencies on 'WooCommerce-Wear' too, which too are pointing to '1.1.0'. This change downgrades the 'WooCommerce-Wear' version of only 'AndroidX Hilt Compose' to point to '1.1.0' as well, '1.2.0' has only one important change on top of '1.1.0' but no breaking changes. Release Notes: https://developer.android.com/jetpack/androidx/releases/ hilt#hilt_version_12_2 --- WooCommerce-Wear/build.gradle | 10 +++++----- WooCommerce/build.gradle | 10 +++++----- build.gradle | 1 - gradle/libs.versions.toml | 6 ++++++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 2023db2981d..20bb5fb0d23 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -185,11 +185,11 @@ dependencies { // Dagger & Hilt implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion" - implementation "androidx.hilt:hilt-navigation-fragment:$hiltJetpackVersion" - implementation "androidx.hilt:hilt-common:$hiltJetpackVersion" - implementation "androidx.hilt:hilt-work:$hiltJetpackVersion" - implementation "androidx.hilt:hilt-navigation-compose:1.2.0" - ksp "androidx.hilt:hilt-compiler:$hiltJetpackVersion" + implementation(libs.androidx.hilt.navigation.fragment) + implementation(libs.androidx.hilt.common) + implementation(libs.androidx.hilt.work) + implementation(libs.androidx.hilt.navigation.compose) + ksp(libs.androidx.hilt.compiler) ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion" implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion" ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion" diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 080210c09ea..a8ad6f4ca75 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -308,11 +308,11 @@ dependencies { // Dagger implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion" - implementation "androidx.hilt:hilt-navigation-fragment:$hiltJetpackVersion" - implementation "androidx.hilt:hilt-common:$hiltJetpackVersion" - implementation "androidx.hilt:hilt-work:$hiltJetpackVersion" + implementation(libs.androidx.hilt.navigation.fragment) + implementation(libs.androidx.hilt.common) + implementation(libs.androidx.hilt.work) - ksp "androidx.hilt:hilt-compiler:$hiltJetpackVersion" + ksp(libs.androidx.hilt.compiler) ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion" implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion" ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion" @@ -446,7 +446,7 @@ dependencies { implementation 'androidx.compose.ui:ui-text-google-fonts' implementation 'androidx.navigation:navigation-compose' - implementation 'androidx.hilt:hilt-navigation-compose:1.1.0' + implementation(libs.androidx.hilt.navigation.compose) implementation(libs.androidx.constraintlayout.compose) implementation(libs.androidx.lifecycle.viewmodel.compose) implementation "io.coil-kt:coil-compose:$coilVersion" diff --git a/build.gradle b/build.gradle index 09442554187..b0680ff5f4b 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,6 @@ ext { googlePlayCoreVersion = '1.10.3' flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' - hiltJetpackVersion = '1.1.0' mediapickerVersion = '0.3.1' androidxCameraVersion = '1.2.3' guavaVersion = '33.1.0-android' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 24ab5a02aca..1344f4e7374 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ androidx-constraintlayout-main = '2.1.4' androidx-core-main = '1.13.1' androidx-core-splashscreen = '1.0.1' androidx-datastore = '1.1.0' +androidx-hilt = '1.1.0' androidx-lifecycle = '2.7.0' androidx-preference = '1.2.1' androidx-recyclerview-main = '1.3.2' @@ -52,6 +53,11 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidx-core-splashscreen" } androidx-datastore-main = { group = "androidx.datastore", name = "datastore", version.ref = "androidx-datastore" } androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidx-datastore" } +androidx-hilt-common = { group = "androidx.hilt", name = "hilt-common", version.ref = "androidx-hilt" } +androidx-hilt-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "androidx-hilt" } +androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidx-hilt" } +androidx-hilt-navigation-fragment = { group = "androidx.hilt", name = "hilt-navigation-fragment", version.ref = "androidx-hilt" } +androidx-hilt-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "androidx-hilt" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } From a0eb3625b412db5dacff537ea30a24f5b9e042fb Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:15:22 +0300 Subject: [PATCH 37/86] Deps: Migrate mpandroidchart to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index a8ad6f4ca75..d93d3dfa278 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -317,7 +317,7 @@ dependencies { implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion" ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion" - implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' + implementation(libs.mpandroidchart) implementation "com.github.bumptech.glide:glide:$glideVersion" ksp "com.github.bumptech.glide:compiler:$glideVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1344f4e7374..24af28fa8c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,6 +34,7 @@ junit = '4.13.2' kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' +mpandroidchart = 'v3.1.0' photoview = '2.3.0' stripe-terminal = '3.7.1' wordpress-aztec = 'v2.1.4' @@ -100,6 +101,7 @@ kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "ko kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" } mockito-inline = { group = "org.mockito", name = "mockito-inline", version.ref = "mockito-inline" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } +mpandroidchart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "mpandroidchart" } photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref = "photoview" } stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } From 8893f9ac15c293bfe8206b672af1d23c46ab8359 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:21:23 +0300 Subject: [PATCH 38/86] Deps: Migrate bumptech glide to version catalogs on woocommerce FYI: This change also drops the '@aar' suffix requirement, as the per the 'Glide v4 Volley' documentation. PS: The only difference between having the '@aar' suffix and not having it, is the fact that not having it also bring in transitive dependencies related to that 'volley-integration' dependency. --- WooCommerce/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index d93d3dfa278..f4ecd1e7106 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -319,9 +319,9 @@ dependencies { implementation(libs.mpandroidchart) - implementation "com.github.bumptech.glide:glide:$glideVersion" - ksp "com.github.bumptech.glide:compiler:$glideVersion" - implementation "com.github.bumptech.glide:volley-integration:$glideVersion@aar" + implementation(libs.bumptech.glide.main) + ksp(libs.bumptech.glide.compiler) + implementation(libs.bumptech.glide.volley.integration) implementation 'com.google.android.play:app-update:2.1.0' implementation 'com.google.android.play:review:2.0.1' diff --git a/build.gradle b/build.gradle index b0680ff5f4b..e89ab400436 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,6 @@ tasks.register("installGitHooks", Copy) { } ext { - glideVersion = '4.16.0' coilVersion = '2.1.0' constraintLayoutVersion = '1.2.0' eventBusVersion = '3.3.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 24af28fa8c8..af5128aa332 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,6 +21,7 @@ androidx-work = '2.7.1' automattic-about = '0.0.6' automattic-tracks = '5.0.0' assertj = '3.24.1' +bumptech-glide = '4.16.0' facebook-shimmer = '0.5.0' google-firebase-bom = '32.7.1' google-material = '1.12.0' @@ -79,6 +80,9 @@ automattic-about = { group = "com.automattic", name = "about", version.ref = "au automattic-tracks-android = { group = "com.automattic", name = "Automattic-Tracks-Android", version.ref = "automattic-tracks" } automattic-tracks-experimentation = { group = "com.automattic.tracks", name = "experimentation", version.ref = "automattic-tracks" } automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automattic-tracks" } +bumptech-glide-main = { group = "com.github.bumptech.glide", name = "glide", version.ref = "bumptech-glide" } +bumptech-glide-compiler = { group = "com.github.bumptech.glide", name = "compiler", version.ref = "bumptech-glide" } +bumptech-glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref = "bumptech-glide" } facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref = "facebook-shimmer" } google-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } From 74c7aa97387db31b166aacbb3917719fbd5238a1 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:30:13 +0300 Subject: [PATCH 39/86] Deps: Migrate google play to version catalogs on woocommerce --- WooCommerce/build.gradle | 4 ++-- gradle/libs.versions.toml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index f4ecd1e7106..f4cbd5e0f4e 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -322,8 +322,8 @@ dependencies { implementation(libs.bumptech.glide.main) ksp(libs.bumptech.glide.compiler) implementation(libs.bumptech.glide.volley.integration) - implementation 'com.google.android.play:app-update:2.1.0' - implementation 'com.google.android.play:review:2.0.1' + implementation(libs.google.play.app.update) + implementation(libs.google.play.review) implementation(libs.google.play.services.code.scanner) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af5128aa332..93014707c5c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,6 +27,8 @@ google-firebase-bom = '32.7.1' google-material = '1.12.0' google-mlkit-barcode-scanning = '17.2.0' google-mlkit-text-recognition = '16.0.0' +google-play-app-update = '2.1.0' +google-play-review = '2.0.1' google-play-services-auth = '20.2.0' google-play-services-code-scanner = '16.1.0' google-play-services-wearable = '18.1.0' @@ -94,6 +96,8 @@ google-mlkit-text-recognition-main = { group = "com.google.mlkit", name = "text- google-mlkit-text-recognition-japanese = { group = "com.google.android.gms", name = "play-services-mlkit-text-recognition-japanese", version.ref = "google-mlkit-text-recognition" } google-mlkit-text-recognition-chinese = { group = "com.google.android.gms", name = "play-services-mlkit-text-recognition-chinese", version.ref = "google-mlkit-text-recognition" } google-mlkit-text-recognition-korean = { group = "com.google.android.gms", name = "play-services-mlkit-text-recognition-korean", version.ref = "google-mlkit-text-recognition" } +google-play-app-update = { group = "com.google.android.play", name = "app-update", version.ref = "google-play-app-update" } +google-play-review = { group = "com.google.android.play", name = "review", version.ref = "google-play-review" } google-play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "google-play-services-auth" } google-play-services-code-scanner = { group = "com.google.android.gms", name = "play-services-code-scanner", version.ref = "google-play-services-code-scanner" } google-play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "google-play-services-wearable" } From 627041c0417ccc8dd21ba264c3175635b8516375 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:32:35 +0300 Subject: [PATCH 40/86] Deps: Migrate google zxing to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index f4cbd5e0f4e..1ed79afbb32 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -334,7 +334,7 @@ dependencies { implementation(libs.google.mlkit.barcode.scanning) - implementation "com.google.zxing:core:3.5.3" + implementation(libs.google.zxing.core) implementation(libs.google.play.services.wearable) // Debug dependencies diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 93014707c5c..1f5b380718e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,6 +32,7 @@ google-play-review = '2.0.1' google-play-services-auth = '20.2.0' google-play-services-code-scanner = '16.1.0' google-play-services-wearable = '18.1.0' +google-zxing = '3.5.3' gravatar = '0.2.0' junit = '4.13.2' kotlinx-coroutines = '1.8.1' @@ -101,6 +102,7 @@ google-play-review = { group = "com.google.android.play", name = "review", versi google-play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "google-play-services-auth" } google-play-services-code-scanner = { group = "com.google.android.gms", name = "play-services-code-scanner", version.ref = "google-play-services-code-scanner" } google-play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "google-play-services-wearable" } +google-zxing-core = { group = "com.google.zxing", name = "core", version.ref = "google-zxing" } gravatar = { group = "com.gravatar", name = "gravatar", version.ref = "gravatar" } junit = { group = "junit", name = "junit", version.ref = "junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } From 9a6e4627e36ab19b377e652a3b6c28b6be5b095e Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:35:45 +0300 Subject: [PATCH 41/86] Deps: Migrate facebook flipper to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 4 ++-- WooCommerce/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 20bb5fb0d23..70260271bd3 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -207,9 +207,9 @@ dependencies { }) // Debug dependencies - debugImplementation "com.facebook.flipper:flipper:$flipperVersion" + debugImplementation(libs.facebook.flipper.main) debugImplementation "com.facebook.soloader:soloader:0.10.4" - debugImplementation("com.facebook.flipper:flipper-network-plugin:$flipperVersion") { + debugImplementation(libs.facebook.flipper.network.plugin) { // Force Flipper to use the okhttp version defined in the fluxc module // okhttp versions higher than 3.9.0 break handling for self-signed SSL sites // See https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/919 diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 1ed79afbb32..a89a298fa6d 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -338,9 +338,9 @@ dependencies { implementation(libs.google.play.services.wearable) // Debug dependencies - debugImplementation "com.facebook.flipper:flipper:$flipperVersion" + debugImplementation(libs.facebook.flipper.main) debugImplementation "com.facebook.soloader:soloader:0.10.4" - debugImplementation("com.facebook.flipper:flipper-network-plugin:$flipperVersion") { + debugImplementation(libs.facebook.flipper.network.plugin) { // Force Flipper to use the okhttp version defined in the fluxc module // okhttp versions higher than 3.9.0 break handling for self-signed SSL sites // See https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/919 diff --git a/build.gradle b/build.gradle index e89ab400436..1c324ac52dc 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,6 @@ ext { constraintLayoutVersion = '1.2.0' eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' - flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' mediapickerVersion = '0.3.1' androidxCameraVersion = '1.2.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1f5b380718e..380af895b86 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,6 +22,7 @@ automattic-about = '0.0.6' automattic-tracks = '5.0.0' assertj = '3.24.1' bumptech-glide = '4.16.0' +facebook-flipper = '0.176.1' facebook-shimmer = '0.5.0' google-firebase-bom = '32.7.1' google-material = '1.12.0' @@ -86,6 +87,8 @@ automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "cras bumptech-glide-main = { group = "com.github.bumptech.glide", name = "glide", version.ref = "bumptech-glide" } bumptech-glide-compiler = { group = "com.github.bumptech.glide", name = "compiler", version.ref = "bumptech-glide" } bumptech-glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref = "bumptech-glide" } +facebook-flipper-main = { group = "com.facebook.flipper", name = "flipper", version.ref = "facebook-flipper" } +facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref = "facebook-flipper" } facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref = "facebook-shimmer" } google-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } From 24964f463527082820c35bd275422b6c5088d5ae Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:37:53 +0300 Subject: [PATCH 42/86] Deps: Migrate facebook soloader to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 70260271bd3..952bb0e45c9 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -208,7 +208,7 @@ dependencies { // Debug dependencies debugImplementation(libs.facebook.flipper.main) - debugImplementation "com.facebook.soloader:soloader:0.10.4" + debugImplementation(libs.facebook.soloader) debugImplementation(libs.facebook.flipper.network.plugin) { // Force Flipper to use the okhttp version defined in the fluxc module // okhttp versions higher than 3.9.0 break handling for self-signed SSL sites diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index a89a298fa6d..b96ce160c4a 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -339,7 +339,7 @@ dependencies { // Debug dependencies debugImplementation(libs.facebook.flipper.main) - debugImplementation "com.facebook.soloader:soloader:0.10.4" + debugImplementation(libs.facebook.soloader) debugImplementation(libs.facebook.flipper.network.plugin) { // Force Flipper to use the okhttp version defined in the fluxc module // okhttp versions higher than 3.9.0 break handling for self-signed SSL sites diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 380af895b86..3c8d7a3c242 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,7 @@ assertj = '3.24.1' bumptech-glide = '4.16.0' facebook-flipper = '0.176.1' facebook-shimmer = '0.5.0' +facebook-soloader = '0.10.4' google-firebase-bom = '32.7.1' google-material = '1.12.0' google-mlkit-barcode-scanning = '17.2.0' @@ -90,6 +91,7 @@ bumptech-glide-volley-integration = { group = "com.github.bumptech.glide", name facebook-flipper-main = { group = "com.facebook.flipper", name = "flipper", version.ref = "facebook-flipper" } facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref = "facebook-flipper" } facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref = "facebook-shimmer" } +facebook-soloader = { group = "com.facebook.soloader", name = "soloader", version.ref = "facebook-soloader" } google-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } From f3479a36a76cf113e553eeee6411350c0fa1d8af Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:40:36 +0300 Subject: [PATCH 43/86] Deps: Migrate squareup leakcanary to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index b96ce160c4a..f53e1186a39 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -348,7 +348,7 @@ dependencies { } if (isLeakCanaryEnabled()) { - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14' + debugImplementation(libs.squareup.leakcanary.android) } // Dependencies for local unit tests diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3c8d7a3c242..5bfc90ddd24 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -42,6 +42,7 @@ mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' mpandroidchart = 'v3.1.0' photoview = '2.3.0' +squareup-leakcanary = '2.14' stripe-terminal = '3.7.1' wordpress-aztec = 'v2.1.4' wordpress-fluxc = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' @@ -118,6 +119,7 @@ mockito-inline = { group = "org.mockito", name = "mockito-inline", version.ref = mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } mpandroidchart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "mpandroidchart" } photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref = "photoview" } +squareup-leakcanary-android = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "squareup-leakcanary" } stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } wordpress-libaddressinput-common = { group = "org.wordpress", name = "libaddressinput.common", version.ref = "wordpress-libaddressinput" } From 7fe947b3eae77d189a0cf526ff4305ae62c0cce5 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:44:08 +0300 Subject: [PATCH 44/86] Deps: Migrate androidx arch core to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 4 ++-- WooCommerce/build.gradle | 4 ++-- gradle/libs.versions.toml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 952bb0e45c9..07125b98495 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -200,11 +200,11 @@ dependencies { testImplementation(libs.mockito.inline) testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation(libs.assertj.core) - testImplementation("androidx.arch.core:core-testing:2.1.0", { + testImplementation(libs.androidx.arch.core.testing) { exclude group: 'com.android.support', module: 'support-compat' exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-core-utils' - }) + } // Debug dependencies debugImplementation(libs.facebook.flipper.main) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index f53e1186a39..1c4d9116437 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -357,11 +357,11 @@ dependencies { testImplementation(libs.mockito.inline) testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation(libs.assertj.core) - testImplementation("androidx.arch.core:core-testing:2.1.0", { + testImplementation(libs.androidx.arch.core.testing) { exclude group: 'com.android.support', module: 'support-compat' exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-core-utils' - }) + } // Dependencies for Espresso UI tests androidTestImplementation(libs.androidx.test.ext.junit) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5bfc90ddd24..cdd2ad45c36 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] android-billingclient = '5.0.0' androidx-appcompat = '1.4.2' +androidx-arch-core = '2.1.0' androidx-browser = '1.5.0' androidx-cardview = '1.0.0' androidx-constraintlayout-compose = '1.0.1' @@ -53,6 +54,7 @@ wordpress-utils = '3.5.0' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } +androidx-arch-core-testing = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidx-arch-core" } androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidx-browser" } androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidx-cardview" } androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "androidx-constraintlayout-compose" } From 50cfbcae8381cb4f39c1bf4f507432c9a314bf51 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:46:32 +0300 Subject: [PATCH 45/86] Deps: Migrate androidx test espresso to version catalogs on woocommerce --- WooCommerce/build.gradle | 4 ++-- build.gradle | 3 --- gradle/libs.versions.toml | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 1c4d9116437..92654b57db9 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -367,8 +367,8 @@ dependencies { androidTestImplementation(libs.androidx.test.ext.junit) androidTestImplementation(libs.androidx.test.main.rules) androidTestImplementation(libs.assertj.core) - androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" - androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion") { + androidTestImplementation(libs.androidx.test.espresso.core) + androidTestImplementation(libs.androidx.test.espresso.contrib) { exclude group: "com.google.protobuf", module: "protobuf-lite" } androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion" diff --git a/build.gradle b/build.gradle index 1c324ac52dc..49d9ba0ed91 100644 --- a/build.gradle +++ b/build.gradle @@ -122,9 +122,6 @@ ext { composeCompilerVersion = "1.5.9" composeAccompanistVersion = "0.32.0" wearComposeVersion = "1.3.1" - - // Testing - espressoVersion = '3.4.0' } // Onboarding and dev env setup tasks diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cdd2ad45c36..197002ceb87 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,6 +14,7 @@ androidx-lifecycle = '2.7.0' androidx-preference = '1.2.1' androidx-recyclerview-main = '1.3.2' androidx-recyclerview-selection = '1.1.0' +androidx-test-espresso = '3.4.0' androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' @@ -76,6 +77,8 @@ androidx-preference-main = { group = "androidx.preference", name = "preference", androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "androidx-preference" } androidx-recyclerview-main = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recyclerview-main" } androidx-recyclerview-selection = { group = "androidx.recyclerview", name = "recyclerview-selection", version.ref = "androidx-recyclerview-selection" } +androidx-test-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref = "androidx-test-espresso" } +androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-test-espresso" } androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext" } androidx-test-main-core = { group = "androidx.test", name = "core", version.ref = "androidx-test-main" } androidx-test-main-rules = { group = "androidx.test", name = "rules", version.ref = "androidx-test-main" } From c9951d34b4037b4778d12d265430b08a1f431f60 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:49:07 +0300 Subject: [PATCH 46/86] Deps: Migrate fastlane screengrab to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 92654b57db9..3140fb16acf 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -376,7 +376,7 @@ dependencies { androidTestImplementation(libs.androidx.test.uiautomator) // Dependencies for screenshots - androidTestImplementation 'tools.fastlane:screengrab:2.1.1' + androidTestImplementation(libs.fastlane.screengrab) androidTestImplementation('com.github.tomakehurst:wiremock') { exclude group: 'org.apache.httpcomponents', module: 'httpclient' exclude group: 'org.apache.commons', module: 'commons-lang3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 197002ceb87..b147d54d417 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,6 +27,7 @@ bumptech-glide = '4.16.0' facebook-flipper = '0.176.1' facebook-shimmer = '0.5.0' facebook-soloader = '0.10.4' +fastlane-screengrab = '2.1.1' google-firebase-bom = '32.7.1' google-material = '1.12.0' google-mlkit-barcode-scanning = '17.2.0' @@ -98,6 +99,7 @@ facebook-flipper-main = { group = "com.facebook.flipper", name = "flipper", vers facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref = "facebook-flipper" } facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref = "facebook-shimmer" } facebook-soloader = { group = "com.facebook.soloader", name = "soloader", version.ref = "facebook-soloader" } +fastlane-screengrab = { group = "tools.fastlane", name = "screengrab", version.ref = "fastlane-screengrab" } google-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } From 3b4cff793f86b551b13c7425e82a8152f120cedb Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:51:39 +0300 Subject: [PATCH 47/86] Deps: Migrate wiremock to version catalogs on woocommerce --- WooCommerce/build.gradle | 4 ++-- gradle/libs.versions.toml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 3140fb16acf..9b2868eb00b 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -377,14 +377,14 @@ dependencies { // Dependencies for screenshots androidTestImplementation(libs.fastlane.screengrab) - androidTestImplementation('com.github.tomakehurst:wiremock') { + androidTestImplementation(libs.wiremock.get().module.toString()) { exclude group: 'org.apache.httpcomponents', module: 'httpclient' exclude group: 'org.apache.commons', module: 'commons-lang3' exclude group: 'asm', module: 'asm' exclude group: 'org.json', module: 'json' } constraints { - androidTestImplementation("com.github.tomakehurst:wiremock:2.26.3") { + androidTestImplementation(libs.wiremock) { because("newer versions of WireMock use Java APIs not available on Android") } androidTestImplementation('org.eclipse.jetty:jetty-webapp:9.4.51.v20230217') { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b147d54d417..636a10c053c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -47,6 +47,7 @@ mpandroidchart = 'v3.1.0' photoview = '2.3.0' squareup-leakcanary = '2.14' stripe-terminal = '3.7.1' +wiremock = '2.26.3' wordpress-aztec = 'v2.1.4' wordpress-fluxc = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' wordpress-login = '1.18.0' @@ -129,6 +130,7 @@ photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref = squareup-leakcanary-android = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "squareup-leakcanary" } stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } +wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref = "wiremock" } wordpress-libaddressinput-common = { group = "org.wordpress", name = "libaddressinput.common", version.ref = "wordpress-libaddressinput" } wordpress-aztec-main = { group = "org.wordpress", name = "aztec", version.ref = "wordpress-aztec" } wordpress-aztec-glide-loader = { group = "org.wordpress.aztec", name = "glide-loader", version.ref = "wordpress-aztec" } From bf0a57687f96453692c8d848d81cf004a1289e80 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:53:38 +0300 Subject: [PATCH 48/86] Deps: Migrate jetty webapp to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 9b2868eb00b..e0c6be88b12 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -387,7 +387,7 @@ dependencies { androidTestImplementation(libs.wiremock) { because("newer versions of WireMock use Java APIs not available on Android") } - androidTestImplementation('org.eclipse.jetty:jetty-webapp:9.4.51.v20230217') { + androidTestImplementation(libs.jetty.webapp) { because("version shipped with WireMock 2.26.3 contains security vulnerabilities") } androidTestImplementation('com.fasterxml.jackson.core:jackson-databind:2.12.7.1') { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 636a10c053c..6644a2ef564 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,6 +39,7 @@ google-play-services-code-scanner = '16.1.0' google-play-services-wearable = '18.1.0' google-zxing = '3.5.3' gravatar = '0.2.0' +jetty-webapp = '9.4.51.v20230217' junit = '4.13.2' kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' @@ -118,6 +119,7 @@ google-play-services-code-scanner = { group = "com.google.android.gms", name = " google-play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "google-play-services-wearable" } google-zxing-core = { group = "com.google.zxing", name = "core", version.ref = "google-zxing" } gravatar = { group = "com.gravatar", name = "gravatar", version.ref = "gravatar" } +jetty-webapp = { group = "org.eclipse.jetty", name = "jetty-webapp", version.ref = "jetty-webapp" } junit = { group = "junit", name = "junit", version.ref = "junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } From dd02fae4841ec9d65dde77059bda96b8d3d18b18 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:55:13 +0300 Subject: [PATCH 49/86] Deps: Migrate jackson databind to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index e0c6be88b12..52a44e731c4 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -390,7 +390,7 @@ dependencies { androidTestImplementation(libs.jetty.webapp) { because("version shipped with WireMock 2.26.3 contains security vulnerabilities") } - androidTestImplementation('com.fasterxml.jackson.core:jackson-databind:2.12.7.1') { + androidTestImplementation(libs.jackson.databind) { because("version shipped with WireMock 2.26.3 contains security vulnerabilities") } androidTestImplementation('com.jayway.jsonpath:json-path:2.9.0') { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6644a2ef564..186a64abfd1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,6 +39,7 @@ google-play-services-code-scanner = '16.1.0' google-play-services-wearable = '18.1.0' google-zxing = '3.5.3' gravatar = '0.2.0' +jackson-databind = '2.12.7.1' jetty-webapp = '9.4.51.v20230217' junit = '4.13.2' kotlinx-coroutines = '1.8.1' @@ -119,6 +120,7 @@ google-play-services-code-scanner = { group = "com.google.android.gms", name = " google-play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "google-play-services-wearable" } google-zxing-core = { group = "com.google.zxing", name = "core", version.ref = "google-zxing" } gravatar = { group = "com.gravatar", name = "gravatar", version.ref = "gravatar" } +jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson-databind" } jetty-webapp = { group = "org.eclipse.jetty", name = "jetty-webapp", version.ref = "jetty-webapp" } junit = { group = "junit", name = "junit", version.ref = "junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } From 2d4f674c626a7ec2bbf513323849aa756f23d5f4 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:56:22 +0300 Subject: [PATCH 50/86] Deps: Migrate json path to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 52a44e731c4..cb4b207b0b0 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -393,7 +393,7 @@ dependencies { androidTestImplementation(libs.jackson.databind) { because("version shipped with WireMock 2.26.3 contains security vulnerabilities") } - androidTestImplementation('com.jayway.jsonpath:json-path:2.9.0') { + androidTestImplementation(libs.json.path) { because("version shipped with WireMock 2.26.3 contains security vulnerabilities") } androidTestImplementation('commons-fileupload:commons-fileupload:1.5') { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 186a64abfd1..b1632643226 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,6 +41,7 @@ google-zxing = '3.5.3' gravatar = '0.2.0' jackson-databind = '2.12.7.1' jetty-webapp = '9.4.51.v20230217' +json-path = '2.9.0' junit = '4.13.2' kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' @@ -122,6 +123,7 @@ google-zxing-core = { group = "com.google.zxing", name = "core", version.ref = " gravatar = { group = "com.gravatar", name = "gravatar", version.ref = "gravatar" } jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson-databind" } jetty-webapp = { group = "org.eclipse.jetty", name = "jetty-webapp", version.ref = "jetty-webapp" } +json-path = { group = "com.jayway.jsonpath", name = "json-path", version.ref = "json-path" } junit = { group = "junit", name = "junit", version.ref = "junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } From 1334fecd1d5a2af247594672e0edfd768b573706 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:57:37 +0300 Subject: [PATCH 51/86] Deps: Migrate commons fileupload to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index cb4b207b0b0..0c0d568b3bb 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -396,7 +396,7 @@ dependencies { androidTestImplementation(libs.json.path) { because("version shipped with WireMock 2.26.3 contains security vulnerabilities") } - androidTestImplementation('commons-fileupload:commons-fileupload:1.5') { + androidTestImplementation(libs.commons.fileupload) { because("version shipped with WireMock 2.26.3 contains security vulnerabilities") } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b1632643226..e79cf32f3f1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,7 @@ automattic-about = '0.0.6' automattic-tracks = '5.0.0' assertj = '3.24.1' bumptech-glide = '4.16.0' +commons-fileupload = '1.5' facebook-flipper = '0.176.1' facebook-shimmer = '0.5.0' facebook-soloader = '0.10.4' @@ -99,6 +100,7 @@ automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "cras bumptech-glide-main = { group = "com.github.bumptech.glide", name = "glide", version.ref = "bumptech-glide" } bumptech-glide-compiler = { group = "com.github.bumptech.glide", name = "compiler", version.ref = "bumptech-glide" } bumptech-glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref = "bumptech-glide" } +commons-fileupload = { group = "commons-fileupload", name = "commons-fileupload", version.ref = "commons-fileupload" } facebook-flipper-main = { group = "com.facebook.flipper", name = "flipper", version.ref = "facebook-flipper" } facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref = "facebook-flipper" } facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref = "facebook-shimmer" } From be21407f54664b404e93b84f6ff686b6c9b50d7a Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 16:59:32 +0300 Subject: [PATCH 52/86] Deps: Migrate apache http client android to version catalogs on wc --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 0c0d568b3bb..0de03571106 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -400,7 +400,7 @@ dependencies { because("version shipped with WireMock 2.26.3 contains security vulnerabilities") } } - androidTestImplementation "org.apache.httpcomponents:httpclient-android:$httpClientAndroidVersion" + androidTestImplementation(libs.apache.http.client.android) implementation("com.zendesk:support:5.0.8") { exclude group: 'com.android.support', module: 'support-annotations' diff --git a/build.gradle b/build.gradle index 49d9ba0ed91..50c9a043e78 100644 --- a/build.gradle +++ b/build.gradle @@ -115,7 +115,6 @@ ext { // Apache commonsText = '1.10.0' commonsIO = '2.11.0' - httpClientAndroidVersion = '4.3.5.1' // Compose and its module versions need to be consistent with each other (for example 'compose-theme-adapter') composeBOMVersion = "2024.04.00" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e79cf32f3f1..e12de9c3c5b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,6 +20,7 @@ androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' androidx-transition = '1.5.1' androidx-work = '2.7.1' +apache-http-client-android = '4.3.5.1' automattic-about = '0.0.6' automattic-tracks = '5.0.0' assertj = '3.24.1' @@ -92,6 +93,7 @@ androidx-test-main-runner = { group = "androidx.test", name = "runner", version. androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } androidx-transition = { group = "androidx.transition", name = "transition", version.ref = "androidx-transition" } androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" } +apache-http-client-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref = "apache-http-client-android" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" } automattic-about = { group = "com.automattic", name = "about", version.ref = "automattic-about" } automattic-tracks-android = { group = "com.automattic", name = "Automattic-Tracks-Android", version.ref = "automattic-tracks" } From 9631da3e02f32a35cd2ea91eed0d728d5e35456f Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 17:01:26 +0300 Subject: [PATCH 53/86] Deps: Migrate zendesk to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 0de03571106..8f4038cdcf4 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -402,7 +402,7 @@ dependencies { } androidTestImplementation(libs.apache.http.client.android) - implementation("com.zendesk:support:5.0.8") { + implementation(libs.zendesk.support) { exclude group: 'com.android.support', module: 'support-annotations' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e12de9c3c5b..8ff3ef0d32c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -58,6 +58,7 @@ wordpress-fluxc = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' wordpress-login = '1.18.0' wordpress-libaddressinput = '0.0.2' wordpress-utils = '3.5.0' +zendesk = '5.0.8' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } @@ -145,3 +146,4 @@ wordpress-libaddressinput-common = { group = "org.wordpress", name = "libaddress wordpress-aztec-main = { group = "org.wordpress", name = "aztec", version.ref = "wordpress-aztec" } wordpress-aztec-glide-loader = { group = "org.wordpress.aztec", name = "glide-loader", version.ref = "wordpress-aztec" } wordpress-utils = { group = "org.wordpress", name = "utils", version.ref = "wordpress-utils" } +zendesk-support = { group = "com.zendesk", name = "support", version.ref = "zendesk" } From 5be0d0f4d79f777cff3622373ca55767624493ff Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 17:03:55 +0300 Subject: [PATCH 54/86] Deps: Migrate androidx fragment to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 8f4038cdcf4..1fcce347642 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -407,7 +407,7 @@ dependencies { } // ViewModel and LiveData - implementation "androidx.fragment:fragment-ktx:1.8.2" + implementation(libs.androidx.fragment.ktx) implementation "androidx.activity:activity-ktx:1.8.0" implementation(libs.androidx.lifecycle.viewmodel.savedstate) implementation(libs.androidx.lifecycle.process) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8ff3ef0d32c..19ca6069c9f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,6 +9,7 @@ androidx-constraintlayout-main = '2.1.4' androidx-core-main = '1.13.1' androidx-core-splashscreen = '1.0.1' androidx-datastore = '1.1.0' +androidx-fragment = '1.8.2' androidx-hilt = '1.1.0' androidx-lifecycle = '2.7.0' androidx-preference = '1.2.1' @@ -72,6 +73,7 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidx-core-splashscreen" } androidx-datastore-main = { group = "androidx.datastore", name = "datastore", version.ref = "androidx-datastore" } androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidx-datastore" } +androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx-fragment" } androidx-hilt-common = { group = "androidx.hilt", name = "hilt-common", version.ref = "androidx-hilt" } androidx-hilt-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "androidx-hilt" } androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidx-hilt" } From 13af208d2e8f0b4597e1bf311a93f542c8e80bd1 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 17:08:28 +0300 Subject: [PATCH 55/86] Deps: Migrate androidx activity to version catalogs on woocommerce FYI: The 'androidx-activity-compose' dependency has no associated 'androidx-activity' version on it as it seems to be taking this version from 'androidx-compose-bom' instead. --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 4 ++-- gradle/libs.versions.toml | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 07125b98495..a0a0491dba7 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -171,7 +171,7 @@ dependencies { implementation(libs.androidx.lifecycle.livedata.ktx) implementation(libs.androidx.core.splashscreen) implementation "androidx.navigation:navigation-compose:2.7.7" - implementation 'androidx.activity:activity-compose' + implementation(libs.androidx.activity.compose) implementation(libs.androidx.preference.ktx) implementation(libs.androidx.datastore.preferences) implementation(libs.androidx.datastore.main) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 1fcce347642..9bfad8da82c 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -408,7 +408,7 @@ dependencies { // ViewModel and LiveData implementation(libs.androidx.fragment.ktx) - implementation "androidx.activity:activity-ktx:1.8.0" + implementation(libs.androidx.activity.ktx) implementation(libs.androidx.lifecycle.viewmodel.savedstate) implementation(libs.androidx.lifecycle.process) @@ -437,7 +437,7 @@ dependencies { // Jetpack Compose implementation platform("androidx.compose:compose-bom:$composeBOMVersion") // Dependencies managed by BOM - implementation 'androidx.activity:activity-compose' + implementation(libs.androidx.activity.compose) implementation 'androidx.compose.material:material' implementation 'androidx.compose.animation:animation' implementation 'androidx.compose.ui:ui-tooling' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 19ca6069c9f..4bd264f850f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] android-billingclient = '5.0.0' +androidx-activity = '1.8.0' androidx-appcompat = '1.4.2' androidx-arch-core = '2.1.0' androidx-browser = '1.5.0' @@ -63,6 +64,8 @@ zendesk = '5.0.8' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose" } +androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx-activity" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } androidx-arch-core-testing = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidx-arch-core" } androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidx-browser" } From a9cb94ba85c0ec5975d83f4fd13bbe41b5f7cd67 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 17:12:05 +0300 Subject: [PATCH 56/86] Deps: Migrate cashapp turbine to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 9bfad8da82c..f3744720b7e 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -418,7 +418,7 @@ dependencies { implementation(libs.kotlinx.coroutines.play.services) testImplementation(libs.kotlinx.coroutines.test) - testImplementation 'app.cash.turbine:turbine:1.0.0' + testImplementation(libs.cashapp.turbine) implementation "org.apache.commons:commons-text:$commonsText" implementation "commons-io:commons-io:$commonsIO" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4bd264f850f..c78199a191e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,6 +27,7 @@ automattic-about = '0.0.6' automattic-tracks = '5.0.0' assertj = '3.24.1' bumptech-glide = '4.16.0' +cashapp-turbine = '1.0.0' commons-fileupload = '1.5' facebook-flipper = '0.176.1' facebook-shimmer = '0.5.0' @@ -108,6 +109,7 @@ automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "cras bumptech-glide-main = { group = "com.github.bumptech.glide", name = "glide", version.ref = "bumptech-glide" } bumptech-glide-compiler = { group = "com.github.bumptech.glide", name = "compiler", version.ref = "bumptech-glide" } bumptech-glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref = "bumptech-glide" } +cashapp-turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "cashapp-turbine" } commons-fileupload = { group = "commons-fileupload", name = "commons-fileupload", version.ref = "commons-fileupload" } facebook-flipper-main = { group = "com.facebook.flipper", name = "flipper", version.ref = "facebook-flipper" } facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref = "facebook-flipper" } From ed5addcf3ee8bd9c0e47b14fd9f999df8734645d Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 17:14:21 +0300 Subject: [PATCH 57/86] Deps: Migrate apache commons text to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index f3744720b7e..a048fea081c 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -420,7 +420,7 @@ dependencies { testImplementation(libs.cashapp.turbine) - implementation "org.apache.commons:commons-text:$commonsText" + implementation(libs.apache.commons.text) implementation "commons-io:commons-io:$commonsIO" implementation "com.tinder.statemachine:statemachine:$stateMachineVersion" diff --git a/build.gradle b/build.gradle index 50c9a043e78..491759c0a92 100644 --- a/build.gradle +++ b/build.gradle @@ -113,7 +113,6 @@ ext { securityLintVersion = '1.0.1' // Apache - commonsText = '1.10.0' commonsIO = '2.11.0' // Compose and its module versions need to be consistent with each other (for example 'compose-theme-adapter') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c78199a191e..82374747aa2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,6 +22,7 @@ androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' androidx-transition = '1.5.1' androidx-work = '2.7.1' +apache-commons-text = '1.10.0' apache-http-client-android = '4.3.5.1' automattic-about = '0.0.6' automattic-tracks = '5.0.0' @@ -100,6 +101,7 @@ androidx-test-main-runner = { group = "androidx.test", name = "runner", version. androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } androidx-transition = { group = "androidx.transition", name = "transition", version.ref = "androidx-transition" } androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" } +apache-commons-text = { group = "org.apache.commons", name = "commons-text", version.ref = "apache-commons-text" } apache-http-client-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref = "apache-http-client-android" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" } automattic-about = { group = "com.automattic", name = "about", version.ref = "automattic-about" } From a4807cbe48d6c88b9af8931b9560447eaa9ba8bb Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 17:16:50 +0300 Subject: [PATCH 58/86] Deps: Migrate commons io to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- build.gradle | 3 --- gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index a048fea081c..58cec283ed8 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -421,7 +421,7 @@ dependencies { testImplementation(libs.cashapp.turbine) implementation(libs.apache.commons.text) - implementation "commons-io:commons-io:$commonsIO" + implementation(libs.commons.io) implementation "com.tinder.statemachine:statemachine:$stateMachineVersion" diff --git a/build.gradle b/build.gradle index 491759c0a92..7925fdaf942 100644 --- a/build.gradle +++ b/build.gradle @@ -112,9 +112,6 @@ ext { wearHorologistVersion = '0.6.10' securityLintVersion = '1.0.1' - // Apache - commonsIO = '2.11.0' - // Compose and its module versions need to be consistent with each other (for example 'compose-theme-adapter') composeBOMVersion = "2024.04.00" composeCompilerVersion = "1.5.9" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 82374747aa2..82be9f817d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,6 +30,7 @@ assertj = '3.24.1' bumptech-glide = '4.16.0' cashapp-turbine = '1.0.0' commons-fileupload = '1.5' +commons-io = '2.11.0' facebook-flipper = '0.176.1' facebook-shimmer = '0.5.0' facebook-soloader = '0.10.4' @@ -113,6 +114,7 @@ bumptech-glide-compiler = { group = "com.github.bumptech.glide", name = "compile bumptech-glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref = "bumptech-glide" } cashapp-turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "cashapp-turbine" } commons-fileupload = { group = "commons-fileupload", name = "commons-fileupload", version.ref = "commons-fileupload" } +commons-io = { group = "commons-io", name = "commons-io", version.ref = "commons-io" } facebook-flipper-main = { group = "com.facebook.flipper", name = "flipper", version.ref = "facebook-flipper" } facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref = "facebook-flipper" } facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref = "facebook-shimmer" } From cc73979dc2666aca619a86da4192feebe08097be Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 17:19:12 +0300 Subject: [PATCH 59/86] Deps: Migrate tinder statemachine to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 58cec283ed8..8cc88a5f656 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -423,7 +423,7 @@ dependencies { implementation(libs.apache.commons.text) implementation(libs.commons.io) - implementation "com.tinder.statemachine:statemachine:$stateMachineVersion" + implementation(libs.tinder.statemachine) implementation("${gradle.ext.mediaPickerBinaryPath}:$mediapickerVersion") { exclude group: "org.wordpress", module: "utils" diff --git a/build.gradle b/build.gradle index 7925fdaf942..22aff4eada8 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,6 @@ ext { constraintLayoutVersion = '1.2.0' eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' - stateMachineVersion = '0.2.0' mediapickerVersion = '0.3.1' androidxCameraVersion = '1.2.3' guavaVersion = '33.1.0-android' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 82be9f817d7..7be099ac58f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -57,6 +57,7 @@ mpandroidchart = 'v3.1.0' photoview = '2.3.0' squareup-leakcanary = '2.14' stripe-terminal = '3.7.1' +tinder-statemachine = '0.2.0' wiremock = '2.26.3' wordpress-aztec = 'v2.1.4' wordpress-fluxc = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' @@ -152,6 +153,7 @@ photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref = squareup-leakcanary-android = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "squareup-leakcanary" } stripe-terminal-localmobile = { group = "com.stripe", name = "stripeterminal-localmobile", version.ref = "stripe-terminal" } stripe-terminal-core = { group = "com.stripe", name = "stripeterminal-core", version.ref = "stripe-terminal" } +tinder-statemachine = { group = "com.tinder.statemachine", name = "statemachine", version.ref = "tinder-statemachine" } wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref = "wiremock" } wordpress-libaddressinput-common = { group = "org.wordpress", name = "libaddressinput.common", version.ref = "wordpress-libaddressinput" } wordpress-aztec-main = { group = "org.wordpress", name = "aztec", version.ref = "wordpress-aztec" } From 8da5ec165a1eb76fc5856c618df0d7ba92f11a64 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 17:33:25 +0300 Subject: [PATCH 60/86] Deps: Migrate wordpress mediapicker to version catalogs on woocommerce --- WooCommerce/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 8cc88a5f656..5b599c83bf2 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -425,11 +425,11 @@ dependencies { implementation(libs.tinder.statemachine) - implementation("${gradle.ext.mediaPickerBinaryPath}:$mediapickerVersion") { + implementation("${gradle.ext.mediaPickerBinaryPath}:${libs.versions.wordpress.mediapicker.get()}") { exclude group: "org.wordpress", module: "utils" } - implementation("${gradle.ext.mediaPickerSourceCameraBinaryPath}:$mediapickerVersion") - implementation("${gradle.ext.mediaPickerSourceWordPressBinaryPath}:$mediapickerVersion") { + implementation("${gradle.ext.mediaPickerSourceCameraBinaryPath}:${libs.versions.wordpress.mediapicker.get()}") + implementation("${gradle.ext.mediaPickerSourceWordPressBinaryPath}:${libs.versions.wordpress.mediapicker.get()}") { exclude group: "org.wordpress", module: "utils" exclude group: "org.wordpress", module: "fluxc" } diff --git a/build.gradle b/build.gradle index 22aff4eada8..4628a27a0b8 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,6 @@ ext { constraintLayoutVersion = '1.2.0' eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' - mediapickerVersion = '0.3.1' androidxCameraVersion = '1.2.3' guavaVersion = '33.1.0-android' protobufVersion = '3.25.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7be099ac58f..64ed3e69d24 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -63,6 +63,7 @@ wordpress-aztec = 'v2.1.4' wordpress-fluxc = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' wordpress-login = '1.18.0' wordpress-libaddressinput = '0.0.2' +wordpress-mediapicker = '0.3.1' wordpress-utils = '3.5.0' zendesk = '5.0.8' From 02b3d26bf70602efa6a9e01a6c472271d79c8b8d Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 17:34:31 +0300 Subject: [PATCH 61/86] Cleanup: Remove local woocommerce shared path leftover This is a leftover from this 298efad766dac076a7414fcad34afb978268bf4c commit that wasn't removed as part of it. --- local-builds.gradle-example | 1 - 1 file changed, 1 deletion(-) diff --git a/local-builds.gradle-example b/local-builds.gradle-example index b77bf9bb268..8a58586e77a 100644 --- a/local-builds.gradle-example +++ b/local-builds.gradle-example @@ -17,5 +17,4 @@ ext { //localFluxCPath = "../WordPress-FluxC-Android" //localLoginFlowPath = "../WordPress-Login-Flow-Android" //localMediaPickerPath = "../WordPress-MediaPicker-Android" - //localWooCommerceSharedPath = "../WooCommerce-Shared/libraries/android" } From 9e129c0d92f79c5a0e610d4319d2c3d1a2333366 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 18:00:42 +0300 Subject: [PATCH 62/86] Deps: Migrate androidx compose to version catalogs on all modules FYI: The 'androidx.compose.ui:ui-test-junit4' version is not being dependant on the 'androidx.compose.bom' version, via this newly added 'androidTestImplementation(platform(libs.androidx.compose.bom))' configuration, and not hardcoded to the specific '1.3.2' version of this library. --- WooCommerce-Wear/build.gradle | 20 ++++++++++---------- WooCommerce/build.gradle | 21 +++++++++++---------- build.gradle | 2 -- gradle/libs.versions.toml | 13 +++++++++++++ 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index a0a0491dba7..221ba8d5ba8 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -88,7 +88,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion composeCompilerVersion + kotlinCompilerExtensionVersion libs.versions.androidx.compose.compiler.get() } packaging { resources { @@ -155,15 +155,15 @@ dependencies { implementation 'androidx.wear:wear-tooling-preview:1.0.0' // Compose - implementation platform("androidx.compose:compose-bom:$composeBOMVersion") - implementation 'androidx.compose.ui:ui' - implementation 'androidx.compose.ui:ui-tooling-preview' - implementation 'androidx.compose.material:material' - implementation 'androidx.compose.animation:animation' - implementation 'androidx.compose.ui:ui-tooling' - implementation 'androidx.compose.runtime:runtime-livedata' - implementation "androidx.compose.material:material-icons-extended" - implementation 'androidx.compose.ui:ui-text-google-fonts' + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.compose.ui.main) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.compose.material.main) + implementation(libs.androidx.compose.animation.main) + implementation(libs.androidx.compose.ui.tooling.main) + implementation(libs.androidx.compose.runtime.livedata) + implementation(libs.androidx.compose.material.icons.extended) + implementation(libs.androidx.compose.ui.text.google.fonts) // Android Support implementation(libs.androidx.work.runtime.ktx) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 5b599c83bf2..0173bf904a3 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -151,7 +151,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion composeCompilerVersion + kotlinCompilerExtensionVersion libs.versions.androidx.compose.compiler.get() } flavorDimensions "buildType" @@ -435,15 +435,16 @@ dependencies { } // Jetpack Compose - implementation platform("androidx.compose:compose-bom:$composeBOMVersion") + implementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(platform(libs.androidx.compose.bom)) // Dependencies managed by BOM implementation(libs.androidx.activity.compose) - implementation 'androidx.compose.material:material' - implementation 'androidx.compose.animation:animation' - implementation 'androidx.compose.ui:ui-tooling' - implementation 'androidx.compose.runtime:runtime-livedata' - implementation "androidx.compose.material:material-icons-extended" - implementation 'androidx.compose.ui:ui-text-google-fonts' + implementation(libs.androidx.compose.material.main) + implementation(libs.androidx.compose.animation.main) + implementation(libs.androidx.compose.ui.tooling.main) + implementation(libs.androidx.compose.runtime.livedata) + implementation(libs.androidx.compose.material.icons.extended) + implementation(libs.androidx.compose.ui.text.google.fonts) implementation 'androidx.navigation:navigation-compose' implementation(libs.androidx.hilt.navigation.compose) @@ -452,8 +453,8 @@ dependencies { implementation "io.coil-kt:coil-compose:$coilVersion" implementation "io.coil-kt:coil-svg:$coilVersion" - androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.3.2' - debugImplementation 'androidx.compose.ui:ui-test-manifest' + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + debugImplementation(libs.androidx.compose.ui.test.manifest) coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' diff --git a/build.gradle b/build.gradle index 4628a27a0b8..c147d7e18bc 100644 --- a/build.gradle +++ b/build.gradle @@ -111,8 +111,6 @@ ext { securityLintVersion = '1.0.1' // Compose and its module versions need to be consistent with each other (for example 'compose-theme-adapter') - composeBOMVersion = "2024.04.00" - composeCompilerVersion = "1.5.9" composeAccompanistVersion = "0.32.0" wearComposeVersion = "1.3.1" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 64ed3e69d24..4ca95c3a025 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,8 @@ androidx-appcompat = '1.4.2' androidx-arch-core = '2.1.0' androidx-browser = '1.5.0' androidx-cardview = '1.0.0' +androidx-compose-bom = '2024.04.00' +androidx-compose-compiler = '1.5.9' androidx-constraintlayout-compose = '1.0.1' androidx-constraintlayout-main = '2.1.4' androidx-core-main = '1.13.1' @@ -75,6 +77,17 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version androidx-arch-core-testing = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidx-arch-core" } androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidx-browser" } androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidx-cardview" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx-compose-bom" } +androidx-compose-animation-main = { group = "androidx.compose.animation", name = "animation" } +androidx-compose-material-main = { group = "androidx.compose.material", name = "material" } +androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } +androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } +androidx-compose-ui-main = { group = "androidx.compose.ui", name = "ui" } +androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-compose-ui-text-google-fonts = { group = "androidx.compose.ui", name = "ui-text-google-fonts" } +androidx-compose-ui-tooling-main = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "androidx-constraintlayout-compose" } androidx-constraintlayout-main = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout-main" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-main" } From 0ee51cc515e115b3c11ca6bfa3c5d491c56b4e49 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 18:04:15 +0300 Subject: [PATCH 63/86] Deps: Migrate coil to version catalogs on woocommerce --- WooCommerce/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 0173bf904a3..e4f8d4a7502 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -450,8 +450,8 @@ dependencies { implementation(libs.androidx.hilt.navigation.compose) implementation(libs.androidx.constraintlayout.compose) implementation(libs.androidx.lifecycle.viewmodel.compose) - implementation "io.coil-kt:coil-compose:$coilVersion" - implementation "io.coil-kt:coil-svg:$coilVersion" + implementation(libs.coil.compose) + implementation(libs.coil.svg) androidTestImplementation(libs.androidx.compose.ui.test.junit4) debugImplementation(libs.androidx.compose.ui.test.manifest) diff --git a/build.gradle b/build.gradle index c147d7e18bc..50c79d25eca 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,6 @@ tasks.register("installGitHooks", Copy) { } ext { - coilVersion = '2.1.0' constraintLayoutVersion = '1.2.0' eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4ca95c3a025..2f4772d109d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,6 +31,7 @@ automattic-tracks = '5.0.0' assertj = '3.24.1' bumptech-glide = '4.16.0' cashapp-turbine = '1.0.0' +coil = '2.1.0' commons-fileupload = '1.5' commons-io = '2.11.0' facebook-flipper = '0.176.1' @@ -128,6 +129,8 @@ bumptech-glide-main = { group = "com.github.bumptech.glide", name = "glide", ver bumptech-glide-compiler = { group = "com.github.bumptech.glide", name = "compiler", version.ref = "bumptech-glide" } bumptech-glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref = "bumptech-glide" } cashapp-turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "cashapp-turbine" } +coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } +coil-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" } commons-fileupload = { group = "commons-fileupload", name = "commons-fileupload", version.ref = "commons-fileupload" } commons-io = { group = "commons-io", name = "commons-io", version.ref = "commons-io" } facebook-flipper-main = { group = "com.facebook.flipper", name = "flipper", version.ref = "facebook-flipper" } From bb3a1f67a642c93134c37569393b5ce3ee655eaf Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 18:05:49 +0300 Subject: [PATCH 64/86] Deps: Migrate android desugar to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index e4f8d4a7502..37a7e0f27a0 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -456,7 +456,7 @@ dependencies { androidTestImplementation(libs.androidx.compose.ui.test.junit4) debugImplementation(libs.androidx.compose.ui.test.manifest) - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' + coreLibraryDesugaring(libs.android.desugar) // CameraX implementation "androidx.camera:camera-camera2:$androidxCameraVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2f4772d109d..9669c8b9f7c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] android-billingclient = '5.0.0' +android-desugar = '2.0.4' androidx-activity = '1.8.0' androidx-appcompat = '1.4.2' androidx-arch-core = '2.1.0' @@ -72,6 +73,7 @@ zendesk = '5.0.8' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } +android-desugar = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "android-desugar" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose" } androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx-activity" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } From fff1ef82571324b653f249ecab2a1972b4bd7e53 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 18:07:58 +0300 Subject: [PATCH 65/86] Deps: Migrate androidx camera to version catalogs on woocommerce --- WooCommerce/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 37a7e0f27a0..433e9a1ad45 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -459,9 +459,9 @@ dependencies { coreLibraryDesugaring(libs.android.desugar) // CameraX - implementation "androidx.camera:camera-camera2:$androidxCameraVersion" - implementation "androidx.camera:camera-lifecycle:$androidxCameraVersion" - implementation "androidx.camera:camera-view:$androidxCameraVersion" + implementation(libs.androidx.camera.camera2) + implementation(libs.androidx.camera.lifecycle) + implementation(libs.androidx.camera.view) implementation "com.google.guava:guava:$guavaVersion" diff --git a/build.gradle b/build.gradle index 50c79d25eca..6b398accc77 100644 --- a/build.gradle +++ b/build.gradle @@ -103,7 +103,6 @@ ext { constraintLayoutVersion = '1.2.0' eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' - androidxCameraVersion = '1.2.3' guavaVersion = '33.1.0-android' protobufVersion = '3.25.3' wearHorologistVersion = '0.6.10' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9669c8b9f7c..70dee8abf66 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ androidx-activity = '1.8.0' androidx-appcompat = '1.4.2' androidx-arch-core = '2.1.0' androidx-browser = '1.5.0' +androidx-camera = '1.2.3' androidx-cardview = '1.0.0' androidx-compose-bom = '2024.04.00' androidx-compose-compiler = '1.5.9' @@ -79,6 +80,9 @@ androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", ve androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } androidx-arch-core-testing = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidx-arch-core" } androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidx-browser" } +androidx-camera-camera2 = { group = "androidx.camera", name = "camera-camera2", version.ref = "androidx-camera" } +androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref = "androidx-camera" } +androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref = "androidx-camera" } androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidx-cardview" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-animation-main = { group = "androidx.compose.animation", name = "animation" } From 033983c47c36ae42047d9b88cae215d95a90898d Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 18:18:22 +0300 Subject: [PATCH 66/86] Deps: Migrate google guava to version catalogs on woocommerce --- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 433e9a1ad45..c9931e51dab 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -463,7 +463,7 @@ dependencies { implementation(libs.androidx.camera.lifecycle) implementation(libs.androidx.camera.view) - implementation "com.google.guava:guava:$guavaVersion" + implementation(libs.google.guava) implementation "com.google.protobuf:protobuf-javalite:$protobufVersion" diff --git a/build.gradle b/build.gradle index 6b398accc77..642d3bb1669 100644 --- a/build.gradle +++ b/build.gradle @@ -103,7 +103,6 @@ ext { constraintLayoutVersion = '1.2.0' eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' - guavaVersion = '33.1.0-android' protobufVersion = '3.25.3' wearHorologistVersion = '0.6.10' securityLintVersion = '1.0.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 70dee8abf66..2b2c2e23372 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,6 +41,7 @@ facebook-shimmer = '0.5.0' facebook-soloader = '0.10.4' fastlane-screengrab = '2.1.1' google-firebase-bom = '32.7.1' +google-guava = '33.1.0-android' google-material = '1.12.0' google-mlkit-barcode-scanning = '17.2.0' google-mlkit-text-recognition = '16.0.0' @@ -148,6 +149,7 @@ google-firebase-analytics = { group = "com.google.firebase", name = "firebase-an google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } google-firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging" } +google-guava = { group = "com.google.guava", name = "guava", version.ref = "google-guava" } google-material = { group = "com.google.android.material", name = "material", version.ref = "google-material" } google-mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref = "google-mlkit-barcode-scanning" } google-mlkit-text-recognition-main = { group = "com.google.mlkit", name = "text-recognition", version.ref = "google-mlkit-text-recognition" } From cb1d91e38a28df36a8d5bd2fa1887d998f935539 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 18:23:12 +0300 Subject: [PATCH 67/86] Deps: Migrate android security lint to version catalogs on all modules --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 221ba8d5ba8..7c6b011d50b 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -215,7 +215,7 @@ dependencies { // See https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/919 exclude group: 'com.squareup.okhttp3' } - lintChecks "com.android.security.lint:lint:$securityLintVersion" + lintChecks(libs.android.security.lint) } def checkGradlePropertiesFile() { diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index c9931e51dab..ddf3a34d2cb 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -467,7 +467,7 @@ dependencies { implementation "com.google.protobuf:protobuf-javalite:$protobufVersion" - lintChecks "com.android.security.lint:lint:$securityLintVersion" + lintChecks(libs.android.security.lint) } protobuf { diff --git a/build.gradle b/build.gradle index 642d3bb1669..a9164524f35 100644 --- a/build.gradle +++ b/build.gradle @@ -105,7 +105,6 @@ ext { googlePlayCoreVersion = '1.10.3' protobufVersion = '3.25.3' wearHorologistVersion = '0.6.10' - securityLintVersion = '1.0.1' // Compose and its module versions need to be consistent with each other (for example 'compose-theme-adapter') composeAccompanistVersion = "0.32.0" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2b2c2e23372..30a45c703ee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] android-billingclient = '5.0.0' android-desugar = '2.0.4' +android-security-lint = '1.0.1' androidx-activity = '1.8.0' androidx-appcompat = '1.4.2' androidx-arch-core = '2.1.0' @@ -76,6 +77,7 @@ zendesk = '5.0.8' [libraries] android-billingclient-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "android-billingclient" } android-desugar = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "android-desugar" } +android-security-lint = { group = "com.android.security.lint", name = "lint", version.ref = "android-security-lint" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose" } androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx-activity" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } From c27691161b777412240b6afb86a614072a472dc1 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 18:36:57 +0300 Subject: [PATCH 68/86] Deps: Migrate androidx wear to version catalogs on woocommerce wear FYI: The 'androidx-wear-tiles' dependencies have no associated 'androidx-wear-tiles' version on them as it seems that they are not to be taking any version from anywhere. --- WooCommerce-Wear/build.gradle | 12 ++++++------ build.gradle | 1 - gradle/libs.versions.toml | 9 +++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 7c6b011d50b..86a3bc2bc91 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -144,15 +144,15 @@ dependencies { // WearOS implementation(libs.google.play.services.wearable) - implementation 'androidx.wear.tiles:tiles' - implementation 'androidx.wear.tiles:tiles-material' + implementation(libs.androidx.wear.tiles.main) + implementation(libs.androidx.wear.tiles.material) implementation "com.google.android.horologist:horologist-compose-tools:$wearHorologistVersion" implementation "com.google.android.horologist:horologist-tiles:$wearHorologistVersion" implementation "com.google.android.horologist:horologist-compose-layout:$wearHorologistVersion" - implementation 'androidx.wear.watchface:watchface-complications-data-source-ktx:1.2.1' - implementation "androidx.wear.compose:compose-material:$wearComposeVersion" - implementation "androidx.wear.compose:compose-foundation:$wearComposeVersion" - implementation 'androidx.wear:wear-tooling-preview:1.0.0' + implementation(libs.androidx.wear.watchface.complications.data.source.ktx) + implementation(libs.androidx.wear.compose.material) + implementation(libs.androidx.wear.compose.foundation) + implementation(libs.androidx.wear.tooling.preview) // Compose implementation(platform(libs.androidx.compose.bom)) diff --git a/build.gradle b/build.gradle index a9164524f35..c4aaa6fc06e 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,6 @@ ext { // Compose and its module versions need to be consistent with each other (for example 'compose-theme-adapter') composeAccompanistVersion = "0.32.0" - wearComposeVersion = "1.3.1" } // Onboarding and dev env setup tasks diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 30a45c703ee..4067f8437ff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,6 +26,9 @@ androidx-test-ext = '1.1.5' androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' androidx-transition = '1.5.1' +androidx-wear-compose = '1.3.1' +androidx-wear-tooling = '1.0.0' +androidx-wear-watchface = '1.2.1' androidx-work = '2.7.1' apache-commons-text = '1.10.0' apache-http-client-android = '4.3.5.1' @@ -126,6 +129,12 @@ androidx-test-main-rules = { group = "androidx.test", name = "rules", version.re androidx-test-main-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-main" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidx-test-uiautomator" } androidx-transition = { group = "androidx.transition", name = "transition", version.ref = "androidx-transition" } +androidx-wear-compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "androidx-wear-compose" } +androidx-wear-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "androidx-wear-compose" } +androidx-wear-tiles-main = { group = "androidx.wear.tiles", name = "tiles" } +androidx-wear-tiles-material = { group = "androidx.wear.tiles", name = "tiles-material" } +androidx-wear-tooling-preview = { group = "androidx.wear", name = "wear-tooling-preview", version.ref = "androidx-wear-tooling" } +androidx-wear-watchface-complications-data-source-ktx = { group = "androidx.wear.watchface", name = "watchface-complications-data-source-ktx", version.ref = "androidx-wear-watchface" } androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" } apache-commons-text = { group = "org.apache.commons", name = "commons-text", version.ref = "apache-commons-text" } apache-http-client-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref = "apache-http-client-android" } From 4b31eefe716db98357579fa73a79298106ed4508 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 18:44:49 +0300 Subject: [PATCH 69/86] Deps: Migrate google horologist to version catalogs on woocommerce wear --- WooCommerce-Wear/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 86a3bc2bc91..3076729a51c 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -146,9 +146,9 @@ dependencies { implementation(libs.google.play.services.wearable) implementation(libs.androidx.wear.tiles.main) implementation(libs.androidx.wear.tiles.material) - implementation "com.google.android.horologist:horologist-compose-tools:$wearHorologistVersion" - implementation "com.google.android.horologist:horologist-tiles:$wearHorologistVersion" - implementation "com.google.android.horologist:horologist-compose-layout:$wearHorologistVersion" + implementation(libs.google.horologist.compose.tools) + implementation(libs.google.horologist.tiles) + implementation(libs.google.horologist.compose.layout) implementation(libs.androidx.wear.watchface.complications.data.source.ktx) implementation(libs.androidx.wear.compose.material) implementation(libs.androidx.wear.compose.foundation) diff --git a/build.gradle b/build.gradle index c4aaa6fc06e..256e7568b0b 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,6 @@ ext { eventBusVersion = '3.3.1' googlePlayCoreVersion = '1.10.3' protobufVersion = '3.25.3' - wearHorologistVersion = '0.6.10' // Compose and its module versions need to be consistent with each other (for example 'compose-theme-adapter') composeAccompanistVersion = "0.32.0" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4067f8437ff..b341667f51a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -46,6 +46,7 @@ facebook-soloader = '0.10.4' fastlane-screengrab = '2.1.1' google-firebase-bom = '32.7.1' google-guava = '33.1.0-android' +google-horologist = '0.6.10' google-material = '1.12.0' google-mlkit-barcode-scanning = '17.2.0' google-mlkit-text-recognition = '16.0.0' @@ -161,6 +162,9 @@ google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", ve google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } google-firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging" } google-guava = { group = "com.google.guava", name = "guava", version.ref = "google-guava" } +google-horologist-compose-layout = { group = "com.google.android.horologist", name = "horologist-compose-layout", version.ref = "google-horologist" } +google-horologist-compose-tools = { group = "com.google.android.horologist", name = "horologist-compose-tools", version.ref = "google-horologist" } +google-horologist-tiles = { group = "com.google.android.horologist", name = "horologist-tiles", version.ref = "google-horologist" } google-material = { group = "com.google.android.material", name = "material", version.ref = "google-material" } google-mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref = "google-mlkit-barcode-scanning" } google-mlkit-text-recognition-main = { group = "com.google.mlkit", name = "text-recognition", version.ref = "google-mlkit-text-recognition" } From eff7cde9ce79877b0921c4b8115b42493b9eca83 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 18:47:45 +0300 Subject: [PATCH 70/86] Deps: Migrate google gson to version catalogs on woocommerce wear --- WooCommerce-Wear/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 3076729a51c..4612f216764 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -175,7 +175,7 @@ dependencies { implementation(libs.androidx.preference.ktx) implementation(libs.androidx.datastore.preferences) implementation(libs.androidx.datastore.main) - implementation 'com.google.code.gson:gson:2.10.1' + implementation(libs.google.gson) // Coroutines implementation(libs.kotlinx.coroutines.core) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b341667f51a..1881b62f2a1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -45,6 +45,7 @@ facebook-shimmer = '0.5.0' facebook-soloader = '0.10.4' fastlane-screengrab = '2.1.1' google-firebase-bom = '32.7.1' +google-gson = '2.10.1' google-guava = '33.1.0-android' google-horologist = '0.6.10' google-material = '1.12.0' @@ -161,6 +162,7 @@ google-firebase-analytics = { group = "com.google.firebase", name = "firebase-an google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } google-firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging" } +google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "google-gson" } google-guava = { group = "com.google.guava", name = "guava", version.ref = "google-guava" } google-horologist-compose-layout = { group = "com.google.android.horologist", name = "horologist-compose-layout", version.ref = "google-horologist" } google-horologist-compose-tools = { group = "com.google.android.horologist", name = "horologist-compose-tools", version.ref = "google-horologist" } From 3080940330fa18e183ae69ae716c15b4dbefd770 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 18:48:01 +0300 Subject: [PATCH 71/86] Cleanup: Remove unused dependency versions from root build gradle file --- build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build.gradle b/build.gradle index 256e7568b0b..55820a0d657 100644 --- a/build.gradle +++ b/build.gradle @@ -100,13 +100,7 @@ tasks.register("installGitHooks", Copy) { } ext { - constraintLayoutVersion = '1.2.0' - eventBusVersion = '3.3.1' - googlePlayCoreVersion = '1.10.3' protobufVersion = '3.25.3' - - // Compose and its module versions need to be consistent with each other (for example 'compose-theme-adapter') - composeAccompanistVersion = "0.32.0" } // Onboarding and dev env setup tasks From 03fee7550c1ed2751171f2f750496045331950cb Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 19:19:45 +0300 Subject: [PATCH 72/86] Deps: Migrate agp plugin to version catalogs --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- build.gradle | 4 +++- gradle/libs.versions.toml | 6 ++++++ libs/cardreader/build.gradle | 2 +- libs/commons/build.gradle | 2 +- libs/iap/build.gradle | 2 +- quicklogin/build.gradle | 2 +- settings.gradle | 3 --- 9 files changed, 15 insertions(+), 10 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 4612f216764..8f961e9b789 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -1,7 +1,7 @@ import io.sentry.android.gradle.extensions.InstrumentationFeature plugins { - id 'com.android.application' + alias(libs.plugins.android.application) id 'org.jetbrains.kotlin.android' id 'org.jetbrains.kotlin.plugin.parcelize' id 'com.google.dagger.hilt.android' diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index ddf3a34d2cb..b2f93216042 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -1,7 +1,7 @@ import io.sentry.android.gradle.extensions.InstrumentationFeature plugins { - id 'com.android.application' + alias(libs.plugins.android.application) id 'org.jetbrains.kotlin.android' id 'org.jetbrains.kotlin.plugin.parcelize' id 'com.google.dagger.hilt.android' diff --git a/build.gradle b/build.gradle index 55820a0d657..216f1981107 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,9 @@ plugins { id 'io.gitlab.arturbosch.detekt' id 'com.automattic.android.measure-builds' id "com.autonomousapps.dependency-analysis" - id 'com.android.application' apply false + alias(libs.plugins.android.application).apply(false) + alias(libs.plugins.android.library).apply(false) + alias(libs.plugins.android.test).apply(false) id 'org.jetbrains.kotlin.android' apply false id 'com.google.dagger.hilt.android' apply false id 'androidx.navigation.safeargs.kotlin' apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1881b62f2a1..842948479ff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,5 @@ [versions] +agp = '8.5.1' android-billingclient = '5.0.0' android-desugar = '2.0.4' android-security-lint = '1.0.1' @@ -202,3 +203,8 @@ wordpress-aztec-main = { group = "org.wordpress", name = "aztec", version.ref = wordpress-aztec-glide-loader = { group = "org.wordpress.aztec", name = "glide-loader", version.ref = "wordpress-aztec" } wordpress-utils = { group = "org.wordpress", name = "utils", version.ref = "wordpress-utils" } zendesk-support = { group = "com.zendesk", name = "support", version.ref = "zendesk" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } +android-test = { id = "com.android.test", version.ref = "agp" } diff --git a/libs/cardreader/build.gradle b/libs/cardreader/build.gradle index 56d00f6cec5..1a99bdea1ff 100644 --- a/libs/cardreader/build.gradle +++ b/libs/cardreader/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.android.library' + alias(libs.plugins.android.library) id 'org.jetbrains.kotlin.android' id 'org.jetbrains.kotlin.plugin.parcelize' } diff --git a/libs/commons/build.gradle b/libs/commons/build.gradle index b52e2241fd6..163cd0e9d31 100644 --- a/libs/commons/build.gradle +++ b/libs/commons/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.android.library' + alias(libs.plugins.android.library) id 'org.jetbrains.kotlin.android' } diff --git a/libs/iap/build.gradle b/libs/iap/build.gradle index 6f24abc5dfb..dafe75e7fa0 100644 --- a/libs/iap/build.gradle +++ b/libs/iap/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.android.library' + alias(libs.plugins.android.library) id 'org.jetbrains.kotlin.android' } diff --git a/quicklogin/build.gradle b/quicklogin/build.gradle index 9c87d9faad6..b44264121de 100644 --- a/quicklogin/build.gradle +++ b/quicklogin/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.android.test' + alias(libs.plugins.android.test) id 'org.jetbrains.kotlin.android' } diff --git a/settings.gradle b/settings.gradle index 0e819471080..e9f34b292a6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.agpVersion = '8.5.1' gradle.ext.googleServicesVersion = '4.4.0' gradle.ext.daggerVersion = '2.50' gradle.ext.detektVersion = '1.23.5' @@ -30,8 +29,6 @@ pluginManagement { plugins { id 'androidx.navigation.safeargs.kotlin' version gradle.ext.navigationVersion - id 'com.android.application' version gradle.ext.agpVersion - id 'com.android.library' version gradle.ext.agpVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion id 'io.gitlab.arturbosch.detekt' version gradle.ext.detektVersion From 64d34641f92358868330d7545ed8278bf72778c1 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 19:33:33 +0300 Subject: [PATCH 73/86] Deps: Migrate google services plugin to version catalogs --- WooCommerce/build.gradle | 2 +- build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ settings.gradle | 2 -- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index b2f93216042..be10a3b0244 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -7,7 +7,7 @@ plugins { id 'com.google.dagger.hilt.android' id 'io.sentry.android.gradle' id 'androidx.navigation.safeargs.kotlin' - id 'com.google.gms.google-services' + alias(libs.plugins.google.services) id 'com.google.devtools.ksp' id "com.google.protobuf" id "com.osacky.fladle" diff --git a/build.gradle b/build.gradle index 216f1981107..8006912729c 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { id 'org.jetbrains.kotlin.android' apply false id 'com.google.dagger.hilt.android' apply false id 'androidx.navigation.safeargs.kotlin' apply false - id 'com.google.gms.google-services' apply false + alias(libs.plugins.google.services).apply(false) id 'com.google.devtools.ksp' apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 842948479ff..a054dc0440c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -57,6 +57,7 @@ google-play-review = '2.0.1' google-play-services-auth = '20.2.0' google-play-services-code-scanner = '16.1.0' google-play-services-wearable = '18.1.0' +google-services = '4.4.0' google-zxing = '3.5.3' gravatar = '0.2.0' jackson-databind = '2.12.7.1' @@ -208,3 +209,4 @@ zendesk-support = { group = "com.zendesk", name = "support", version.ref = "zend android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } android-test = { id = "com.android.test", version.ref = "agp" } +google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } diff --git a/settings.gradle b/settings.gradle index e9f34b292a6..b9f5883a600 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.googleServicesVersion = '4.4.0' gradle.ext.daggerVersion = '2.50' gradle.ext.detektVersion = '1.23.5' gradle.ext.kotlinVersion = '1.9.22' @@ -30,7 +29,6 @@ pluginManagement { plugins { id 'androidx.navigation.safeargs.kotlin' version gradle.ext.navigationVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion - id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion id 'io.gitlab.arturbosch.detekt' version gradle.ext.detektVersion id 'io.sentry.android.gradle' version gradle.ext.sentryVersion id 'org.jetbrains.kotlin.android' version gradle.ext.kotlinVersion From 62b500c05634caab92d45c30132bdca89e721454 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 19:55:51 +0300 Subject: [PATCH 74/86] Deps: Migrate google dagger plugin to version catalogs --- WooCommerce-Wear/build.gradle | 10 +++++----- WooCommerce/build.gradle | 14 +++++++------- build.gradle | 2 +- gradle/libs.versions.toml | 8 ++++++++ settings.gradle | 2 -- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 8f961e9b789..e7446ac4a97 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -4,7 +4,7 @@ plugins { alias(libs.plugins.android.application) id 'org.jetbrains.kotlin.android' id 'org.jetbrains.kotlin.plugin.parcelize' - id 'com.google.dagger.hilt.android' + alias(libs.plugins.google.dagger.hilt) id 'com.google.devtools.ksp' id 'io.sentry.android.gradle' } @@ -184,15 +184,15 @@ dependencies { testImplementation(libs.kotlinx.coroutines.test) // Dagger & Hilt - implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion" + implementation(libs.google.dagger.hilt.android.main) implementation(libs.androidx.hilt.navigation.fragment) implementation(libs.androidx.hilt.common) implementation(libs.androidx.hilt.work) implementation(libs.androidx.hilt.navigation.compose) ksp(libs.androidx.hilt.compiler) - ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion" - implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion" - ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion" + ksp(libs.google.dagger.hilt.compiler) + implementation(libs.google.dagger.android.support) + ksp(libs.google.dagger.android.processor) // Testing testImplementation(libs.junit) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index be10a3b0244..3e696399b76 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -4,7 +4,7 @@ plugins { alias(libs.plugins.android.application) id 'org.jetbrains.kotlin.android' id 'org.jetbrains.kotlin.plugin.parcelize' - id 'com.google.dagger.hilt.android' + alias(libs.plugins.google.dagger.hilt) id 'io.sentry.android.gradle' id 'androidx.navigation.safeargs.kotlin' alias(libs.plugins.google.services) @@ -307,15 +307,15 @@ dependencies { implementation(libs.automattic.about) // Dagger - implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion" + implementation(libs.google.dagger.hilt.android.main) implementation(libs.androidx.hilt.navigation.fragment) implementation(libs.androidx.hilt.common) implementation(libs.androidx.hilt.work) ksp(libs.androidx.hilt.compiler) - ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion" - implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion" - ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion" + ksp(libs.google.dagger.hilt.compiler) + implementation(libs.google.dagger.android.support) + ksp(libs.google.dagger.android.processor) implementation(libs.mpandroidchart) @@ -371,8 +371,8 @@ dependencies { androidTestImplementation(libs.androidx.test.espresso.contrib) { exclude group: "com.google.protobuf", module: "protobuf-lite" } - androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion" - kspAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion" + androidTestImplementation(libs.google.dagger.hilt.android.testing) + kspAndroidTest(libs.google.dagger.hilt.android.compiler) androidTestImplementation(libs.androidx.test.uiautomator) // Dependencies for screenshots diff --git a/build.gradle b/build.gradle index 8006912729c..16e3559814a 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { alias(libs.plugins.android.library).apply(false) alias(libs.plugins.android.test).apply(false) id 'org.jetbrains.kotlin.android' apply false - id 'com.google.dagger.hilt.android' apply false + alias(libs.plugins.google.dagger.hilt).apply(false) id 'androidx.navigation.safeargs.kotlin' apply false alias(libs.plugins.google.services).apply(false) id 'com.google.devtools.ksp' apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a054dc0440c..a1ae381c054 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -45,6 +45,7 @@ facebook-flipper = '0.176.1' facebook-shimmer = '0.5.0' facebook-soloader = '0.10.4' fastlane-screengrab = '2.1.1' +google-dagger = "2.50" google-firebase-bom = '32.7.1' google-gson = '2.10.1' google-guava = '33.1.0-android' @@ -160,6 +161,12 @@ facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flip facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref = "facebook-shimmer" } facebook-soloader = { group = "com.facebook.soloader", name = "soloader", version.ref = "facebook-soloader" } fastlane-screengrab = { group = "tools.fastlane", name = "screengrab", version.ref = "fastlane-screengrab" } +google-dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "google-dagger" } +google-dagger-android-support = { group = "com.google.dagger", name = "dagger-android-support", version.ref = "google-dagger" } +google-dagger-hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "google-dagger" } +google-dagger-hilt-android-main = { group = "com.google.dagger", name = "hilt-android", version.ref = "google-dagger" } +google-dagger-hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "google-dagger" } +google-dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "google-dagger" } google-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "google-firebase-bom" } google-firebase-config = { group = "com.google.firebase", name = "firebase-config" } @@ -209,4 +216,5 @@ zendesk-support = { group = "com.zendesk", name = "support", version.ref = "zend android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } android-test = { id = "com.android.test", version.ref = "agp" } +google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "google-dagger" } google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } diff --git a/settings.gradle b/settings.gradle index b9f5883a600..3c4562ca379 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.daggerVersion = '2.50' gradle.ext.detektVersion = '1.23.5' gradle.ext.kotlinVersion = '1.9.22' gradle.ext.kspVersion = '1.9.22-1.0.17' @@ -34,7 +33,6 @@ pluginManagement { id 'org.jetbrains.kotlin.android' version gradle.ext.kotlinVersion id 'org.jetbrains.kotlin.jvm' version gradle.ext.kotlinVersion id 'org.jetbrains.kotlin.plugin.parcelize' version gradle.ext.kotlinVersion - id 'com.google.dagger.hilt.android' version gradle.ext.daggerVersion id 'com.google.devtools.ksp' version gradle.ext.kspVersion id "com.google.protobuf" version gradle.ext.protobufVersion id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion From 64ebe6ebf0405f92528320d181c25a6a86f2e10b Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 19:59:59 +0300 Subject: [PATCH 75/86] Deps: Migrate detekt plugin to version catalogs --- build.gradle | 6 +++--- gradle/libs.versions.toml | 3 +++ settings.gradle | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 16e3559814a..37e62e4d29f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'io.gitlab.arturbosch.detekt' + alias(libs.plugins.detekt) id 'com.automattic.android.measure-builds' id "com.autonomousapps.dependency-analysis" alias(libs.plugins.android.application).apply(false) @@ -24,7 +24,7 @@ measureBuilds { } allprojects { - apply plugin: 'io.gitlab.arturbosch.detekt' + apply plugin: libs.plugins.detekt.get().pluginId repositories { google() @@ -83,7 +83,7 @@ detektAll.configure { } dependencies { - detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:$gradle.ext.detektVersion" + detektPlugins(libs.detekt.formatting) } task clean(type: Delete) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a1ae381c054..66dc50837f4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,6 +41,7 @@ cashapp-turbine = '1.0.0' coil = '2.1.0' commons-fileupload = '1.5' commons-io = '2.11.0' +detekt = '1.23.5' facebook-flipper = '0.176.1' facebook-shimmer = '0.5.0' facebook-soloader = '0.10.4' @@ -156,6 +157,7 @@ coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coi coil-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" } commons-fileupload = { group = "commons-fileupload", name = "commons-fileupload", version.ref = "commons-fileupload" } commons-io = { group = "commons-io", name = "commons-io", version.ref = "commons-io" } +detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" } facebook-flipper-main = { group = "com.facebook.flipper", name = "flipper", version.ref = "facebook-flipper" } facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref = "facebook-flipper" } facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref = "facebook-shimmer" } @@ -216,5 +218,6 @@ zendesk-support = { group = "com.zendesk", name = "support", version.ref = "zend android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } android-test = { id = "com.android.test", version.ref = "agp" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "google-dagger" } google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } diff --git a/settings.gradle b/settings.gradle index 3c4562ca379..8c67e853b2a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.detektVersion = '1.23.5' gradle.ext.kotlinVersion = '1.9.22' gradle.ext.kspVersion = '1.9.22-1.0.17' gradle.ext.measureBuildsVersion = '2.1.2' @@ -28,7 +27,6 @@ pluginManagement { plugins { id 'androidx.navigation.safeargs.kotlin' version gradle.ext.navigationVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion - id 'io.gitlab.arturbosch.detekt' version gradle.ext.detektVersion id 'io.sentry.android.gradle' version gradle.ext.sentryVersion id 'org.jetbrains.kotlin.android' version gradle.ext.kotlinVersion id 'org.jetbrains.kotlin.jvm' version gradle.ext.kotlinVersion From 73e832f724c4aeb94e7e587c2f0196a7075008ee Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 20:12:42 +0300 Subject: [PATCH 76/86] Deps: Migrate kotlin plugin to version catalogs FYI: The 'org.jetbrains.kotlin.jvm' plugin got completely removed as it is not being used anywhere. --- WooCommerce-Wear/build.gradle | 6 +++--- WooCommerce/build.gradle | 6 +++--- build.gradle | 3 ++- gradle/libs.versions.toml | 4 ++++ libs/cardreader/build.gradle | 6 +++--- libs/commons/build.gradle | 2 +- libs/iap/build.gradle | 4 ++-- quicklogin/build.gradle | 2 +- settings.gradle | 4 ---- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index e7446ac4a97..6426fc277fa 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -2,8 +2,8 @@ import io.sentry.android.gradle.extensions.InstrumentationFeature plugins { alias(libs.plugins.android.application) - id 'org.jetbrains.kotlin.android' - id 'org.jetbrains.kotlin.plugin.parcelize' + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.google.dagger.hilt) id 'com.google.devtools.ksp' id 'io.sentry.android.gradle' @@ -198,7 +198,7 @@ dependencies { testImplementation(libs.junit) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) - testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" + testImplementation(libs.kotlin.test.junit) testImplementation(libs.assertj.core) testImplementation(libs.androidx.arch.core.testing) { exclude group: 'com.android.support', module: 'support-compat' diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 3e696399b76..3ea2012f9be 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -2,8 +2,8 @@ import io.sentry.android.gradle.extensions.InstrumentationFeature plugins { alias(libs.plugins.android.application) - id 'org.jetbrains.kotlin.android' - id 'org.jetbrains.kotlin.plugin.parcelize' + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.google.dagger.hilt) id 'io.sentry.android.gradle' id 'androidx.navigation.safeargs.kotlin' @@ -355,7 +355,7 @@ dependencies { testImplementation(libs.junit) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) - testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" + testImplementation(libs.kotlin.test.junit) testImplementation(libs.assertj.core) testImplementation(libs.androidx.arch.core.testing) { exclude group: 'com.android.support', module: 'support-compat' diff --git a/build.gradle b/build.gradle index 37e62e4d29f..b4104af8a0c 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,8 @@ plugins { alias(libs.plugins.android.application).apply(false) alias(libs.plugins.android.library).apply(false) alias(libs.plugins.android.test).apply(false) - id 'org.jetbrains.kotlin.android' apply false + alias(libs.plugins.kotlin.android).apply(false) + alias(libs.plugins.kotlin.parcelize).apply(false) alias(libs.plugins.google.dagger.hilt).apply(false) id 'androidx.navigation.safeargs.kotlin' apply false alias(libs.plugins.google.services).apply(false) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 66dc50837f4..cfd06eeb5ac 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -66,6 +66,7 @@ jackson-databind = '2.12.7.1' jetty-webapp = '9.4.51.v20230217' json-path = '2.9.0' junit = '4.13.2' +kotlin = '1.9.22' kotlinx-coroutines = '1.8.1' mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' @@ -195,6 +196,7 @@ jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-datab jetty-webapp = { group = "org.eclipse.jetty", name = "jetty-webapp", version.ref = "jetty-webapp" } json-path = { group = "com.jayway.jsonpath", name = "json-path", version.ref = "json-path" } junit = { group = "junit", name = "junit", version.ref = "junit" } +kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" } @@ -221,3 +223,5 @@ android-test = { id = "com.android.test", version.ref = "agp" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "google-dagger" } google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } diff --git a/libs/cardreader/build.gradle b/libs/cardreader/build.gradle index 1a99bdea1ff..6a1203bf7e9 100644 --- a/libs/cardreader/build.gradle +++ b/libs/cardreader/build.gradle @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.android.library) - id 'org.jetbrains.kotlin.android' - id 'org.jetbrains.kotlin.plugin.parcelize' + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) } android { @@ -36,7 +36,7 @@ dependencies { testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) - testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" + testImplementation(libs.kotlin.test.junit) testImplementation(libs.assertj.core) testImplementation(libs.kotlinx.coroutines.test) } diff --git a/libs/commons/build.gradle b/libs/commons/build.gradle index 163cd0e9d31..a0d38063d6a 100644 --- a/libs/commons/build.gradle +++ b/libs/commons/build.gradle @@ -1,6 +1,6 @@ plugins { alias(libs.plugins.android.library) - id 'org.jetbrains.kotlin.android' + alias(libs.plugins.kotlin.android) } android { diff --git a/libs/iap/build.gradle b/libs/iap/build.gradle index dafe75e7fa0..0fcddd4cc9c 100644 --- a/libs/iap/build.gradle +++ b/libs/iap/build.gradle @@ -1,6 +1,6 @@ plugins { alias(libs.plugins.android.library) - id 'org.jetbrains.kotlin.android' + alias(libs.plugins.kotlin.android) } android { @@ -35,7 +35,7 @@ dependencies { testImplementation(libs.junit) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) - testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" + testImplementation(libs.kotlin.test.junit) testImplementation(libs.assertj.core) testImplementation(libs.kotlinx.coroutines.test) } diff --git a/quicklogin/build.gradle b/quicklogin/build.gradle index b44264121de..c2d921eba06 100644 --- a/quicklogin/build.gradle +++ b/quicklogin/build.gradle @@ -1,6 +1,6 @@ plugins { alias(libs.plugins.android.test) - id 'org.jetbrains.kotlin.android' + alias(libs.plugins.kotlin.android) } repositories { diff --git a/settings.gradle b/settings.gradle index 8c67e853b2a..78d24c574a0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.kotlinVersion = '1.9.22' gradle.ext.kspVersion = '1.9.22-1.0.17' gradle.ext.measureBuildsVersion = '2.1.2' gradle.ext.navigationVersion = '2.7.7' @@ -28,9 +27,6 @@ pluginManagement { id 'androidx.navigation.safeargs.kotlin' version gradle.ext.navigationVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion id 'io.sentry.android.gradle' version gradle.ext.sentryVersion - id 'org.jetbrains.kotlin.android' version gradle.ext.kotlinVersion - id 'org.jetbrains.kotlin.jvm' version gradle.ext.kotlinVersion - id 'org.jetbrains.kotlin.plugin.parcelize' version gradle.ext.kotlinVersion id 'com.google.devtools.ksp' version gradle.ext.kspVersion id "com.google.protobuf" version gradle.ext.protobufVersion id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion From b89ee504cd1cf1d18c5b796d680447d6729e4714 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 20:54:04 +0300 Subject: [PATCH 77/86] Deps: Migrate ksp plugin to version catalogs --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ settings.gradle | 2 -- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 6426fc277fa..11998365123 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -5,7 +5,7 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.google.dagger.hilt) - id 'com.google.devtools.ksp' + alias(libs.plugins.ksp) id 'io.sentry.android.gradle' } diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 3ea2012f9be..e023c091e73 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -8,7 +8,7 @@ plugins { id 'io.sentry.android.gradle' id 'androidx.navigation.safeargs.kotlin' alias(libs.plugins.google.services) - id 'com.google.devtools.ksp' + alias(libs.plugins.ksp) id "com.google.protobuf" id "com.osacky.fladle" } diff --git a/build.gradle b/build.gradle index b4104af8a0c..145d4709e23 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ plugins { alias(libs.plugins.google.dagger.hilt).apply(false) id 'androidx.navigation.safeargs.kotlin' apply false alias(libs.plugins.google.services).apply(false) - id 'com.google.devtools.ksp' apply false + alias(libs.plugins.ksp).apply(false) } measureBuilds { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cfd06eeb5ac..de6bd68e899 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -68,6 +68,7 @@ json-path = '2.9.0' junit = '4.13.2' kotlin = '1.9.22' kotlinx-coroutines = '1.8.1' +ksp = '1.9.22-1.0.17' mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' mpandroidchart = 'v3.1.0' @@ -225,3 +226,4 @@ google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "goo google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } diff --git a/settings.gradle b/settings.gradle index 78d24c574a0..aff5e661b25 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.kspVersion = '1.9.22-1.0.17' gradle.ext.measureBuildsVersion = '2.1.2' gradle.ext.navigationVersion = '2.7.7' gradle.ext.sentryVersion = '4.10.0' @@ -27,7 +26,6 @@ pluginManagement { id 'androidx.navigation.safeargs.kotlin' version gradle.ext.navigationVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion id 'io.sentry.android.gradle' version gradle.ext.sentryVersion - id 'com.google.devtools.ksp' version gradle.ext.kspVersion id "com.google.protobuf" version gradle.ext.protobufVersion id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion id "com.osacky.fladle" version gradle.ext.fladleVersion From 48db59bb0cb7f9df08f5e4ad0b9e33b2a19ec528 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 20:56:12 +0300 Subject: [PATCH 78/86] Deps: Migrate automattic measure builds plugin to version catalogs --- build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ settings.gradle | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 145d4709e23..e569dc38b9b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { alias(libs.plugins.detekt) - id 'com.automattic.android.measure-builds' + alias(libs.plugins.automattic.measure.builds) id "com.autonomousapps.dependency-analysis" alias(libs.plugins.android.application).apply(false) alias(libs.plugins.android.library).apply(false) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index de6bd68e899..79757e9ffb0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,6 +34,7 @@ androidx-work = '2.7.1' apache-commons-text = '1.10.0' apache-http-client-android = '4.3.5.1' automattic-about = '0.0.6' +automattic-measure-builds = '2.1.2' automattic-tracks = '5.0.0' assertj = '3.24.1' bumptech-glide = '4.16.0' @@ -221,6 +222,7 @@ zendesk-support = { group = "com.zendesk", name = "support", version.ref = "zend android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } android-test = { id = "com.android.test", version.ref = "agp" } +automattic-measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "automattic-measure-builds" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "google-dagger" } google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } diff --git a/settings.gradle b/settings.gradle index aff5e661b25..78364b95535 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.measureBuildsVersion = '2.1.2' gradle.ext.navigationVersion = '2.7.7' gradle.ext.sentryVersion = '4.10.0' gradle.ext.protobufVersion = '0.9.4' @@ -24,7 +23,6 @@ pluginManagement { plugins { id 'androidx.navigation.safeargs.kotlin' version gradle.ext.navigationVersion - id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion id 'io.sentry.android.gradle' version gradle.ext.sentryVersion id "com.google.protobuf" version gradle.ext.protobufVersion id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion From 5f790e890f9e76ea004a8fe7be305d1b424dc062 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 21:05:55 +0300 Subject: [PATCH 79/86] Deps: Migrate androidx navigation plugin to version catalogs FYI: The 'androidx-navigation-compose' dependency on the 'WooCommerce' module had no associated version on it, and was most probably taking this version from 'androidx-compose-bom' instead. However, the same dependency on the 'WooCommerce-Wear' module did have one. This change, applies the same version on the 'WooCommerce' module to keep things consistent. --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 12 ++++++------ build.gradle | 2 +- gradle/libs.versions.toml | 7 +++++++ settings.gradle | 2 -- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 11998365123..26de70a3113 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -170,7 +170,7 @@ dependencies { implementation(libs.androidx.lifecycle.viewmodel.savedstate) implementation(libs.androidx.lifecycle.livedata.ktx) implementation(libs.androidx.core.splashscreen) - implementation "androidx.navigation:navigation-compose:2.7.7" + implementation(libs.androidx.navigation.compose) implementation(libs.androidx.activity.compose) implementation(libs.androidx.preference.ktx) implementation(libs.androidx.datastore.preferences) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index e023c091e73..9392a8c342b 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -6,7 +6,7 @@ plugins { alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.google.dagger.hilt) id 'io.sentry.android.gradle' - id 'androidx.navigation.safeargs.kotlin' + alias(libs.plugins.androidx.navigation.safeargs) alias(libs.plugins.google.services) alias(libs.plugins.ksp) id "com.google.protobuf" @@ -249,10 +249,10 @@ dependencies { implementation(libs.androidx.datastore.preferences) implementation(libs.androidx.datastore.main) - implementation "androidx.navigation:navigation-common:$gradle.ext.navigationVersion" - implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion" - implementation "androidx.navigation:navigation-runtime:$gradle.ext.navigationVersion" - implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion" + implementation(libs.androidx.navigation.common) + implementation(libs.androidx.navigation.fragment) + implementation(libs.androidx.navigation.runtime) + implementation(libs.androidx.navigation.ui) implementation(libs.androidx.work.runtime.ktx) @@ -445,7 +445,7 @@ dependencies { implementation(libs.androidx.compose.runtime.livedata) implementation(libs.androidx.compose.material.icons.extended) implementation(libs.androidx.compose.ui.text.google.fonts) - implementation 'androidx.navigation:navigation-compose' + implementation(libs.androidx.navigation.compose) implementation(libs.androidx.hilt.navigation.compose) implementation(libs.androidx.constraintlayout.compose) diff --git a/build.gradle b/build.gradle index e569dc38b9b..8870f536d37 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { alias(libs.plugins.kotlin.android).apply(false) alias(libs.plugins.kotlin.parcelize).apply(false) alias(libs.plugins.google.dagger.hilt).apply(false) - id 'androidx.navigation.safeargs.kotlin' apply false + alias(libs.plugins.androidx.navigation.safeargs).apply(false) alias(libs.plugins.google.services).apply(false) alias(libs.plugins.ksp).apply(false) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 79757e9ffb0..b37fc43b498 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,6 +19,7 @@ androidx-datastore = '1.1.0' androidx-fragment = '1.8.2' androidx-hilt = '1.1.0' androidx-lifecycle = '2.7.0' +androidx-navigation = '2.7.7' androidx-preference = '1.2.1' androidx-recyclerview-main = '1.3.2' androidx-recyclerview-selection = '1.1.0' @@ -126,6 +127,11 @@ androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecy androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" } +androidx-navigation-common = { group = "androidx.navigation", name = "navigation-common", version.ref = "androidx-navigation" } +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidx-navigation" } +androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "androidx-navigation" } +androidx-navigation-runtime = { group = "androidx.navigation", name = "navigation-runtime", version.ref = "androidx-navigation" } +androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "androidx-navigation" } androidx-preference-main = { group = "androidx.preference", name = "preference", version.ref = "androidx-preference" } androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "androidx-preference" } androidx-recyclerview-main = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recyclerview-main" } @@ -222,6 +228,7 @@ zendesk-support = { group = "com.zendesk", name = "support", version.ref = "zend android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } android-test = { id = "com.android.test", version.ref = "agp" } +androidx-navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidx-navigation" } automattic-measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "automattic-measure-builds" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "google-dagger" } diff --git a/settings.gradle b/settings.gradle index 78364b95535..666870987c3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.navigationVersion = '2.7.7' gradle.ext.sentryVersion = '4.10.0' gradle.ext.protobufVersion = '0.9.4' gradle.ext.dependencyAnalysisVersion = '1.28.0' @@ -22,7 +21,6 @@ pluginManagement { } plugins { - id 'androidx.navigation.safeargs.kotlin' version gradle.ext.navigationVersion id 'io.sentry.android.gradle' version gradle.ext.sentryVersion id "com.google.protobuf" version gradle.ext.protobufVersion id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion From 90579d487435249969a45d4441762420a54e34da Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 21:13:01 +0300 Subject: [PATCH 80/86] Deps: Migrate sentry plugin to version catalogs --- WooCommerce-Wear/build.gradle | 2 +- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ settings.gradle | 2 -- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index 26de70a3113..b82c097ea5a 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -6,7 +6,7 @@ plugins { alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.google.dagger.hilt) alias(libs.plugins.ksp) - id 'io.sentry.android.gradle' + alias(libs.plugins.sentry) } repositories { diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 9392a8c342b..b7aaea5bf2a 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -5,7 +5,7 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.google.dagger.hilt) - id 'io.sentry.android.gradle' + alias(libs.plugins.sentry) alias(libs.plugins.androidx.navigation.safeargs) alias(libs.plugins.google.services) alias(libs.plugins.ksp) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b37fc43b498..9b3e4f2c2b3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -75,6 +75,7 @@ mockito-inline = '4.6.1' mockito-kotlin = '4.0.0' mpandroidchart = 'v3.1.0' photoview = '2.3.0' +sentry = '4.10.0' squareup-leakcanary = '2.14' stripe-terminal = '3.7.1' tinder-statemachine = '0.2.0' @@ -236,3 +237,4 @@ google-services = { id = "com.google.gms.google-services", version.ref = "google kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } diff --git a/settings.gradle b/settings.gradle index 666870987c3..9e111d88ba6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.sentryVersion = '4.10.0' gradle.ext.protobufVersion = '0.9.4' gradle.ext.dependencyAnalysisVersion = '1.28.0' gradle.ext.fladleVersion = '0.17.5' @@ -21,7 +20,6 @@ pluginManagement { } plugins { - id 'io.sentry.android.gradle' version gradle.ext.sentryVersion id "com.google.protobuf" version gradle.ext.protobufVersion id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion id "com.osacky.fladle" version gradle.ext.fladleVersion From 715e0cbf2204396fb89ff96e1f04fd621481e61b Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 21:29:46 +0300 Subject: [PATCH 81/86] Deps: Migrate google protobuf plugin to version catalogs --- WooCommerce/build.gradle | 6 +++--- build.gradle | 4 ---- gradle/libs.versions.toml | 5 +++++ settings.gradle | 2 -- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index b7aaea5bf2a..adc135f5719 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -9,7 +9,7 @@ plugins { alias(libs.plugins.androidx.navigation.safeargs) alias(libs.plugins.google.services) alias(libs.plugins.ksp) - id "com.google.protobuf" + alias(libs.plugins.google.protobuf) id "com.osacky.fladle" } @@ -465,14 +465,14 @@ dependencies { implementation(libs.google.guava) - implementation "com.google.protobuf:protobuf-javalite:$protobufVersion" + implementation(libs.google.protobuf.javalite) lintChecks(libs.android.security.lint) } protobuf { protoc { - artifact = "com.google.protobuf:protoc:$protobufVersion" + artifact = libs.google.protobuf.protoc.get().toString() } // Generates the java Protobuf-lite code for the Protobufs in this project. See diff --git a/build.gradle b/build.gradle index 8870f536d37..6f841522b9e 100644 --- a/build.gradle +++ b/build.gradle @@ -102,10 +102,6 @@ tasks.register("installGitHooks", Copy) { fileMode 0777 } -ext { - protobufVersion = '3.25.3' -} - // Onboarding and dev env setup tasks task checkBundler(type: Exec) { doFirst { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9b3e4f2c2b3..45c1eb36dba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -61,6 +61,8 @@ google-play-review = '2.0.1' google-play-services-auth = '20.2.0' google-play-services-code-scanner = '16.1.0' google-play-services-wearable = '18.1.0' +google-protobuf-plugin = '0.9.4' +google-protobuf-library = '3.25.3' google-services = '4.4.0' google-zxing = '3.5.3' gravatar = '0.2.0' @@ -199,6 +201,8 @@ google-play-review = { group = "com.google.android.play", name = "review", versi google-play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "google-play-services-auth" } google-play-services-code-scanner = { group = "com.google.android.gms", name = "play-services-code-scanner", version.ref = "google-play-services-code-scanner" } google-play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "google-play-services-wearable" } +google-protobuf-javalite = { group = "com.google.protobuf", name = "protobuf-javalite", version.ref = "google-protobuf-library" } +google-protobuf-protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "google-protobuf-library" } google-zxing-core = { group = "com.google.zxing", name = "core", version.ref = "google-zxing" } gravatar = { group = "com.gravatar", name = "gravatar", version.ref = "gravatar" } jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson-databind" } @@ -233,6 +237,7 @@ androidx-navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", ver automattic-measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "automattic-measure-builds" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "google-dagger" } +google-protobuf = { id = "com.google.protobuf", version.ref = "google-protobuf-plugin" } google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } diff --git a/settings.gradle b/settings.gradle index 9e111d88ba6..6f56bb1abda 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.protobufVersion = '0.9.4' gradle.ext.dependencyAnalysisVersion = '1.28.0' gradle.ext.fladleVersion = '0.17.5' @@ -20,7 +19,6 @@ pluginManagement { } plugins { - id "com.google.protobuf" version gradle.ext.protobufVersion id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion id "com.osacky.fladle" version gradle.ext.fladleVersion } From 845f909f4a93a894508453c7511afb1604dda375 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 21:43:28 +0300 Subject: [PATCH 82/86] Deps: Migrate dependency analysis plugin to version catalogs --- build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ settings.gradle | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 6f841522b9e..e87e12c2135 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { alias(libs.plugins.detekt) alias(libs.plugins.automattic.measure.builds) - id "com.autonomousapps.dependency-analysis" + alias(libs.plugins.dependency.analysis) alias(libs.plugins.android.application).apply(false) alias(libs.plugins.android.library).apply(false) alias(libs.plugins.android.test).apply(false) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 45c1eb36dba..db4899d28e1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,6 +43,7 @@ cashapp-turbine = '1.0.0' coil = '2.1.0' commons-fileupload = '1.5' commons-io = '2.11.0' +dependency-analysis = '1.28.0' detekt = '1.23.5' facebook-flipper = '0.176.1' facebook-shimmer = '0.5.0' @@ -235,6 +236,7 @@ android-library = { id = "com.android.library", version.ref = "agp" } android-test = { id = "com.android.test", version.ref = "agp" } androidx-navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidx-navigation" } automattic-measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "automattic-measure-builds" } +dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependency-analysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "google-dagger" } google-protobuf = { id = "com.google.protobuf", version.ref = "google-protobuf-plugin" } diff --git a/settings.gradle b/settings.gradle index 6f56bb1abda..baf77d0073e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ pluginManagement { - gradle.ext.dependencyAnalysisVersion = '1.28.0' gradle.ext.fladleVersion = '0.17.5' repositories { @@ -19,7 +18,6 @@ pluginManagement { } plugins { - id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion id "com.osacky.fladle" version gradle.ext.fladleVersion } } From 13a9d591cb11cead208f4f2de0b04f9fa53ba786 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 4 Oct 2024 21:45:32 +0300 Subject: [PATCH 83/86] Deps: Migrate fladle plugin to version catalogs --- WooCommerce/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ settings.gradle | 6 ------ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index adc135f5719..2018e455434 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -10,7 +10,7 @@ plugins { alias(libs.plugins.google.services) alias(libs.plugins.ksp) alias(libs.plugins.google.protobuf) - id "com.osacky.fladle" + alias(libs.plugins.fladle) } fladle { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index db4899d28e1..e3a3929387c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -49,6 +49,7 @@ facebook-flipper = '0.176.1' facebook-shimmer = '0.5.0' facebook-soloader = '0.10.4' fastlane-screengrab = '2.1.1' +fladle = '0.17.5' google-dagger = "2.50" google-firebase-bom = '32.7.1' google-gson = '2.10.1' @@ -238,6 +239,7 @@ androidx-navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", ver automattic-measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "automattic-measure-builds" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependency-analysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } +fladle = { id = "com.osacky.fladle", version.ref = "fladle" } google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "google-dagger" } google-protobuf = { id = "com.google.protobuf", version.ref = "google-protobuf-plugin" } google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } diff --git a/settings.gradle b/settings.gradle index baf77d0073e..794b7eb05e3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,4 @@ pluginManagement { - gradle.ext.fladleVersion = '0.17.5' - repositories { google() exclusiveContent { @@ -16,10 +14,6 @@ pluginManagement { } gradlePluginPortal() } - - plugins { - id "com.osacky.fladle" version gradle.ext.fladleVersion - } } plugins { From 4fd66b2387d87edf2b5a4dc21d609708929c5bbd Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Mon, 14 Oct 2024 18:30:00 +0300 Subject: [PATCH 84/86] Deps: Update fluxc to 2.99.0 Release Notes: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/releases/tag/2.99.0 The actual update was done as part of 55313270f6245ce94cada95f2f14773fc47ecaa9, but after merging this branch with 'trunk', to fully resolved this one conflict, the FluxC update needs to be redone, this time within 'libs.versions.toml'. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e3a3929387c..5b1ce5c95bc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -85,7 +85,7 @@ stripe-terminal = '3.7.1' tinder-statemachine = '0.2.0' wiremock = '2.26.3' wordpress-aztec = 'v2.1.4' -wordpress-fluxc = 'trunk-7ad6ce4c250ba435d8d8c7feb898bceb259fb007' +wordpress-fluxc = '2.99.0' wordpress-login = '1.18.0' wordpress-libaddressinput = '0.0.2' wordpress-mediapicker = '0.3.1' From c11e208823a59ab731900c450ab09cc27ccc475a Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Mon, 14 Oct 2024 18:39:02 +0300 Subject: [PATCH 85/86] Deps: Add an explicit version to androidx wear tiles dependencies As per the c27691161b777412240b6afb86a614072a472dc1 commit, these two 'androidx-wear-tiles' dependencies had no associated version on them. This could be problematic, non deterministic and could cause trouble moving forward. As such, and as per the PR comment suggestion below, this commit adds the most appropriate '1.3.0' version, which is also the one currently being implicitly set transitively by the 'horologist' dependencies themselves. PR Comment: https://github.com/woocommerce/woocommerce-android/pull/ 12765#discussion_r1795224428 --- gradle/libs.versions.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5b1ce5c95bc..6afe89f4323 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,6 +29,7 @@ androidx-test-main = '1.4.0' androidx-test-uiautomator = '2.2.0' androidx-transition = '1.5.1' androidx-wear-compose = '1.3.1' +androidx-wear-tiles = '1.3.0' androidx-wear-tooling = '1.0.0' androidx-wear-watchface = '1.2.1' androidx-work = '2.7.1' @@ -151,8 +152,8 @@ androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiaut androidx-transition = { group = "androidx.transition", name = "transition", version.ref = "androidx-transition" } androidx-wear-compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "androidx-wear-compose" } androidx-wear-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "androidx-wear-compose" } -androidx-wear-tiles-main = { group = "androidx.wear.tiles", name = "tiles" } -androidx-wear-tiles-material = { group = "androidx.wear.tiles", name = "tiles-material" } +androidx-wear-tiles-main = { group = "androidx.wear.tiles", name = "tiles", version.ref = "androidx-wear-tiles" } +androidx-wear-tiles-material = { group = "androidx.wear.tiles", name = "tiles-material", version.ref = "androidx-wear-tiles" } androidx-wear-tooling-preview = { group = "androidx.wear", name = "wear-tooling-preview", version.ref = "androidx-wear-tooling" } androidx-wear-watchface-complications-data-source-ktx = { group = "androidx.wear.watchface", name = "watchface-complications-data-source-ktx", version.ref = "androidx-wear-watchface" } androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" } From 970ec5a4257e9dc2e07bdc5bc348f6bef3d54abf Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Mon, 14 Oct 2024 18:54:39 +0300 Subject: [PATCH 86/86] Refactor: Revert to previous simpler syntax of alias plugin apply false PR Comment: https://github.com/woocommerce/woocommerce-android/pull/ 12765#discussion_r1795251645 --- build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index e87e12c2135..b5df01ef33e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,15 +6,15 @@ plugins { alias(libs.plugins.detekt) alias(libs.plugins.automattic.measure.builds) alias(libs.plugins.dependency.analysis) - alias(libs.plugins.android.application).apply(false) - alias(libs.plugins.android.library).apply(false) - alias(libs.plugins.android.test).apply(false) - alias(libs.plugins.kotlin.android).apply(false) - alias(libs.plugins.kotlin.parcelize).apply(false) - alias(libs.plugins.google.dagger.hilt).apply(false) - alias(libs.plugins.androidx.navigation.safeargs).apply(false) - alias(libs.plugins.google.services).apply(false) - alias(libs.plugins.ksp).apply(false) + alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.android.test) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.parcelize) apply false + alias(libs.plugins.google.dagger.hilt) apply false + alias(libs.plugins.androidx.navigation.safeargs) apply false + alias(libs.plugins.google.services) apply false + alias(libs.plugins.ksp) apply false } measureBuilds {