diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 3a42debcfccf..8b531e7e361b 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -407,9 +407,9 @@ dependencies { implementation libs.androidx.lifecycle.common implementation libs.androidx.lifecycle.runtime implementation libs.androidx.lifecycle.runtime.ktx - implementation "androidx.activity:activity:$androidxActivityVersion" - implementation "androidx.activity:activity-ktx:$androidxActivityVersion" - implementation "androidx.activity:activity-compose:$androidxActivityVersion" + implementation libs.androidx.activity + implementation libs.androidx.activity.ktx + implementation libs.androidx.activity.compose implementation "androidx.fragment:fragment:$androidxFragmentVersion" implementation "androidx.fragment:fragment-ktx:$androidxFragmentVersion" implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" diff --git a/build.gradle b/build.gradle index e39e36dc6153..0114c8e1322d 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,6 @@ ext { androidxCardviewVersion = '1.0.0' androidxConstraintlayoutVersion = '2.1.4' androidxConstraintlayoutComposeVersion = '1.0.1' - androidxActivityVersion = '1.8.0' androidxFragmentVersion = '1.6.2' androidxGridlayoutVersion = '1.0.0' androidxPercentlayoutVersion = '1.0.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ab7674c1cd7f..aac5bca727b6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,5 @@ [versions] +androidxActivity = '1.8.0' androidxArchCore = '2.2.0' androidxComposeNavigation = '2.7.6' androidxCore = '1.10.0' @@ -12,6 +13,9 @@ wordPressPersistentEditText = '1.0.2' [libraries] android-appUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayAppUpdate" } android-appUpdateKtx = { group = "com.google.android.play", name = "app-update-ktx", version.ref = "googlePlayAppUpdate" } +androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "androidxActivity" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" } +androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidxActivity" } androidx-core = { group = "androidx.core", name = "core", version.ref = "androidxCore" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" } androidx-coreCommon = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCore" } @@ -34,5 +38,6 @@ automattic-rest = { group = "com.automattic", name = "rest", version.ref = "auto google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } + [plugins] diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index bbb34255976a..57e6c8a15e9e 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -47,8 +47,8 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation libs.androidx.core - implementation "androidx.activity:activity:$androidxActivityVersion" - implementation "androidx.activity:activity-ktx:$androidxActivityVersion" + implementation libs.androidx.activity + implementation libs.androidx.activity.ktx implementation "androidx.fragment:fragment:$androidxFragmentVersion" implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion"