From 6386bb3367d590be128fa115782a4c706c88e9ec Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 14:41:41 +0530 Subject: [PATCH] Deps: Migrated `kotlinxCoroutines` to Version Catalog --- WordPress/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 5 +++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 1b7cb1d69252..1401c66b5fae 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -463,8 +463,8 @@ dependencies { implementation "com.github.indexos.media-for-mobile:android:$indexosMediaForMobileVersion" implementation "com.zendesk:support:$zendeskVersion" implementation (name:'tenor-android-core-jetified', ext:'aar') // Jetified Tenor Gif library - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion" + implementation libs.kotlinx.coroutines.core + implementation libs.kotlinx.coroutines.android implementation "com.github.PhilJay:MPAndroidChart:$philjayMpAndroidChartVersion" implementation "org.jsoup:jsoup:$jsoupVersion" implementation ("com.google.android.exoplayer:exoplayer:$googleExoPlayerVersion") { @@ -484,7 +484,7 @@ dependencies { testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion" + testImplementation libs.kotlinx.coroutines.test androidTestImplementation project(path:':libs:mocks') diff --git a/build.gradle b/build.gradle index 59f992707e13..0aab1570d267 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,6 @@ ext { googlePlayServicesAuthVersion = '20.4.1' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' jsoupVersion = '1.16.2' - kotlinxCoroutinesVersion = '1.7.3' philjayMpAndroidChartVersion = 'v3.1.0' squareupKotlinPoetVersion = '1.16.0' squareupRetrofitVersion = '2.9.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ad641ce00670..eafe8af60d4c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,6 +12,7 @@ dagger = '2.50' glide = '4.16.0' googlePlayAppUpdate = '2.1.0' gson = '2.10.1' +kotlinxCoroutines = '1.7.3' lottie = '6.1.0' wordPressPersistentEditText = '1.0.2' @@ -71,5 +72,9 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutines" } +kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutines" } + [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }