diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 714f51fedbc6..8b275be54716 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -399,8 +399,8 @@ dependencies { implementation libs.android.play.appUpdate implementation libs.android.play.appUpdateKtx - implementation "androidx.arch.core:core-common:$androidxArchCoreVersion" - implementation "androidx.arch.core:core-runtime:$androidxArchCoreVersion" + implementation libs.androidx.arch.coreCommon + implementation libs.androidx.arch.coreRuntime implementation "com.google.code.gson:gson:$googleGsonVersion" implementation "androidx.core:core:$androidxCoreVersion" implementation "androidx.core:core-ktx:$androidxCoreVersion" @@ -475,7 +475,7 @@ dependencies { implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion" ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion" - testImplementation("androidx.arch.core:core-testing:$androidxArchCoreVersion", { + testImplementation(libs.androidx.arch.coreTesting, { 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' diff --git a/build.gradle b/build.gradle index 60f5356f196e..aacc5c5b9eb9 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,6 @@ ext { androidVolleyVersion = '1.2.1' androidxAnnotationVersion = '1.6.0' androidxAppcompatVersion = '1.6.1' - androidxArchCoreVersion = '2.2.0' androidxCameraVersion = '1.3.4' androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 65e8b57a2221..cbfda7c7e636 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,5 @@ [versions] +androidxArchCore = '2.2.0' androidxComposeNavigation = '2.7.7' androidxWebkit = '1.11.0' automatticRest = '1.0.8' @@ -8,6 +9,9 @@ wordPressPersistentEditText = '1.0.2' [libraries] android-play-appUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayAppUpdate" } android-play-appUpdateKtx = { group = "com.google.android.play", name = "app-update-ktx", version.ref = "googlePlayAppUpdate" } +androidx-arch-coreCommon = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCore" } +androidx-arch-coreRuntime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCore" } +androidx-arch-coreTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidxArchCore" } androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 2cdd7f6bf40f..95d11eacf992 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -72,7 +72,7 @@ dependencies { testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "junit:junit:$junitVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" - testImplementation("androidx.arch.core:core-testing:$androidxArchCoreVersion", { + testImplementation(libs.androidx.arch.coreTesting, { 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'