diff --git a/WordPress/build.gradle b/WordPress/build.gradle index e9867cc47c81..ddc367a06a66 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -412,8 +412,8 @@ dependencies { implementation libs.androidx.activity.compose implementation libs.androidx.fragment implementation libs.androidx.fragment.ktx - implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" - implementation "androidx.appcompat:appcompat-resources:$androidxAppcompatVersion" + implementation libs.androidx.appcompat + implementation libs.androidx.appcompat.resources implementation "androidx.cardview:cardview:$androidxCardviewVersion" implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" implementation "com.google.android.material:material:$googleMaterialVersion" diff --git a/build.gradle b/build.gradle index ad956f5d7f25..df9d80ccf44d 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,6 @@ ext { androidInstallReferrerVersion = '2.2' androidVolleyVersion = '1.2.1' androidxAnnotationVersion = '1.6.0' - androidxAppcompatVersion = '1.6.1' 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 9d0a11c20452..75aa8856f784 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] androidxActivity = '1.8.0' +androidxAppcompat = '1.6.1' androidxArchCore = '2.2.0' androidxComposeNavigation = '2.7.6' androidxCore = '1.10.0' @@ -17,6 +18,8 @@ android-appUpdateKtx = { group = "com.google.android.play", name = "app-update-k 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-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppcompat" } +androidx-appcompat-resources = { group = "androidx.appcompat", name = "appcompat-resources", version.ref = "androidxAppcompat" } androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" } androidx-compose-material = { group = "androidx.compose.material", name = "material" } diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 7498712d2dde..5722ddb6c887 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -101,7 +101,7 @@ dependencies { implementation libs.androidx.lifecycle.livedata.core implementation libs.androidx.core implementation libs.androidx.fragment - implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" + implementation libs.androidx.appcompat implementation "androidx.preference:preference:$androidxPreferenceVersion" implementation "com.google.android.material:material:$googleMaterialVersion" implementation "com.android.volley:volley:$androidVolleyVersion" diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index a7c15d5c9d90..d45779f1f73a 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -50,7 +50,7 @@ dependencies { implementation libs.androidx.activity implementation libs.androidx.activity.ktx implementation libs.androidx.fragment - implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" + implementation libs.androidx.appcompat implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" implementation "androidx.viewpager2:viewpager2:$androidxViewpager2Version"