From 6ec073db301cf0dbc87a6748c4b22333bd4e6863 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 3 Jul 2024 19:57:02 +0530 Subject: [PATCH 001/117] Migrated Dependency to `Version Catlog` --- WordPress/build.gradle | 231 +++++++++++++++++---------------- build.gradle | 71 +--------- gradle/libs.versions.toml | 220 +++++++++++++++++++++++++++++++ libs/analytics/build.gradle | 3 +- libs/editor/build.gradle | 25 ++-- libs/image-editor/build.gradle | 42 +++--- libs/mocks/build.gradle | 4 +- libs/networking/build.gradle | 4 +- libs/processors/build.gradle | 8 +- 9 files changed, 384 insertions(+), 224 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 8ebe0ab44ae4..798e0ca18951 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -350,8 +350,8 @@ static def addBuildConfigFieldsFromPrefixedProperties(variant, properties, prefi } dependencies { - implementation 'androidx.webkit:webkit:1.11.0' - implementation "androidx.navigation:navigation-compose:$androidxComposeNavigationVersion" + implementation libs.androidxWebkit + implementation libs.androidxNavigation compileOnly project(path: ':libs:annotations') ksp project(':libs:processors') implementation (project(path:':libs:networking')) { @@ -390,85 +390,88 @@ dependencies { } } - implementation ("com.automattic:rest:$automatticRestVersion") { + implementation (libs.automatticRest) { exclude group: 'com.mcxiaoke.volley' } - implementation "org.wordpress:persistentedittext:$wordPressPersistentEditTextVersion" + implementation libs.wordPressPersistentEditText implementation "$gradle.ext.gravatarBinaryPath:$gravatarVersion" - implementation "com.google.android.play:app-update:$googlePlayInAppUpdateVersion" - implementation "com.google.android.play:app-update-ktx:$googlePlayInAppUpdateVersion" - - implementation "androidx.arch.core:core-common:$androidxArchCoreVersion" - implementation "androidx.arch.core:core-runtime:$androidxArchCoreVersion" - implementation "com.google.code.gson:gson:$googleGsonVersion" - implementation "androidx.core:core:$androidxCoreVersion" - implementation "androidx.core:core-ktx:$androidxCoreVersion" - implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidxLifecycleVersion" - implementation "androidx.activity:activity:$androidxActivityVersion" - implementation "androidx.activity:activity-ktx:$androidxActivityVersion" - implementation "androidx.activity:activity-compose:$androidxActivityVersion" - implementation "androidx.fragment:fragment:$androidxFragmentVersion" - implementation "androidx.fragment:fragment-ktx:$androidxFragmentVersion" - implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" - implementation "androidx.appcompat:appcompat-resources:$androidxAppcompatVersion" - implementation "androidx.cardview:cardview:$androidxCardviewVersion" - implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" - implementation "com.google.android.material:material:$googleMaterialVersion" - implementation "com.google.android.flexbox:flexbox:$googleFlexboxlayoutVersion" - implementation "androidx.percentlayout:percentlayout:$androidxPercentlayoutVersion" - implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeToRefreshVersion" - implementation "androidx.preference:preference:$androidxPreferenceVersion" - implementation "androidx.work:work-runtime:$androidxWorkManagerVersion" - implementation "androidx.work:work-runtime-ktx:$androidxWorkManagerVersion" - implementation "androidx.webkit:webkit:$androidxWebkitVersion" - implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" - implementation "androidx.lifecycle:lifecycle-viewmodel:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-process:$androidxLifecycleVersion" - implementation "com.android.volley:volley:$androidVolleyVersion" - implementation "com.google.android.play:review:$googlePlayReviewVersion" - implementation "com.google.android.play:review-ktx:$googlePlayReviewVersion" - implementation "com.google.android.gms:play-services-auth:$googlePlayServicesAuthVersion" - implementation "com.google.mlkit:barcode-scanning-common:$googleMLKitBarcodeScanningCommonVersion" - implementation "com.google.mlkit:text-recognition:$googleMLKitTextRecognitionVersion" - implementation "com.google.mlkit:barcode-scanning:$googleMLKitBarcodeScanningVersion" + + implementation libs.googlePlayInAppUpdate + implementation libs.googlePlayInAppKtxUpdate + + implementation libs.androidxCoreCommon + implementation libs.androidxCoreRuntime + implementation libs.googleGson + implementation libs.androidxCore + implementation libs.androidxCoreKtx + implementation libs.lifecycleCommon + implementation libs.lifecycleRuntime + implementation libs.lifecycleRuntimeKtx + implementation libs.androidxActivity + implementation libs.androidxActivityKtx + implementation libs.androidxActivityCompose + + implementation libs.androidxFragment + implementation libs.androidxFragmentKtx + implementation libs.androidxAppcompat + implementation libs.androidxAppcompatResources + implementation libs.androidxCardview + implementation libs.androidxRecyclerview + implementation libs.googleMaterial + + implementation libs.googleFlexboxlayout + implementation libs.androidxPercentlayout + implementation libs.androidxSwipeToRefresh + implementation libs.androidxPreference + implementation libs.androidxWorkManagerRuntime + implementation libs.androidxWorkManagerRuntimeKtx + implementation libs.androidxConstraintLayout + implementation libs.lifecycleViewmodel + implementation libs.lifecycleViewmodelKtx + implementation libs.lifecycleLivedata + implementation libs.lifecycleLivedataCore + implementation libs.lifecycleLivedataKtx + implementation libs.lifecycleProcess + implementation libs.androidVolley + implementation libs.googlePlayReview + implementation libs.googlePlayReviewKtx + + implementation libs.googlePlayServicesAuth + implementation libs.googleMLKitBarcodeScanningCommon + implementation libs.googleMLKitTextRecognition + implementation libs.googleMLKitBarcodeScanning // CameraX - implementation "androidx.camera:camera-camera2:$androidxCameraVersion" - implementation "androidx.camera:camera-lifecycle:$androidxCameraVersion" - implementation "androidx.camera:camera-view:$androidxCameraVersion" - - implementation "com.android.installreferrer:installreferrer:$androidInstallReferrerVersion" - implementation "com.github.chrisbanes:PhotoView:$chrisbanesPhotoviewVersion" - implementation "org.greenrobot:eventbus:$eventBusVersion" - implementation "org.greenrobot:eventbus-java:$eventBusVersion" - implementation "com.squareup.retrofit2:retrofit:$squareupRetrofitVersion" - implementation "org.apache.commons:commons-text:$apacheCommonsTextVersion" - implementation "com.airbnb.android:lottie:$lottieVersion" - implementation "com.facebook.shimmer:shimmer:$facebookShimmerVersion" - implementation ("com.github.yalantis:ucrop:$uCropVersion") { + implementation libs.androidxCamera + implementation libs.androidxCameraLifecycle + implementation libs.androidxCameraView + + implementation libs.chrisbanesPhotoview + implementation libs.androidInstallReferrer + implementation libs.eventBus + implementation libs.eventBusJava + implementation libs.squareupRetrofit + implementation libs.apacheCommonsText + implementation libs.lottie + implementation libs.facebookShimmer + implementation (libs.ucrop) { exclude group: 'androidx.core', module: 'core' exclude group: 'androidx.constraintlayout', module: 'constraintlayout' exclude group: 'androidx.appcompat', module: 'appcompat' } - implementation "com.github.bumptech.glide:glide:$glideVersion" - ksp "com.github.bumptech.glide:ksp:$glideVersion" - implementation "com.github.bumptech.glide:volley-integration:$glideVersion" - implementation "com.github.indexos.media-for-mobile:domain:$indexosMediaForMobileVersion" - implementation "com.github.indexos.media-for-mobile:android:$indexosMediaForMobileVersion" - implementation "com.zendesk:support:$zendeskVersion" + implementation libs.glide + ksp libs.glideKsp + implementation libs.glideVolleyIntegration + implementation libs.indexosMediaForMobileDomain + implementation libs.indexosMediaForMobileAndroid + implementation libs.zendesk 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 "com.github.PhilJay:MPAndroidChart:$philjayMpAndroidChartVersion" - implementation "org.jsoup:jsoup:$jsoupVersion" - implementation ("com.google.android.exoplayer:exoplayer:$googleExoPlayerVersion") { + implementation libs.kotlinxCoroutinesCore + implementation libs.kotlinxCoroutinesAndroid + implementation libs.mpAndroidChart + implementation libs.jsoup + implementation (libs.googleExoPlayer) { exclude group: 'com.android.support', module: 'support-annotations' } implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion" @@ -476,30 +479,30 @@ 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.androidxCoreTesting, { 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' }) - testImplementation "junit:junit:$junitVersion" - testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + testImplementation libs.junit + testImplementation libs.mockitoKotlin 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.assertj + testImplementation libs.kotlinxCoroutinesTest androidTestImplementation project(path:':libs:mocks') - androidTestImplementation "org.mockito:mockito-android:$mockitoAndroidVersion" - androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" - androidTestImplementation "com.squareup.okhttp3:mockwebserver:$squareupMockWebServerVersion" - androidTestImplementation "androidx.test.uiautomator:uiautomator:$androidxTestUiAutomatorVersion" + androidTestImplementation libs.mockitoAndroid + androidTestImplementation libs.mockitoKotlin + androidTestImplementation libs.squareupMockWebServer + androidTestImplementation libs.androidxTestUiAutomator androidTestImplementation "androidx.test.espresso:espresso-core:$androidxTestEspressoVersion", { version { strictly androidxTestEspressoVersion } exclude group: 'com.android.support', module: 'support-annotations' } - androidTestImplementation("androidx.test.espresso:espresso-contrib:$androidxTestEspressoVersion") { + androidTestImplementation(libs.androidxTestEspressoContrib) { version { strictly androidxTestEspressoVersion } @@ -507,26 +510,26 @@ dependencies { exclude group: 'com.android.support', module: 'support-v4' exclude module: 'recyclerview-v7' } - androidTestImplementation("androidx.test.espresso:espresso-accessibility:$androidxTestEspressoVersion") { + androidTestImplementation(libs.androidxTestEspressoAccessibility) { version { strictly androidxTestEspressoVersion } } - androidTestImplementation("com.github.tomakehurst:wiremock:$wiremockVersion") { + androidTestImplementation(libs.wiremock) { 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' } - androidTestImplementation "org.apache.httpcomponents:httpclient-android:$wiremockHttpClientVersion" - androidTestImplementation "androidx.test:runner:$androidxTestCoreVersion" - androidTestImplementation "androidx.test:rules:$androidxTestCoreVersion" - androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion" - androidTestImplementation "tools.fastlane:screengrab:$screengrabVersion", { + androidTestImplementation libs.wiremockHttpClient + androidTestImplementation libs.androidxTestCoreRunner + androidTestImplementation libs.androidxTestCoreRules + androidTestImplementation libs.androidxTestExtJunit + androidTestImplementation libs.screengrab, { exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18' } androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing - androidTestImplementation "androidx.work:work-testing:$androidxWorkManagerVersion" + androidTestImplementation libs.androidxWorkManagerTesting androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion" kspAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion" // Enables Java 8+ API desugaring support @@ -537,52 +540,52 @@ dependencies { def firebaseBom = platform("com.google.firebase:firebase-bom:$firebaseBomVersion") implementation(firebaseBom) // Firebase - Main - implementation "com.google.firebase:firebase-messaging" + implementation libs.firebaseMessaging // Firebase - Deprecated - implementation "com.google.firebase:firebase-iid:$firebaseIidVersion" + implementation libs.firebaseIid // Jetpack Compose def composeBom = platform("androidx.compose:compose-bom:$androidxComposeBomVersion") implementation(composeBom) androidTestImplementation(composeBom) // - Jetpack Compose - Android Studio - debugImplementation "androidx.compose.ui:ui-test-manifest" - debugImplementation "androidx.compose.ui:ui-tooling" + debugImplementation libs.composeUiTestManifest + debugImplementation libs.composeUiTooling // - Jetpack Compose - Main - implementation "androidx.compose.runtime:runtime" - implementation "androidx.compose.runtime:runtime-livedata" - implementation "androidx.compose.foundation:foundation" - implementation "androidx.compose.foundation:foundation-layout" - implementation "androidx.compose.ui:ui" - implementation "androidx.compose.ui:ui-graphics" - implementation "androidx.compose.ui:ui-text" - implementation "androidx.compose.ui:ui-unit" - implementation "androidx.compose.ui:ui-tooling-preview" - implementation "androidx.compose.material:material" + implementation libs.androidxComposeRuntime + implementation libs.androidxComposeRuntimeLivedata + implementation libs.androidxComposeFoundation + implementation libs.androidxComposeFoundationLayout + implementation libs.androidxComposeUi + implementation libs.androidxComposeUiGraphics + implementation libs.androidxComposeUiText + implementation libs.androidxComposeUiUnit + implementation libs.androidxComposeUiToolingPreview + implementation libs.androidxComposeMaterial // - Jetpack Compose - AndroidX - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$androidxLifecycleVersion" - implementation "androidx.constraintlayout:constraintlayout-compose:$androidxConstraintlayoutComposeVersion" + implementation libs.lifecycleViewmodelCompose + implementation libs.androidxConstraintlayoutCompose // - Jetpack Compose - Other - implementation "io.coil-kt:coil-compose:$coilComposeVersion" - implementation "com.airbnb.android:lottie-compose:$lottieVersion" + implementation libs.coilCompose + implementation libs.lottieCompose // - Jetpack Compose - UI Tests - androidTestImplementation "androidx.compose.ui:ui-test-junit4" - implementation "androidx.compose.material3:material3:$androidxComposeMaterial3Version" + androidTestImplementation libs.composeUiTestJunit4 + implementation libs.androidxComposeMaterial3 // Cascade - Compose nested menu - implementation "me.saket.cascade:cascade-compose:2.3.0" + implementation libs.cascadeCompose - implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" + implementation libs.automatticTracks // - Flipper - debugImplementation ("com.facebook.flipper:flipper:$flipperVersion") { + debugImplementation (libs.flipper) { exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm' } - debugImplementation "com.facebook.soloader:soloader:$soLoaderVersion" - debugImplementation ("com.facebook.flipper:flipper-network-plugin:$flipperVersion"){ + debugImplementation libs.soLoader + debugImplementation (libs.flipperNetworkPlugin){ exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm' } - releaseImplementation "com.facebook.flipper:flipper-noop:$flipperVersion" + releaseImplementation libs.flipperNoop } configurations.all { diff --git a/build.gradle b/build.gradle index dca73989df3b..5b1ca8099ba1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,4 @@ import com.automattic.android.measure.reporters.InternalA8cCiReporter -import com.automattic.android.measure.reporters.SlowSlowTasksMetricsReporter import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -23,15 +22,12 @@ ext { ext { // libs automatticAboutVersion = '1.4.0' - automatticRestVersion = '1.0.8' automatticTracksVersion = '5.1.0' gutenbergMobileVersion = 'v1.121.0-alpha1' wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' wordPressLoginVersion = '1.16.0' - wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.14.0' - indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' gravatarVersion = '1.0.0' // debug @@ -39,79 +35,18 @@ ext { soLoaderVersion = '0.10.5' // main - androidInstallReferrerVersion = '2.2' - 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' - androidxComposeNavigationVersion = '2.7.6' - androidxCardviewVersion = '1.0.0' - androidxConstraintlayoutVersion = '2.1.4' - androidxConstraintlayoutComposeVersion = '1.0.1' - androidxCoreVersion = '1.10.0' - androidxActivityVersion = '1.8.0' - androidxFragmentVersion = '1.6.2' - androidxGridlayoutVersion = '1.0.0' - androidxLifecycleVersion = '2.6.2' - androidxPercentlayoutVersion = '1.0.0' - androidxPreferenceVersion = '1.2.0' - androidxRecyclerviewVersion = '1.3.0' - androidxSwipeToRefreshVersion = '1.1.0' - androidxViewpager2Version = '1.0.0' - androidxWorkManagerVersion = "2.9.0" - androidxWebkitVersion = '1.11.0' - androidxComposeMaterial3Version = '1.1.1' - apacheCommonsTextVersion = '1.10.0' - coilComposeVersion = '2.4.0' - chrisbanesPhotoviewVersion = '2.3.0' - eventBusVersion = '3.3.1' - facebookShimmerVersion = '0.5.0' + androidxGridlayoutVersion = '1.0.0' // unused needs verify? firebaseBomVersion = '32.1.0' - firebaseIidVersion = '21.1.0' - glideVersion = '4.16.0' - googleAutoServiceVersion = '1.0.1' - googleExoPlayerVersion = '2.13.3' - googleFlexboxlayoutVersion = '3.0.0' - googleGsonVersion = '2.10.1' - googleMaterialVersion = '1.9.0' - - googleMLKitBarcodeScanningVersion = '17.2.0' - googleMLKitBarcodeScanningCommonVersion = '17.0.0' - googleMLKitTextRecognitionVersion = '16.0.0' - googlePlayReviewVersion = '2.0.1' - googlePlayServicesAuthVersion = '20.4.1' - googlePlayServicesCodeScannerVersion = '16.0.0-beta3' - jsoupVersion = '1.16.2' - kotlinxCoroutinesVersion = '1.7.3' - lottieVersion = '6.1.0' - philjayMpAndroidChartVersion = 'v3.1.0' - squareupKotlinPoetVersion = '1.16.0' - squareupRetrofitVersion = '2.9.0' + googleAutoServiceVersion = '1.0.1' // unused needs verify? + googlePlayServicesCodeScannerVersion = '16.0.0-beta3' // unused needs verify? uCropVersion = '2.2.9' - zendeskVersion = '5.1.2' - googlePlayInAppUpdateVersion = '2.1.0' - - // react native - facebookReactVersion = '0.73.3' - - // test - assertjVersion = '3.23.1' - junitVersion = '4.13.2' - mockitoAndroidVersion = '4.5.1' - mockitoKotlinVersion = '4.1.0' // android test - androidxTestCoreVersion = '1.5.0' androidxTestEspressoVersion = '3.4.0' - androidxTestExtJunitVersion = '1.1.5' - androidxTestUiAutomatorVersion = '2.2.0' screengrabVersion = '2.1.1' - squareupMockWebServerVersion = '4.12.0' - wiremockVersion = '2.26.3' - wiremockHttpClientVersion = '4.3.5.1' // other androidDesugarVersion = '2.0.4' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000000..13fc00938dfd --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,220 @@ +[versions] +#libs +webkit = '1.11.0' +androidxComposeNavigationVersion = '2.7.6' +automatticRestVersion = '1.0.8' +wordPressPersistentEditTextVersion = '1.0.2' +googlePlayInAppUpdateVersion = '2.1.0' +googlePlayInAppUpdateKtxVersion = '2.1.0' +androidxArchCoreVersion = '2.2.0' +googleGsonVersion = '2.10.1' +androidxCoreVersion = '1.10.0' +androidxLifecycleVersion = '2.6.2' +androidxActivityVersion = '1.8.0' +androidxFragmentVersion = '1.6.2' +androidxAppcompatVersion = '1.6.1' +androidxCardviewVersion = '1.0.0' +androidxRecyclerviewVersion = '1.3.0' +googleMaterialVersion = '1.9.0' +androidxConstraintlayoutVersion = '2.1.4' +googleFlexboxlayoutVersion = '3.0.0' +androidxPercentlayoutVersion = '1.0.0' +androidxSwipeToRefreshVersion = '1.1.0' +androidxPreferenceVersion = '1.2.0' +androidxWorkManagerVersion = "2.9.0" +androidVolleyVersion = '1.2.1' +googlePlayReviewVersion = '2.0.1' +androidxCameraVersion = '1.3.4' +googlePlayServicesAuthVersion = '20.4.1' +googleMLKitBarcodeScanningCommonVersion = '17.0.0' +googleMLKitTextRecognitionVersion = '16.0.0' +googleMLKitBarcodeScanningVersion = '17.2.0' +eventBusVersion = '3.3.1' +glideVersion = '4.16.0' +androidInstallReferrerVersion = '2.2' +squareupRetrofitVersion = '2.9.0' +apacheCommonsTextVersion = '1.10.0' +lottieVersion = '6.1.0' +facebookShimmerVersion = '0.5.0' +uCropVersion = '2.2.9' +indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' +zendeskVersion = '5.1.2' +kotlinxCoroutinesVersion = '1.7.3' +philjayMpAndroidChartVersion = 'v3.1.0' +jsoupVersion = '1.16.2' +googleExoPlayerVersion = '2.13.3' +firebaseIidVersion = '21.1.0' +androidxConstraintlayoutComposeVersion = '1.0.1' +coilComposeVersion = '2.4.0' +androidxComposeMaterial3Version = '1.1.1' +cascadeComposeVersion = '2.3.0' +automatticTracksVersion = '5.1.0' +flipperVersion = '0.245.0' +soLoaderVersion = '0.10.5' +junitVersion = '4.13.2' +mockitoAndroidVersion = '4.5.1' +mockitoKotlinVersion = '4.1.0' +chrisbanesPhotoviewVersion = '2.3.0' +assertjVersion = '3.23.1' +androidxTestEspressoVersion = '3.4.0' +androidxTestUiAutomatorVersion = '2.2.0' +squareupMockWebServerVersion = '4.12.0' +wiremockVersion = '2.26.3' +wiremockHttpClientVersion = '4.3.5.1' +androidxTestCoreVersion = '1.5.0' +androidxTestExtJunitVersion = '1.1.5' +screengrabVersion = '2.1.1' +facebookReactVersion = '0.73.3' +androidxViewpager2Version = '1.0.0' +squareupKotlinPoetVersion = '1.16.0' + + +[libraries] +androidxWebkit = { group = "androidx.webkit", name = "webkit", version.ref = "webkit" } +androidxNavigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigationVersion" } +automatticRest = { group = "com.automattic", name = "rest", version.ref = "automatticRestVersion" } +wordPressPersistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditTextVersion" } +googlePlayInAppUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayInAppUpdateVersion" } +googlePlayInAppKtxUpdate = { group = "com.google.android.play", name = "app-update-ktx", version.ref = "googlePlayInAppUpdateKtxVersion" } +androidxCoreCommon = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCoreVersion" } +androidxCoreRuntime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCoreVersion" } +androidxCoreTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidxArchCoreVersion" } +googleGson = { group = "com.google.code.gson", name = "gson", version.ref = "googleGsonVersion" } +androidxCore = { group = "androidx.core", name = "core", version.ref = "androidxCoreVersion" } +androidxCoreKtx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCoreVersion" } +lifecycleCommon = { group = "androidx.lifecycle", name = "lifecycle-common", version.ref = "androidxLifecycleVersion" } +lifecycleRuntime = { group = "androidx.lifecycle", name = "lifecycle-runtime", version.ref = "androidxLifecycleVersion" } +lifecycleRuntimeKtx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycleVersion" } +lifecycleViewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidxLifecycleVersion" } +lifecycleViewmodelKtx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycleVersion" } +lifecycleViewmodelSavedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycleVersion" } +lifecycleLivedataCore = { group = "androidx.lifecycle", name = "lifecycle-livedata-core", version.ref = "androidxLifecycleVersion" } +lifecycleLivedata = { group = "androidx.lifecycle", name = "lifecycle-livedata", version.ref = "androidxLifecycleVersion" } +lifecycleLivedataKtx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidxLifecycleVersion" } +lifecycleProcess = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidxLifecycleVersion" } +lifecycleViewmodelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycleVersion" } +androidxActivity = { group = "androidx.activity", name = "activity", version.ref = "androidxActivityVersion" } +androidxActivityKtx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidxActivityVersion" } +androidxActivityCompose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivityVersion" } +androidxFragment = { group = "androidx.fragment", name = "fragment", version.ref = "androidxFragmentVersion"} +androidxFragmentKtx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidxFragmentVersion"} +androidxAppcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppcompatVersion" } +androidxAppcompatResources = { group = "androidx.appcompat", name = "appcompat-resources", version.ref = "androidxAppcompatVersion" } +androidxCardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidxCardviewVersion" } +androidxRecyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidxRecyclerviewVersion" } +googleMaterial = { group = "com.google.android.material", name = "material", version.ref = "googleMaterialVersion" } +googleFlexboxlayout = { group = "com.google.android.flexbox", name = "flexbox", version.ref = "googleFlexboxlayoutVersion" } +androidxPercentlayout = { group = "androidx.percentlayout", name = "percentlayout", version.ref = "androidxPercentlayoutVersion" } +androidxSwipeToRefresh = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "androidxSwipeToRefreshVersion" } +androidxPreference = { group = "androidx.preference", name = "preference", version.ref = "androidxPreferenceVersion" } +androidxWorkManagerRuntime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManagerVersion" } +androidxWorkManagerRuntimeKtx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManagerVersion" } +androidxWorkManagerTesting = { group = "androidx.work", name = "work-testing", version.ref = "androidxWorkManagerVersion" } +androidxConstraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintlayoutVersion" } + +androidVolley = { group = "com.android.volley", name = "volley", version.ref = "androidVolleyVersion" } +googlePlayReview = { group = "com.google.android.play", name = "review", version.ref ="googlePlayReviewVersion" } +googlePlayReviewKtx = { group = "com.google.android.play", name = "review-ktx", version.ref ="googlePlayReviewVersion" } +googlePlayServicesAuth = { group = "com.google.android.gms", name = "play-services-auth", version.ref ="googlePlayServicesAuthVersion" } +googleMLKitBarcodeScanningCommon = { group = "com.google.mlkit", name = "barcode-scanning-common", version.ref ="googleMLKitBarcodeScanningCommonVersion" } +googleMLKitTextRecognition = { group = "com.google.mlkit", name = "text-recognition", version.ref ="googleMLKitTextRecognitionVersion" } +googleMLKitBarcodeScanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref ="googleMLKitBarcodeScanningVersion" } + +androidxCamera = { group = "androidx.camera", name = "camera-camera2", version.ref ="androidxCameraVersion" } +androidxCameraLifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref ="androidxCameraVersion" } +androidxCameraView = { group = "androidx.camera", name = "camera-view", version.ref ="androidxCameraVersion" } +chrisbanesPhotoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoviewVersion" } + + + +eventBus = { group = "org.greenrobot", name = "eventbus", version.ref ="eventBusVersion" } +eventBusJava = { group = "org.greenrobot", name = "eventbus-java", version.ref ="eventBusVersion" } +androidInstallReferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref ="androidInstallReferrerVersion" } +squareupRetrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref ="squareupRetrofitVersion" } + +apacheCommonsText = { group = "org.apache.commons", name = "commons-text", version.ref ="apacheCommonsTextVersion" } +lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottieVersion" } +facebookShimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref ="facebookShimmerVersion" } + +ucrop = { module = "com.github.yalantis:ucrop", version.ref = "uCropVersion" } +glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glideVersion" } +glideVolleyIntegration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glideVersion" } +glideKsp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glideVersion" } +indexosMediaForMobileDomain = { group = "com.github.indexos.media-for-mobile", name = "domain", version.ref ="indexosMediaForMobileVersion" } +indexosMediaForMobileAndroid = { group = "com.github.indexos.media-for-mobile", name = "android", version.ref ="indexosMediaForMobileVersion" } +zendesk = { group = "com.zendesk", name = "support", version.ref ="zendeskVersion" } + + +kotlinxCoroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutinesVersion" } +kotlinxCoroutinesAndroid = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutinesVersion" } +kotlinxCoroutinesTest = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutinesVersion" } +mpAndroidChart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref ="philjayMpAndroidChartVersion" } +jsoup = { group = "org.jsoup", name = "jsoup", version.ref ="jsoupVersion" } +googleExoPlayer = { group = "com.google.android.exoplayer", name = "exoplayer", version.ref ="googleExoPlayerVersion" } +firebaseMessaging = { group = "com.google.firebase", name = "firebase-messaging" } +firebaseIid = { group = "com.google.firebase", name = "firebase-iid", version.ref ="firebaseIidVersion" } + +composeUiTestManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +composeUiTestJunit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +composeUiTooling = { group = "androidx.compose.ui", name = "ui-tooling" } + + +androidxComposeRuntime = { group = "androidx.compose.runtime", name = "runtime" } +androidxComposeRuntimeLivedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } +androidxComposeFoundation = { group = "androidx.compose.foundation", name = "foundation" } +androidxComposeFoundationLayout = { group = "androidx.compose.foundation", name = "foundation-layout" } +androidxComposeUi = { group = "androidx.compose.ui", name = "ui" } +androidxComposeUiGraphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidxComposeUiText = { group = "androidx.compose.ui", name = "ui-text" } +androidxComposeUiUnit = { group = "androidx.compose.ui", name = "ui-unit" } +androidxComposeUiToolingPreview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidxComposeMaterial = { group = "androidx.compose.material", name = "material" } +lottieCompose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottieVersion" } +androidxConstraintlayoutCompose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref ="androidxConstraintlayoutComposeVersion" } +coilCompose = { group = "io.coil-kt", name = "coil-compose", version.ref ="coilComposeVersion" } +androidxComposeMaterial3 = { group = "androidx.compose.material3", name = "material3", version.ref ="androidxComposeMaterial3Version" } +cascadeCompose = { group = "me.saket.cascade", name = "cascade-compose", version.ref ="cascadeComposeVersion" } +automatticTracks = { group = "com.automattic.tracks", name = "crashlogging", version.ref ="automatticTracksVersion" } +flipper = { group = "com.facebook.flipper", name = "flipper", version.ref ="flipperVersion" } +flipperNoop = { group = "com.facebook.flipper", name = "flipper-noop", version.ref ="flipperVersion" } +flipperNetworkPlugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref ="flipperVersion" } +soLoader = { group = "com.facebook.soloader", name = "soloader", version.ref ="soLoaderVersion" } + +junit = { group = "junit", name = "junit", version.ref ="junitVersion" } +assertj = { group = "org.assertj", name = "assertj-core", version.ref ="assertjVersion" } +mockitoKotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlinVersion" } +mockitoAndroid = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroidVersion" } +androidxTestEspressoCore = { group = "androidx.test.espresso", name = "espresso-core", version.ref ="androidxTestEspressoVersion" } +androidxTestEspressoContrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref ="androidxTestEspressoVersion" } +androidxTestEspressoAccessibility = { group = "androidx.test.espresso", name = "espresso-accessibility", version.ref ="androidxTestEspressoVersion" } +androidxTestUiAutomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref ="androidxTestUiAutomatorVersion" } +squareupMockWebServer = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref ="squareupMockWebServerVersion" } +wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremockVersion" } +wiremockHttpClient = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClientVersion" } +androidxTestCoreRunner = { group = "androidx.test", name = "runner", version.ref ="androidxTestCoreVersion" } +androidxTestCoreRules = { group = "androidx.test", name = "rules", version.ref ="androidxTestCoreVersion" } +androidxTestExtJunit = { group = "androidx.test.ext", name = "junit", version.ref ="androidxTestExtJunitVersion" } +screengrab = { group = "tools.fastlane", name = "screengrab", version.ref ="screengrabVersion" } + + +facebookReactHermesAndroid = { group = "com.facebook.react", name = "hermes-android", version.ref ="facebookReactVersion" } +facebookReactAndroid = { group = "com.facebook.react", name = "react-android", version.ref ="facebookReactVersion" } +androidxViewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref ="androidxViewpager2Version" } +squareupKotlinPoet = { group = "com.squareup", name = "kotlinpoet", version.ref ="squareupKotlinPoetVersion" } +squareupKotlinPoetKsp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref ="squareupKotlinPoetVersion" } + + + + + + + + + + + + + + +[plugins] + diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle index d3e8edf28570..c39ff68859f5 100644 --- a/libs/analytics/build.gradle +++ b/libs/analytics/build.gradle @@ -16,8 +16,7 @@ repositories { dependencies { implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion" implementation "org.wordpress:utils:$wordPressUtilsVersion" - - implementation "androidx.preference:preference:$androidxPreferenceVersion" + implementation libs.androidxPreference lintChecks "org.wordpress:lint:$wordPressLintVersion" } diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index d50c03155102..7594a257afdc 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -80,8 +80,8 @@ dependencies { } } - implementation "com.facebook.react:hermes-android:$facebookReactVersion" - implementation "com.facebook.react:react-android:$facebookReactVersion" + implementation libs.facebookReactHermesAndroid + implementation libs.facebookReactAndroid // This dependency will be substituted if the `local-builds.gradle` file contains // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file. @@ -95,17 +95,16 @@ dependencies { } implementation "org.wordpress:utils:$wordPressUtilsVersion" - - implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion" - implementation "androidx.core:core:$androidxCoreVersion" - implementation "androidx.fragment:fragment:$androidxFragmentVersion" - implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" - implementation "androidx.preference:preference:$androidxPreferenceVersion" - implementation "com.google.android.material:material:$googleMaterialVersion" - implementation "com.android.volley:volley:$androidVolleyVersion" - implementation "com.google.code.gson:gson:$googleGsonVersion" + implementation libs.lifecycleCommon + implementation libs.lifecycleRuntime + implementation libs.lifecycleLivedataCore + implementation libs.androidxCore + implementation libs.androidxFragment + implementation libs.androidxAppcompat + implementation libs.androidxPreference + implementation libs.googleMaterial + implementation libs.androidVolley + implementation libs.googleGson implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" lintChecks "org.wordpress:lint:$wordPressLintVersion" diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 2cdd7f6bf40f..15d87251c17e 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -45,23 +45,26 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation(libs.androidxCore) + implementation libs.androidxActivity + implementation libs.androidxActivityKtx + implementation libs.androidxFragment + implementation libs.androidxAppcompat + implementation libs.androidxRecyclerview - implementation "androidx.core:core:$androidxCoreVersion" - implementation "androidx.activity:activity:$androidxActivityVersion" - implementation "androidx.activity:activity-ktx:$androidxActivityVersion" - implementation "androidx.fragment:fragment:$androidxFragmentVersion" - implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" - implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" - implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" - implementation "androidx.viewpager2:viewpager2:$androidxViewpager2Version" - implementation "com.google.android.material:material:$googleMaterialVersion" + + implementation libs.androidxConstraintLayout + implementation libs.androidxViewpager2 + implementation libs.googleMaterial implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion" implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion" - implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-viewmodel:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion" + implementation libs.lifecycleCommon + implementation libs.lifecycleRuntime + implementation libs.lifecycleViewmodel + implementation libs.lifecycleViewmodelSavedstate + implementation libs.lifecycleLivedataCore + + implementation ("com.github.yalantis:ucrop:$uCropVersion") { exclude group: 'com.squareup.okhttp3' exclude group: 'androidx.core', module: 'core' @@ -69,16 +72,17 @@ dependencies { exclude group: 'androidx.appcompat', module: 'appcompat' } - 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.mockitoKotlin + testImplementation libs.junit + testImplementation libs.assertj + + testImplementation(libs.androidxCoreTesting, { 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' }) - androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion" + androidTestImplementation libs.androidxTestExtJunit androidTestImplementation("androidx.test.espresso:espresso-core:$androidxTestEspressoVersion") { version { strictly androidxTestEspressoVersion diff --git a/libs/mocks/build.gradle b/libs/mocks/build.gradle index a6ee6d448194..fe630b4c526f 100644 --- a/libs/mocks/build.gradle +++ b/libs/mocks/build.gradle @@ -18,11 +18,11 @@ android { } dependencies { - implementation("com.github.tomakehurst:wiremock:$wiremockVersion") { + implementation(libs.wiremock) { 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' } - implementation "org.apache.httpcomponents:httpclient-android:$wiremockHttpClientVersion" + implementation libs.wiremockHttpClient } diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle index 457a92785de9..0444ef6b3f53 100644 --- a/libs/networking/build.gradle +++ b/libs/networking/build.gradle @@ -27,12 +27,12 @@ repositories { } dependencies { - implementation ("com.automattic:rest:$automatticRestVersion") { + implementation (libs.automatticRest) { exclude group: 'com.mcxiaoke.volley' } implementation "org.wordpress:utils:$wordPressUtilsVersion" - implementation "com.android.volley:volley:$androidVolleyVersion" + implementation libs.androidVolley implementation "androidx.annotation:annotation:$androidxAnnotationVersion" lintChecks "org.wordpress:lint:$wordPressLintVersion" diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index 6baeb1bb411d..52a2be5edbfd 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -9,14 +9,14 @@ targetCompatibility = JavaVersion.VERSION_1_8 dependencies { implementation project(":libs:annotations") - implementation "com.squareup:kotlinpoet:$squareupKotlinPoetVersion" - implementation "com.squareup:kotlinpoet-ksp:$squareupKotlinPoetVersion" + implementation libs.squareupKotlinPoet + implementation libs.squareupKotlinPoetKsp implementation "com.google.devtools.ksp:symbol-processing-api:$gradle.ext.kspVersion" def kctVersion = "1.5.0" testImplementation "com.github.tschuchortdev:kotlin-compile-testing:$kctVersion" testImplementation "com.github.tschuchortdev:kotlin-compile-testing-ksp:$kctVersion" - testImplementation "junit:junit:$junitVersion" - testImplementation "org.assertj:assertj-core:$assertjVersion" + testImplementation libs.junit + testImplementation libs.assertj testImplementation "org.jetbrains.kotlin:kotlin-reflect:$gradle.ext.kotlinVersion" } From 6f2d69637ee837bf1012885794f4d323687c4445 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 09:05:22 +0530 Subject: [PATCH 002/117] Revert "Migrated Dependency to `Version Catlog`" This reverts commit 549f6797d154f7958ec8a14c25923fb144f04d22. --- WordPress/build.gradle | 231 ++++++++++++++++----------------- build.gradle | 70 +++++++++- gradle/libs.versions.toml | 220 ------------------------------- libs/analytics/build.gradle | 3 +- libs/editor/build.gradle | 25 ++-- libs/image-editor/build.gradle | 42 +++--- libs/mocks/build.gradle | 4 +- libs/networking/build.gradle | 4 +- libs/processors/build.gradle | 8 +- 9 files changed, 223 insertions(+), 384 deletions(-) delete mode 100644 gradle/libs.versions.toml diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 798e0ca18951..8ebe0ab44ae4 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -350,8 +350,8 @@ static def addBuildConfigFieldsFromPrefixedProperties(variant, properties, prefi } dependencies { - implementation libs.androidxWebkit - implementation libs.androidxNavigation + implementation 'androidx.webkit:webkit:1.11.0' + implementation "androidx.navigation:navigation-compose:$androidxComposeNavigationVersion" compileOnly project(path: ':libs:annotations') ksp project(':libs:processors') implementation (project(path:':libs:networking')) { @@ -390,88 +390,85 @@ dependencies { } } - implementation (libs.automatticRest) { + implementation ("com.automattic:rest:$automatticRestVersion") { exclude group: 'com.mcxiaoke.volley' } - implementation libs.wordPressPersistentEditText + implementation "org.wordpress:persistentedittext:$wordPressPersistentEditTextVersion" implementation "$gradle.ext.gravatarBinaryPath:$gravatarVersion" - - implementation libs.googlePlayInAppUpdate - implementation libs.googlePlayInAppKtxUpdate - - implementation libs.androidxCoreCommon - implementation libs.androidxCoreRuntime - implementation libs.googleGson - implementation libs.androidxCore - implementation libs.androidxCoreKtx - implementation libs.lifecycleCommon - implementation libs.lifecycleRuntime - implementation libs.lifecycleRuntimeKtx - implementation libs.androidxActivity - implementation libs.androidxActivityKtx - implementation libs.androidxActivityCompose - - implementation libs.androidxFragment - implementation libs.androidxFragmentKtx - implementation libs.androidxAppcompat - implementation libs.androidxAppcompatResources - implementation libs.androidxCardview - implementation libs.androidxRecyclerview - implementation libs.googleMaterial - - implementation libs.googleFlexboxlayout - implementation libs.androidxPercentlayout - implementation libs.androidxSwipeToRefresh - implementation libs.androidxPreference - implementation libs.androidxWorkManagerRuntime - implementation libs.androidxWorkManagerRuntimeKtx - implementation libs.androidxConstraintLayout - implementation libs.lifecycleViewmodel - implementation libs.lifecycleViewmodelKtx - implementation libs.lifecycleLivedata - implementation libs.lifecycleLivedataCore - implementation libs.lifecycleLivedataKtx - implementation libs.lifecycleProcess - implementation libs.androidVolley - implementation libs.googlePlayReview - implementation libs.googlePlayReviewKtx - - implementation libs.googlePlayServicesAuth - implementation libs.googleMLKitBarcodeScanningCommon - implementation libs.googleMLKitTextRecognition - implementation libs.googleMLKitBarcodeScanning + implementation "com.google.android.play:app-update:$googlePlayInAppUpdateVersion" + implementation "com.google.android.play:app-update-ktx:$googlePlayInAppUpdateVersion" + + implementation "androidx.arch.core:core-common:$androidxArchCoreVersion" + implementation "androidx.arch.core:core-runtime:$androidxArchCoreVersion" + implementation "com.google.code.gson:gson:$googleGsonVersion" + implementation "androidx.core:core:$androidxCoreVersion" + implementation "androidx.core:core-ktx:$androidxCoreVersion" + implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidxLifecycleVersion" + implementation "androidx.activity:activity:$androidxActivityVersion" + implementation "androidx.activity:activity-ktx:$androidxActivityVersion" + implementation "androidx.activity:activity-compose:$androidxActivityVersion" + implementation "androidx.fragment:fragment:$androidxFragmentVersion" + implementation "androidx.fragment:fragment-ktx:$androidxFragmentVersion" + implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" + implementation "androidx.appcompat:appcompat-resources:$androidxAppcompatVersion" + implementation "androidx.cardview:cardview:$androidxCardviewVersion" + implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" + implementation "com.google.android.material:material:$googleMaterialVersion" + implementation "com.google.android.flexbox:flexbox:$googleFlexboxlayoutVersion" + implementation "androidx.percentlayout:percentlayout:$androidxPercentlayoutVersion" + implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeToRefreshVersion" + implementation "androidx.preference:preference:$androidxPreferenceVersion" + implementation "androidx.work:work-runtime:$androidxWorkManagerVersion" + implementation "androidx.work:work-runtime-ktx:$androidxWorkManagerVersion" + implementation "androidx.webkit:webkit:$androidxWebkitVersion" + implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" + implementation "androidx.lifecycle:lifecycle-viewmodel:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-livedata:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-process:$androidxLifecycleVersion" + implementation "com.android.volley:volley:$androidVolleyVersion" + implementation "com.google.android.play:review:$googlePlayReviewVersion" + implementation "com.google.android.play:review-ktx:$googlePlayReviewVersion" + implementation "com.google.android.gms:play-services-auth:$googlePlayServicesAuthVersion" + implementation "com.google.mlkit:barcode-scanning-common:$googleMLKitBarcodeScanningCommonVersion" + implementation "com.google.mlkit:text-recognition:$googleMLKitTextRecognitionVersion" + implementation "com.google.mlkit:barcode-scanning:$googleMLKitBarcodeScanningVersion" // CameraX - implementation libs.androidxCamera - implementation libs.androidxCameraLifecycle - implementation libs.androidxCameraView - - implementation libs.chrisbanesPhotoview - implementation libs.androidInstallReferrer - implementation libs.eventBus - implementation libs.eventBusJava - implementation libs.squareupRetrofit - implementation libs.apacheCommonsText - implementation libs.lottie - implementation libs.facebookShimmer - implementation (libs.ucrop) { + implementation "androidx.camera:camera-camera2:$androidxCameraVersion" + implementation "androidx.camera:camera-lifecycle:$androidxCameraVersion" + implementation "androidx.camera:camera-view:$androidxCameraVersion" + + implementation "com.android.installreferrer:installreferrer:$androidInstallReferrerVersion" + implementation "com.github.chrisbanes:PhotoView:$chrisbanesPhotoviewVersion" + implementation "org.greenrobot:eventbus:$eventBusVersion" + implementation "org.greenrobot:eventbus-java:$eventBusVersion" + implementation "com.squareup.retrofit2:retrofit:$squareupRetrofitVersion" + implementation "org.apache.commons:commons-text:$apacheCommonsTextVersion" + implementation "com.airbnb.android:lottie:$lottieVersion" + implementation "com.facebook.shimmer:shimmer:$facebookShimmerVersion" + implementation ("com.github.yalantis:ucrop:$uCropVersion") { exclude group: 'androidx.core', module: 'core' exclude group: 'androidx.constraintlayout', module: 'constraintlayout' exclude group: 'androidx.appcompat', module: 'appcompat' } - implementation libs.glide - ksp libs.glideKsp - implementation libs.glideVolleyIntegration - implementation libs.indexosMediaForMobileDomain - implementation libs.indexosMediaForMobileAndroid - implementation libs.zendesk + implementation "com.github.bumptech.glide:glide:$glideVersion" + ksp "com.github.bumptech.glide:ksp:$glideVersion" + implementation "com.github.bumptech.glide:volley-integration:$glideVersion" + implementation "com.github.indexos.media-for-mobile:domain:$indexosMediaForMobileVersion" + 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 libs.kotlinxCoroutinesCore - implementation libs.kotlinxCoroutinesAndroid - implementation libs.mpAndroidChart - implementation libs.jsoup - implementation (libs.googleExoPlayer) { + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion" + implementation "com.github.PhilJay:MPAndroidChart:$philjayMpAndroidChartVersion" + implementation "org.jsoup:jsoup:$jsoupVersion" + implementation ("com.google.android.exoplayer:exoplayer:$googleExoPlayerVersion") { exclude group: 'com.android.support', module: 'support-annotations' } implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion" @@ -479,30 +476,30 @@ dependencies { implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion" ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion" - testImplementation(libs.androidxCoreTesting, { + testImplementation("androidx.arch.core:core-testing:$androidxArchCoreVersion", { 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' }) - testImplementation libs.junit - testImplementation libs.mockitoKotlin + testImplementation "junit:junit:$junitVersion" + testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" - testImplementation libs.assertj - testImplementation libs.kotlinxCoroutinesTest + testImplementation "org.assertj:assertj-core:$assertjVersion" + testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion" androidTestImplementation project(path:':libs:mocks') - androidTestImplementation libs.mockitoAndroid - androidTestImplementation libs.mockitoKotlin - androidTestImplementation libs.squareupMockWebServer - androidTestImplementation libs.androidxTestUiAutomator + androidTestImplementation "org.mockito:mockito-android:$mockitoAndroidVersion" + androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + androidTestImplementation "com.squareup.okhttp3:mockwebserver:$squareupMockWebServerVersion" + androidTestImplementation "androidx.test.uiautomator:uiautomator:$androidxTestUiAutomatorVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$androidxTestEspressoVersion", { version { strictly androidxTestEspressoVersion } exclude group: 'com.android.support', module: 'support-annotations' } - androidTestImplementation(libs.androidxTestEspressoContrib) { + androidTestImplementation("androidx.test.espresso:espresso-contrib:$androidxTestEspressoVersion") { version { strictly androidxTestEspressoVersion } @@ -510,26 +507,26 @@ dependencies { exclude group: 'com.android.support', module: 'support-v4' exclude module: 'recyclerview-v7' } - androidTestImplementation(libs.androidxTestEspressoAccessibility) { + androidTestImplementation("androidx.test.espresso:espresso-accessibility:$androidxTestEspressoVersion") { version { strictly androidxTestEspressoVersion } } - androidTestImplementation(libs.wiremock) { + androidTestImplementation("com.github.tomakehurst:wiremock:$wiremockVersion") { 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' } - androidTestImplementation libs.wiremockHttpClient - androidTestImplementation libs.androidxTestCoreRunner - androidTestImplementation libs.androidxTestCoreRules - androidTestImplementation libs.androidxTestExtJunit - androidTestImplementation libs.screengrab, { + androidTestImplementation "org.apache.httpcomponents:httpclient-android:$wiremockHttpClientVersion" + androidTestImplementation "androidx.test:runner:$androidxTestCoreVersion" + androidTestImplementation "androidx.test:rules:$androidxTestCoreVersion" + androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion" + androidTestImplementation "tools.fastlane:screengrab:$screengrabVersion", { exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18' } androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing - androidTestImplementation libs.androidxWorkManagerTesting + androidTestImplementation "androidx.work:work-testing:$androidxWorkManagerVersion" androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion" kspAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion" // Enables Java 8+ API desugaring support @@ -540,52 +537,52 @@ dependencies { def firebaseBom = platform("com.google.firebase:firebase-bom:$firebaseBomVersion") implementation(firebaseBom) // Firebase - Main - implementation libs.firebaseMessaging + implementation "com.google.firebase:firebase-messaging" // Firebase - Deprecated - implementation libs.firebaseIid + implementation "com.google.firebase:firebase-iid:$firebaseIidVersion" // Jetpack Compose def composeBom = platform("androidx.compose:compose-bom:$androidxComposeBomVersion") implementation(composeBom) androidTestImplementation(composeBom) // - Jetpack Compose - Android Studio - debugImplementation libs.composeUiTestManifest - debugImplementation libs.composeUiTooling + debugImplementation "androidx.compose.ui:ui-test-manifest" + debugImplementation "androidx.compose.ui:ui-tooling" // - Jetpack Compose - Main - implementation libs.androidxComposeRuntime - implementation libs.androidxComposeRuntimeLivedata - implementation libs.androidxComposeFoundation - implementation libs.androidxComposeFoundationLayout - implementation libs.androidxComposeUi - implementation libs.androidxComposeUiGraphics - implementation libs.androidxComposeUiText - implementation libs.androidxComposeUiUnit - implementation libs.androidxComposeUiToolingPreview - implementation libs.androidxComposeMaterial + implementation "androidx.compose.runtime:runtime" + implementation "androidx.compose.runtime:runtime-livedata" + implementation "androidx.compose.foundation:foundation" + implementation "androidx.compose.foundation:foundation-layout" + implementation "androidx.compose.ui:ui" + implementation "androidx.compose.ui:ui-graphics" + implementation "androidx.compose.ui:ui-text" + implementation "androidx.compose.ui:ui-unit" + implementation "androidx.compose.ui:ui-tooling-preview" + implementation "androidx.compose.material:material" // - Jetpack Compose - AndroidX - implementation libs.lifecycleViewmodelCompose - implementation libs.androidxConstraintlayoutCompose + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$androidxLifecycleVersion" + implementation "androidx.constraintlayout:constraintlayout-compose:$androidxConstraintlayoutComposeVersion" // - Jetpack Compose - Other - implementation libs.coilCompose - implementation libs.lottieCompose + implementation "io.coil-kt:coil-compose:$coilComposeVersion" + implementation "com.airbnb.android:lottie-compose:$lottieVersion" // - Jetpack Compose - UI Tests - androidTestImplementation libs.composeUiTestJunit4 - implementation libs.androidxComposeMaterial3 + androidTestImplementation "androidx.compose.ui:ui-test-junit4" + implementation "androidx.compose.material3:material3:$androidxComposeMaterial3Version" // Cascade - Compose nested menu - implementation libs.cascadeCompose + implementation "me.saket.cascade:cascade-compose:2.3.0" - implementation libs.automatticTracks + implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" // - Flipper - debugImplementation (libs.flipper) { + debugImplementation ("com.facebook.flipper:flipper:$flipperVersion") { exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm' } - debugImplementation libs.soLoader - debugImplementation (libs.flipperNetworkPlugin){ + debugImplementation "com.facebook.soloader:soloader:$soLoaderVersion" + debugImplementation ("com.facebook.flipper:flipper-network-plugin:$flipperVersion"){ exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm' } - releaseImplementation libs.flipperNoop + releaseImplementation "com.facebook.flipper:flipper-noop:$flipperVersion" } configurations.all { diff --git a/build.gradle b/build.gradle index 5b1ca8099ba1..843bcfddaf10 100644 --- a/build.gradle +++ b/build.gradle @@ -22,12 +22,15 @@ ext { ext { // libs automatticAboutVersion = '1.4.0' + automatticRestVersion = '1.0.8' automatticTracksVersion = '5.1.0' gutenbergMobileVersion = 'v1.121.0-alpha1' wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' wordPressLoginVersion = '1.16.0' + wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.14.0' + indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' gravatarVersion = '1.0.0' // debug @@ -35,18 +38,79 @@ ext { soLoaderVersion = '0.10.5' // main + androidInstallReferrerVersion = '2.2' + 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' - androidxGridlayoutVersion = '1.0.0' // unused needs verify? + androidxComposeNavigationVersion = '2.7.6' + androidxCardviewVersion = '1.0.0' + androidxConstraintlayoutVersion = '2.1.4' + androidxConstraintlayoutComposeVersion = '1.0.1' + androidxCoreVersion = '1.10.0' + androidxActivityVersion = '1.8.0' + androidxFragmentVersion = '1.6.2' + androidxGridlayoutVersion = '1.0.0' + androidxLifecycleVersion = '2.6.2' + androidxPercentlayoutVersion = '1.0.0' + androidxPreferenceVersion = '1.2.0' + androidxRecyclerviewVersion = '1.3.0' + androidxSwipeToRefreshVersion = '1.1.0' + androidxViewpager2Version = '1.0.0' + androidxWorkManagerVersion = "2.9.0" + androidxWebkitVersion = '1.11.0' + androidxComposeMaterial3Version = '1.1.1' + apacheCommonsTextVersion = '1.10.0' + coilComposeVersion = '2.4.0' + chrisbanesPhotoviewVersion = '2.3.0' + eventBusVersion = '3.3.1' + facebookShimmerVersion = '0.5.0' firebaseBomVersion = '32.1.0' - googleAutoServiceVersion = '1.0.1' // unused needs verify? - googlePlayServicesCodeScannerVersion = '16.0.0-beta3' // unused needs verify? + firebaseIidVersion = '21.1.0' + glideVersion = '4.16.0' + googleAutoServiceVersion = '1.0.1' + googleExoPlayerVersion = '2.13.3' + googleFlexboxlayoutVersion = '3.0.0' + googleGsonVersion = '2.10.1' + googleMaterialVersion = '1.9.0' + + googleMLKitBarcodeScanningVersion = '17.2.0' + googleMLKitBarcodeScanningCommonVersion = '17.0.0' + googleMLKitTextRecognitionVersion = '16.0.0' + googlePlayReviewVersion = '2.0.1' + googlePlayServicesAuthVersion = '20.4.1' + googlePlayServicesCodeScannerVersion = '16.0.0-beta3' + jsoupVersion = '1.16.2' + kotlinxCoroutinesVersion = '1.7.3' + lottieVersion = '6.1.0' + philjayMpAndroidChartVersion = 'v3.1.0' + squareupKotlinPoetVersion = '1.16.0' + squareupRetrofitVersion = '2.9.0' uCropVersion = '2.2.9' + zendeskVersion = '5.1.2' + googlePlayInAppUpdateVersion = '2.1.0' + + // react native + facebookReactVersion = '0.73.3' + + // test + assertjVersion = '3.23.1' + junitVersion = '4.13.2' + mockitoAndroidVersion = '4.5.1' + mockitoKotlinVersion = '4.1.0' // android test + androidxTestCoreVersion = '1.5.0' androidxTestEspressoVersion = '3.4.0' + androidxTestExtJunitVersion = '1.1.5' + androidxTestUiAutomatorVersion = '2.2.0' screengrabVersion = '2.1.1' + squareupMockWebServerVersion = '4.12.0' + wiremockVersion = '2.26.3' + wiremockHttpClientVersion = '4.3.5.1' // other androidDesugarVersion = '2.0.4' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml deleted file mode 100644 index 13fc00938dfd..000000000000 --- a/gradle/libs.versions.toml +++ /dev/null @@ -1,220 +0,0 @@ -[versions] -#libs -webkit = '1.11.0' -androidxComposeNavigationVersion = '2.7.6' -automatticRestVersion = '1.0.8' -wordPressPersistentEditTextVersion = '1.0.2' -googlePlayInAppUpdateVersion = '2.1.0' -googlePlayInAppUpdateKtxVersion = '2.1.0' -androidxArchCoreVersion = '2.2.0' -googleGsonVersion = '2.10.1' -androidxCoreVersion = '1.10.0' -androidxLifecycleVersion = '2.6.2' -androidxActivityVersion = '1.8.0' -androidxFragmentVersion = '1.6.2' -androidxAppcompatVersion = '1.6.1' -androidxCardviewVersion = '1.0.0' -androidxRecyclerviewVersion = '1.3.0' -googleMaterialVersion = '1.9.0' -androidxConstraintlayoutVersion = '2.1.4' -googleFlexboxlayoutVersion = '3.0.0' -androidxPercentlayoutVersion = '1.0.0' -androidxSwipeToRefreshVersion = '1.1.0' -androidxPreferenceVersion = '1.2.0' -androidxWorkManagerVersion = "2.9.0" -androidVolleyVersion = '1.2.1' -googlePlayReviewVersion = '2.0.1' -androidxCameraVersion = '1.3.4' -googlePlayServicesAuthVersion = '20.4.1' -googleMLKitBarcodeScanningCommonVersion = '17.0.0' -googleMLKitTextRecognitionVersion = '16.0.0' -googleMLKitBarcodeScanningVersion = '17.2.0' -eventBusVersion = '3.3.1' -glideVersion = '4.16.0' -androidInstallReferrerVersion = '2.2' -squareupRetrofitVersion = '2.9.0' -apacheCommonsTextVersion = '1.10.0' -lottieVersion = '6.1.0' -facebookShimmerVersion = '0.5.0' -uCropVersion = '2.2.9' -indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' -zendeskVersion = '5.1.2' -kotlinxCoroutinesVersion = '1.7.3' -philjayMpAndroidChartVersion = 'v3.1.0' -jsoupVersion = '1.16.2' -googleExoPlayerVersion = '2.13.3' -firebaseIidVersion = '21.1.0' -androidxConstraintlayoutComposeVersion = '1.0.1' -coilComposeVersion = '2.4.0' -androidxComposeMaterial3Version = '1.1.1' -cascadeComposeVersion = '2.3.0' -automatticTracksVersion = '5.1.0' -flipperVersion = '0.245.0' -soLoaderVersion = '0.10.5' -junitVersion = '4.13.2' -mockitoAndroidVersion = '4.5.1' -mockitoKotlinVersion = '4.1.0' -chrisbanesPhotoviewVersion = '2.3.0' -assertjVersion = '3.23.1' -androidxTestEspressoVersion = '3.4.0' -androidxTestUiAutomatorVersion = '2.2.0' -squareupMockWebServerVersion = '4.12.0' -wiremockVersion = '2.26.3' -wiremockHttpClientVersion = '4.3.5.1' -androidxTestCoreVersion = '1.5.0' -androidxTestExtJunitVersion = '1.1.5' -screengrabVersion = '2.1.1' -facebookReactVersion = '0.73.3' -androidxViewpager2Version = '1.0.0' -squareupKotlinPoetVersion = '1.16.0' - - -[libraries] -androidxWebkit = { group = "androidx.webkit", name = "webkit", version.ref = "webkit" } -androidxNavigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigationVersion" } -automatticRest = { group = "com.automattic", name = "rest", version.ref = "automatticRestVersion" } -wordPressPersistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditTextVersion" } -googlePlayInAppUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayInAppUpdateVersion" } -googlePlayInAppKtxUpdate = { group = "com.google.android.play", name = "app-update-ktx", version.ref = "googlePlayInAppUpdateKtxVersion" } -androidxCoreCommon = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCoreVersion" } -androidxCoreRuntime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCoreVersion" } -androidxCoreTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidxArchCoreVersion" } -googleGson = { group = "com.google.code.gson", name = "gson", version.ref = "googleGsonVersion" } -androidxCore = { group = "androidx.core", name = "core", version.ref = "androidxCoreVersion" } -androidxCoreKtx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCoreVersion" } -lifecycleCommon = { group = "androidx.lifecycle", name = "lifecycle-common", version.ref = "androidxLifecycleVersion" } -lifecycleRuntime = { group = "androidx.lifecycle", name = "lifecycle-runtime", version.ref = "androidxLifecycleVersion" } -lifecycleRuntimeKtx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycleVersion" } -lifecycleViewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidxLifecycleVersion" } -lifecycleViewmodelKtx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycleVersion" } -lifecycleViewmodelSavedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycleVersion" } -lifecycleLivedataCore = { group = "androidx.lifecycle", name = "lifecycle-livedata-core", version.ref = "androidxLifecycleVersion" } -lifecycleLivedata = { group = "androidx.lifecycle", name = "lifecycle-livedata", version.ref = "androidxLifecycleVersion" } -lifecycleLivedataKtx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidxLifecycleVersion" } -lifecycleProcess = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidxLifecycleVersion" } -lifecycleViewmodelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycleVersion" } -androidxActivity = { group = "androidx.activity", name = "activity", version.ref = "androidxActivityVersion" } -androidxActivityKtx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidxActivityVersion" } -androidxActivityCompose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivityVersion" } -androidxFragment = { group = "androidx.fragment", name = "fragment", version.ref = "androidxFragmentVersion"} -androidxFragmentKtx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidxFragmentVersion"} -androidxAppcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppcompatVersion" } -androidxAppcompatResources = { group = "androidx.appcompat", name = "appcompat-resources", version.ref = "androidxAppcompatVersion" } -androidxCardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidxCardviewVersion" } -androidxRecyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidxRecyclerviewVersion" } -googleMaterial = { group = "com.google.android.material", name = "material", version.ref = "googleMaterialVersion" } -googleFlexboxlayout = { group = "com.google.android.flexbox", name = "flexbox", version.ref = "googleFlexboxlayoutVersion" } -androidxPercentlayout = { group = "androidx.percentlayout", name = "percentlayout", version.ref = "androidxPercentlayoutVersion" } -androidxSwipeToRefresh = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "androidxSwipeToRefreshVersion" } -androidxPreference = { group = "androidx.preference", name = "preference", version.ref = "androidxPreferenceVersion" } -androidxWorkManagerRuntime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManagerVersion" } -androidxWorkManagerRuntimeKtx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManagerVersion" } -androidxWorkManagerTesting = { group = "androidx.work", name = "work-testing", version.ref = "androidxWorkManagerVersion" } -androidxConstraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintlayoutVersion" } - -androidVolley = { group = "com.android.volley", name = "volley", version.ref = "androidVolleyVersion" } -googlePlayReview = { group = "com.google.android.play", name = "review", version.ref ="googlePlayReviewVersion" } -googlePlayReviewKtx = { group = "com.google.android.play", name = "review-ktx", version.ref ="googlePlayReviewVersion" } -googlePlayServicesAuth = { group = "com.google.android.gms", name = "play-services-auth", version.ref ="googlePlayServicesAuthVersion" } -googleMLKitBarcodeScanningCommon = { group = "com.google.mlkit", name = "barcode-scanning-common", version.ref ="googleMLKitBarcodeScanningCommonVersion" } -googleMLKitTextRecognition = { group = "com.google.mlkit", name = "text-recognition", version.ref ="googleMLKitTextRecognitionVersion" } -googleMLKitBarcodeScanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref ="googleMLKitBarcodeScanningVersion" } - -androidxCamera = { group = "androidx.camera", name = "camera-camera2", version.ref ="androidxCameraVersion" } -androidxCameraLifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref ="androidxCameraVersion" } -androidxCameraView = { group = "androidx.camera", name = "camera-view", version.ref ="androidxCameraVersion" } -chrisbanesPhotoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoviewVersion" } - - - -eventBus = { group = "org.greenrobot", name = "eventbus", version.ref ="eventBusVersion" } -eventBusJava = { group = "org.greenrobot", name = "eventbus-java", version.ref ="eventBusVersion" } -androidInstallReferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref ="androidInstallReferrerVersion" } -squareupRetrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref ="squareupRetrofitVersion" } - -apacheCommonsText = { group = "org.apache.commons", name = "commons-text", version.ref ="apacheCommonsTextVersion" } -lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottieVersion" } -facebookShimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref ="facebookShimmerVersion" } - -ucrop = { module = "com.github.yalantis:ucrop", version.ref = "uCropVersion" } -glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glideVersion" } -glideVolleyIntegration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glideVersion" } -glideKsp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glideVersion" } -indexosMediaForMobileDomain = { group = "com.github.indexos.media-for-mobile", name = "domain", version.ref ="indexosMediaForMobileVersion" } -indexosMediaForMobileAndroid = { group = "com.github.indexos.media-for-mobile", name = "android", version.ref ="indexosMediaForMobileVersion" } -zendesk = { group = "com.zendesk", name = "support", version.ref ="zendeskVersion" } - - -kotlinxCoroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutinesVersion" } -kotlinxCoroutinesAndroid = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutinesVersion" } -kotlinxCoroutinesTest = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutinesVersion" } -mpAndroidChart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref ="philjayMpAndroidChartVersion" } -jsoup = { group = "org.jsoup", name = "jsoup", version.ref ="jsoupVersion" } -googleExoPlayer = { group = "com.google.android.exoplayer", name = "exoplayer", version.ref ="googleExoPlayerVersion" } -firebaseMessaging = { group = "com.google.firebase", name = "firebase-messaging" } -firebaseIid = { group = "com.google.firebase", name = "firebase-iid", version.ref ="firebaseIidVersion" } - -composeUiTestManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -composeUiTestJunit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } -composeUiTooling = { group = "androidx.compose.ui", name = "ui-tooling" } - - -androidxComposeRuntime = { group = "androidx.compose.runtime", name = "runtime" } -androidxComposeRuntimeLivedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } -androidxComposeFoundation = { group = "androidx.compose.foundation", name = "foundation" } -androidxComposeFoundationLayout = { group = "androidx.compose.foundation", name = "foundation-layout" } -androidxComposeUi = { group = "androidx.compose.ui", name = "ui" } -androidxComposeUiGraphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidxComposeUiText = { group = "androidx.compose.ui", name = "ui-text" } -androidxComposeUiUnit = { group = "androidx.compose.ui", name = "ui-unit" } -androidxComposeUiToolingPreview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidxComposeMaterial = { group = "androidx.compose.material", name = "material" } -lottieCompose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottieVersion" } -androidxConstraintlayoutCompose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref ="androidxConstraintlayoutComposeVersion" } -coilCompose = { group = "io.coil-kt", name = "coil-compose", version.ref ="coilComposeVersion" } -androidxComposeMaterial3 = { group = "androidx.compose.material3", name = "material3", version.ref ="androidxComposeMaterial3Version" } -cascadeCompose = { group = "me.saket.cascade", name = "cascade-compose", version.ref ="cascadeComposeVersion" } -automatticTracks = { group = "com.automattic.tracks", name = "crashlogging", version.ref ="automatticTracksVersion" } -flipper = { group = "com.facebook.flipper", name = "flipper", version.ref ="flipperVersion" } -flipperNoop = { group = "com.facebook.flipper", name = "flipper-noop", version.ref ="flipperVersion" } -flipperNetworkPlugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref ="flipperVersion" } -soLoader = { group = "com.facebook.soloader", name = "soloader", version.ref ="soLoaderVersion" } - -junit = { group = "junit", name = "junit", version.ref ="junitVersion" } -assertj = { group = "org.assertj", name = "assertj-core", version.ref ="assertjVersion" } -mockitoKotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlinVersion" } -mockitoAndroid = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroidVersion" } -androidxTestEspressoCore = { group = "androidx.test.espresso", name = "espresso-core", version.ref ="androidxTestEspressoVersion" } -androidxTestEspressoContrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref ="androidxTestEspressoVersion" } -androidxTestEspressoAccessibility = { group = "androidx.test.espresso", name = "espresso-accessibility", version.ref ="androidxTestEspressoVersion" } -androidxTestUiAutomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref ="androidxTestUiAutomatorVersion" } -squareupMockWebServer = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref ="squareupMockWebServerVersion" } -wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremockVersion" } -wiremockHttpClient = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClientVersion" } -androidxTestCoreRunner = { group = "androidx.test", name = "runner", version.ref ="androidxTestCoreVersion" } -androidxTestCoreRules = { group = "androidx.test", name = "rules", version.ref ="androidxTestCoreVersion" } -androidxTestExtJunit = { group = "androidx.test.ext", name = "junit", version.ref ="androidxTestExtJunitVersion" } -screengrab = { group = "tools.fastlane", name = "screengrab", version.ref ="screengrabVersion" } - - -facebookReactHermesAndroid = { group = "com.facebook.react", name = "hermes-android", version.ref ="facebookReactVersion" } -facebookReactAndroid = { group = "com.facebook.react", name = "react-android", version.ref ="facebookReactVersion" } -androidxViewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref ="androidxViewpager2Version" } -squareupKotlinPoet = { group = "com.squareup", name = "kotlinpoet", version.ref ="squareupKotlinPoetVersion" } -squareupKotlinPoetKsp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref ="squareupKotlinPoetVersion" } - - - - - - - - - - - - - - -[plugins] - diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle index c39ff68859f5..d3e8edf28570 100644 --- a/libs/analytics/build.gradle +++ b/libs/analytics/build.gradle @@ -16,7 +16,8 @@ repositories { dependencies { implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion" implementation "org.wordpress:utils:$wordPressUtilsVersion" - implementation libs.androidxPreference + + implementation "androidx.preference:preference:$androidxPreferenceVersion" lintChecks "org.wordpress:lint:$wordPressLintVersion" } diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 7594a257afdc..d50c03155102 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -80,8 +80,8 @@ dependencies { } } - implementation libs.facebookReactHermesAndroid - implementation libs.facebookReactAndroid + implementation "com.facebook.react:hermes-android:$facebookReactVersion" + implementation "com.facebook.react:react-android:$facebookReactVersion" // This dependency will be substituted if the `local-builds.gradle` file contains // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file. @@ -95,16 +95,17 @@ dependencies { } implementation "org.wordpress:utils:$wordPressUtilsVersion" - implementation libs.lifecycleCommon - implementation libs.lifecycleRuntime - implementation libs.lifecycleLivedataCore - implementation libs.androidxCore - implementation libs.androidxFragment - implementation libs.androidxAppcompat - implementation libs.androidxPreference - implementation libs.googleMaterial - implementation libs.androidVolley - implementation libs.googleGson + + implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion" + implementation "androidx.core:core:$androidxCoreVersion" + implementation "androidx.fragment:fragment:$androidxFragmentVersion" + implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" + implementation "androidx.preference:preference:$androidxPreferenceVersion" + implementation "com.google.android.material:material:$googleMaterialVersion" + implementation "com.android.volley:volley:$androidVolleyVersion" + implementation "com.google.code.gson:gson:$googleGsonVersion" implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" lintChecks "org.wordpress:lint:$wordPressLintVersion" diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 15d87251c17e..2cdd7f6bf40f 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -45,26 +45,23 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation(libs.androidxCore) - implementation libs.androidxActivity - implementation libs.androidxActivityKtx - implementation libs.androidxFragment - implementation libs.androidxAppcompat - implementation libs.androidxRecyclerview - - implementation libs.androidxConstraintLayout - implementation libs.androidxViewpager2 - implementation libs.googleMaterial + implementation "androidx.core:core:$androidxCoreVersion" + implementation "androidx.activity:activity:$androidxActivityVersion" + implementation "androidx.activity:activity-ktx:$androidxActivityVersion" + implementation "androidx.fragment:fragment:$androidxFragmentVersion" + implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" + implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" + implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" + implementation "androidx.viewpager2:viewpager2:$androidxViewpager2Version" + implementation "com.google.android.material:material:$googleMaterialVersion" implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion" implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion" - implementation libs.lifecycleCommon - implementation libs.lifecycleRuntime - implementation libs.lifecycleViewmodel - implementation libs.lifecycleViewmodelSavedstate - implementation libs.lifecycleLivedataCore - - + implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-viewmodel:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$androidxLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion" implementation ("com.github.yalantis:ucrop:$uCropVersion") { exclude group: 'com.squareup.okhttp3' exclude group: 'androidx.core', module: 'core' @@ -72,17 +69,16 @@ dependencies { exclude group: 'androidx.appcompat', module: 'appcompat' } - testImplementation libs.mockitoKotlin - testImplementation libs.junit - testImplementation libs.assertj - - testImplementation(libs.androidxCoreTesting, { + testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + testImplementation "junit:junit:$junitVersion" + testImplementation "org.assertj:assertj-core:$assertjVersion" + testImplementation("androidx.arch.core:core-testing:$androidxArchCoreVersion", { 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' }) - androidTestImplementation libs.androidxTestExtJunit + androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion" androidTestImplementation("androidx.test.espresso:espresso-core:$androidxTestEspressoVersion") { version { strictly androidxTestEspressoVersion diff --git a/libs/mocks/build.gradle b/libs/mocks/build.gradle index fe630b4c526f..a6ee6d448194 100644 --- a/libs/mocks/build.gradle +++ b/libs/mocks/build.gradle @@ -18,11 +18,11 @@ android { } dependencies { - implementation(libs.wiremock) { + implementation("com.github.tomakehurst:wiremock:$wiremockVersion") { 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' } - implementation libs.wiremockHttpClient + implementation "org.apache.httpcomponents:httpclient-android:$wiremockHttpClientVersion" } diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle index 0444ef6b3f53..457a92785de9 100644 --- a/libs/networking/build.gradle +++ b/libs/networking/build.gradle @@ -27,12 +27,12 @@ repositories { } dependencies { - implementation (libs.automatticRest) { + implementation ("com.automattic:rest:$automatticRestVersion") { exclude group: 'com.mcxiaoke.volley' } implementation "org.wordpress:utils:$wordPressUtilsVersion" - implementation libs.androidVolley + implementation "com.android.volley:volley:$androidVolleyVersion" implementation "androidx.annotation:annotation:$androidxAnnotationVersion" lintChecks "org.wordpress:lint:$wordPressLintVersion" diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index 52a2be5edbfd..6baeb1bb411d 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -9,14 +9,14 @@ targetCompatibility = JavaVersion.VERSION_1_8 dependencies { implementation project(":libs:annotations") - implementation libs.squareupKotlinPoet - implementation libs.squareupKotlinPoetKsp + implementation "com.squareup:kotlinpoet:$squareupKotlinPoetVersion" + implementation "com.squareup:kotlinpoet-ksp:$squareupKotlinPoetVersion" implementation "com.google.devtools.ksp:symbol-processing-api:$gradle.ext.kspVersion" def kctVersion = "1.5.0" testImplementation "com.github.tschuchortdev:kotlin-compile-testing:$kctVersion" testImplementation "com.github.tschuchortdev:kotlin-compile-testing-ksp:$kctVersion" - testImplementation libs.junit - testImplementation libs.assertj + testImplementation "junit:junit:$junitVersion" + testImplementation "org.assertj:assertj-core:$assertjVersion" testImplementation "org.jetbrains.kotlin:kotlin-reflect:$gradle.ext.kotlinVersion" } From 642a52cbe3e0d5df73465dfb1e7be3c89f335c33 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 09:29:28 +0530 Subject: [PATCH 003/117] Deps: Migrated Webkit to Version Catlog Note that webkit dependency was declared twice so removed the duplicate --- WordPress/build.gradle | 3 +-- build.gradle | 1 - gradle/libs.versions.toml | 8 ++++++++ 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 8ebe0ab44ae4..3fa098a17ee5 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -350,7 +350,7 @@ static def addBuildConfigFieldsFromPrefixedProperties(variant, properties, prefi } dependencies { - implementation 'androidx.webkit:webkit:1.11.0' + implementation libs.androidx.webkit implementation "androidx.navigation:navigation-compose:$androidxComposeNavigationVersion" compileOnly project(path: ':libs:annotations') ksp project(':libs:processors') @@ -423,7 +423,6 @@ dependencies { implementation "androidx.preference:preference:$androidxPreferenceVersion" implementation "androidx.work:work-runtime:$androidxWorkManagerVersion" implementation "androidx.work:work-runtime-ktx:$androidxWorkManagerVersion" - implementation "androidx.webkit:webkit:$androidxWebkitVersion" implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" implementation "androidx.lifecycle:lifecycle-viewmodel:$androidxLifecycleVersion" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidxLifecycleVersion" diff --git a/build.gradle b/build.gradle index 843bcfddaf10..8d25ac78a19f 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,6 @@ ext { androidxSwipeToRefreshVersion = '1.1.0' androidxViewpager2Version = '1.0.0' androidxWorkManagerVersion = "2.9.0" - androidxWebkitVersion = '1.11.0' androidxComposeMaterial3Version = '1.1.1' apacheCommonsTextVersion = '1.10.0' coilComposeVersion = '2.4.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000000..51b6f8c1a963 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,8 @@ +[versions] +androidxWebkitVersion = '1.11.0' + +[libraries] +androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkitVersion"} + +[plugins] + From a3bdbc8c4116538cba9cb555df023d11cb905ac7 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 09:37:21 +0530 Subject: [PATCH 004/117] Deps: Migrated Compose Navigation to Version Catlog & Changed webkit Naming Convention --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 6 ++++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 3fa098a17ee5..a33f583ad13b 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -351,7 +351,7 @@ static def addBuildConfigFieldsFromPrefixedProperties(variant, properties, prefi dependencies { implementation libs.androidx.webkit - implementation "androidx.navigation:navigation-compose:$androidxComposeNavigationVersion" + implementation libs.androidx.navigation compileOnly project(path: ':libs:annotations') ksp project(':libs:processors') implementation (project(path:':libs:networking')) { diff --git a/build.gradle b/build.gradle index 8d25ac78a19f..16aadb5c51b6 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,6 @@ ext { androidxCameraVersion = '1.3.4' androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' - androidxComposeNavigationVersion = '2.7.6' androidxCardviewVersion = '1.0.0' androidxConstraintlayoutVersion = '2.1.4' androidxConstraintlayoutComposeVersion = '1.0.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 51b6f8c1a963..9e06ee358a41 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,10 @@ [versions] -androidxWebkitVersion = '1.11.0' +androidxComposeNavigation = '2.7.6' +androidxWebkit = '1.11.0' [libraries] -androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkitVersion"} +androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } +androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} [plugins] From a872bc23fca8cde189225c6110fbd24eb41fa370 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 09:46:57 +0530 Subject: [PATCH 005/117] Deps: Migrated `AutomatticRest` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/networking/build.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index a33f583ad13b..f0a3ebaee05a 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -390,7 +390,7 @@ dependencies { } } - implementation ("com.automattic:rest:$automatticRestVersion") { + implementation (libs.automattic.rest) { exclude group: 'com.mcxiaoke.volley' } implementation "org.wordpress:persistentedittext:$wordPressPersistentEditTextVersion" diff --git a/build.gradle b/build.gradle index 16aadb5c51b6..e71fd27da2e7 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,6 @@ ext { ext { // libs automatticAboutVersion = '1.4.0' - automatticRestVersion = '1.0.8' automatticTracksVersion = '5.1.0' gutenbergMobileVersion = 'v1.121.0-alpha1' wordPressAztecVersion = 'v2.1.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9e06ee358a41..d08ce185c6f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,11 @@ [versions] androidxComposeNavigation = '2.7.6' +automatticRest = '1.0.8' androidxWebkit = '1.11.0' [libraries] androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } +automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} [plugins] diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle index 457a92785de9..f88dff748c38 100644 --- a/libs/networking/build.gradle +++ b/libs/networking/build.gradle @@ -27,7 +27,7 @@ repositories { } dependencies { - implementation ("com.automattic:rest:$automatticRestVersion") { + implementation (libs.automattic.rest) { exclude group: 'com.mcxiaoke.volley' } implementation "org.wordpress:utils:$wordPressUtilsVersion" From 0906865f2b7d05b462e75cc1cd6acf0cbe6bcd1f Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 09:50:54 +0530 Subject: [PATCH 006/117] Deps: Migrated `wordPressPersistentEditText` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index f0a3ebaee05a..eccf6b78cca9 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -393,7 +393,7 @@ dependencies { implementation (libs.automattic.rest) { exclude group: 'com.mcxiaoke.volley' } - implementation "org.wordpress:persistentedittext:$wordPressPersistentEditTextVersion" + implementation libs.wordPress.persistentEditText implementation "$gradle.ext.gravatarBinaryPath:$gravatarVersion" implementation "com.google.android.play:app-update:$googlePlayInAppUpdateVersion" diff --git a/build.gradle b/build.gradle index e71fd27da2e7..3a640838e85d 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,6 @@ ext { wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' wordPressLoginVersion = '1.16.0' - wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.14.0' indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' gravatarVersion = '1.0.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d08ce185c6f7..489d4f48d879 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] androidxComposeNavigation = '2.7.6' +wordPressPersistentEditText = '1.0.2' automatticRest = '1.0.8' androidxWebkit = '1.11.0' @@ -7,6 +8,7 @@ androidxWebkit = '1.11.0' androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} +wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } [plugins] From ccc80add246f2cff62fe626944287aefa553d2c3 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 10:11:41 +0530 Subject: [PATCH 007/117] Reordered : versions & libraries in alphabetic order --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 489d4f48d879..537f63f90d90 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] androidxComposeNavigation = '2.7.6' -wordPressPersistentEditText = '1.0.2' -automatticRest = '1.0.8' androidxWebkit = '1.11.0' +automatticRest = '1.0.8' +wordPressPersistentEditText = '1.0.2' [libraries] androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } -automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} +automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } [plugins] From cd133070693c7fa375ac825bdc1143c67cb6f8e0 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 11:39:43 +0530 Subject: [PATCH 008/117] Deps: Migrated `googlePlayInAppUpdate` to Version Catalog --- WordPress/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index eccf6b78cca9..05431352288a 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -396,8 +396,8 @@ dependencies { implementation libs.wordPress.persistentEditText implementation "$gradle.ext.gravatarBinaryPath:$gravatarVersion" - implementation "com.google.android.play:app-update:$googlePlayInAppUpdateVersion" - implementation "com.google.android.play:app-update-ktx:$googlePlayInAppUpdateVersion" + implementation libs.android.appUpdate + implementation libs.android.appUpdateKtx implementation "androidx.arch.core:core-common:$androidxArchCoreVersion" implementation "androidx.arch.core:core-runtime:$androidxArchCoreVersion" diff --git a/build.gradle b/build.gradle index 3a640838e85d..7d25559e0216 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,6 @@ ext { squareupRetrofitVersion = '2.9.0' uCropVersion = '2.2.9' zendeskVersion = '5.1.2' - googlePlayInAppUpdateVersion = '2.1.0' // react native facebookReactVersion = '0.73.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 537f63f90d90..ddfce2ecc694 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,9 +2,12 @@ androidxComposeNavigation = '2.7.6' androidxWebkit = '1.11.0' automatticRest = '1.0.8' +googlePlayAppUpdate = '2.1.0' 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-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" } From 0026d91a5bdb61c8d592bb9afc90466aaaf5d40d Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 11:57:17 +0530 Subject: [PATCH 009/117] Deps: Migrated `androidxArchCore` to Version Catalog --- WordPress/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ libs/image-editor/build.gradle | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 05431352288a..ff705b9bee57 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -399,8 +399,8 @@ dependencies { implementation libs.android.appUpdate implementation libs.android.appUpdateKtx - implementation "androidx.arch.core:core-common:$androidxArchCoreVersion" - implementation "androidx.arch.core:core-runtime:$androidxArchCoreVersion" + implementation libs.androidx.coreCommon + implementation libs.androidx.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.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 7d25559e0216..bd28734cd605 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,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 ddfce2ecc694..1d888920ea4a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,5 @@ [versions] +androidxArchCore = '2.2.0' androidxComposeNavigation = '2.7.6' androidxWebkit = '1.11.0' automatticRest = '1.0.8' @@ -8,6 +9,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-coreCommon = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCore" } +androidx-coreRuntime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCore" } +androidx-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..fe1d5eb68883 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.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' From d514fcdea74b1a20bbee9b1262ceedc6d0b804b0 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 12:01:25 +0530 Subject: [PATCH 010/117] Deps: Migrated `gson` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/editor/build.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index ff705b9bee57..1da2b1379dff 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -401,7 +401,7 @@ dependencies { implementation libs.androidx.coreCommon implementation libs.androidx.coreRuntime - implementation "com.google.code.gson:gson:$googleGsonVersion" + implementation libs.google.gson implementation "androidx.core:core:$androidxCoreVersion" implementation "androidx.core:core-ktx:$androidxCoreVersion" implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" diff --git a/build.gradle b/build.gradle index bd28734cd605..b293d61b61ed 100644 --- a/build.gradle +++ b/build.gradle @@ -69,7 +69,6 @@ ext { googleAutoServiceVersion = '1.0.1' googleExoPlayerVersion = '2.13.3' googleFlexboxlayoutVersion = '3.0.0' - googleGsonVersion = '2.10.1' googleMaterialVersion = '1.9.0' googleMLKitBarcodeScanningVersion = '17.2.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1d888920ea4a..7dfdd0243065 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,6 +4,7 @@ androidxComposeNavigation = '2.7.6' androidxWebkit = '1.11.0' automatticRest = '1.0.8' googlePlayAppUpdate = '2.1.0' +gson = '2.10.1' wordPressPersistentEditText = '1.0.2' [libraries] @@ -15,6 +16,7 @@ androidx-coreTesting = { group = "androidx.arch.core", name = "core-testing", ve 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" } +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/editor/build.gradle b/libs/editor/build.gradle index d50c03155102..d9925028ed43 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -105,7 +105,7 @@ dependencies { implementation "androidx.preference:preference:$androidxPreferenceVersion" implementation "com.google.android.material:material:$googleMaterialVersion" implementation "com.android.volley:volley:$androidVolleyVersion" - implementation "com.google.code.gson:gson:$googleGsonVersion" + implementation libs.google.gson implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" lintChecks "org.wordpress:lint:$wordPressLintVersion" From d734d6de5a6a5dd34a66626e35709096ec3526f0 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 12:13:45 +0530 Subject: [PATCH 011/117] Deps: Migrated `androidxCore` to Version Catalog --- WordPress/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ libs/editor/build.gradle | 2 +- libs/image-editor/build.gradle | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 1da2b1379dff..81ac233c94d8 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -402,8 +402,8 @@ dependencies { implementation libs.androidx.coreCommon implementation libs.androidx.coreRuntime implementation libs.google.gson - implementation "androidx.core:core:$androidxCoreVersion" - implementation "androidx.core:core-ktx:$androidxCoreVersion" + implementation libs.androidx.core + implementation libs.androidx.core.ktx implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidxLifecycleVersion" diff --git a/build.gradle b/build.gradle index b293d61b61ed..0b7798da1a9c 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,6 @@ ext { androidxCardviewVersion = '1.0.0' androidxConstraintlayoutVersion = '2.1.4' androidxConstraintlayoutComposeVersion = '1.0.1' - androidxCoreVersion = '1.10.0' androidxActivityVersion = '1.8.0' androidxFragmentVersion = '1.6.2' androidxGridlayoutVersion = '1.0.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7dfdd0243065..80fe55dd67f3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] androidxArchCore = '2.2.0' androidxComposeNavigation = '2.7.6' +androidxCore = '1.10.0' androidxWebkit = '1.11.0' automatticRest = '1.0.8' googlePlayAppUpdate = '2.1.0' @@ -10,6 +11,8 @@ 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-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" } androidx-coreRuntime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCore" } androidx-coreTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidxArchCore" } diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index d9925028ed43..59284cc59c73 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -99,7 +99,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion" - implementation "androidx.core:core:$androidxCoreVersion" + implementation libs.androidx.core implementation "androidx.fragment:fragment:$androidxFragmentVersion" implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" implementation "androidx.preference:preference:$androidxPreferenceVersion" diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index fe1d5eb68883..4bb363acb45b 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -46,7 +46,7 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "androidx.core:core:$androidxCoreVersion" + implementation libs.androidx.core implementation "androidx.activity:activity:$androidxActivityVersion" implementation "androidx.activity:activity-ktx:$androidxActivityVersion" implementation "androidx.fragment:fragment:$androidxFragmentVersion" From 2fab6815bb0bc867810bd66790d8d9f5b6d6600d Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 12:38:27 +0530 Subject: [PATCH 012/117] Deps: Migrated `androidxLifecycle` to Version Catalog --- WordPress/build.gradle | 20 ++++++++++---------- build.gradle | 1 - gradle/libs.versions.toml | 12 ++++++++++++ libs/editor/build.gradle | 6 +++--- libs/image-editor/build.gradle | 10 +++++----- 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 81ac233c94d8..3a42debcfccf 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -404,9 +404,9 @@ dependencies { implementation libs.google.gson implementation libs.androidx.core implementation libs.androidx.core.ktx - implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidxLifecycleVersion" + 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" @@ -424,12 +424,12 @@ dependencies { implementation "androidx.work:work-runtime:$androidxWorkManagerVersion" implementation "androidx.work:work-runtime-ktx:$androidxWorkManagerVersion" implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" - implementation "androidx.lifecycle:lifecycle-viewmodel:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-process:$androidxLifecycleVersion" + implementation libs.androidx.lifecycle.viewmodel + implementation libs.androidx.lifecycle.viewmodel.ktx + implementation libs.androidx.lifecycle.livedata.core + implementation libs.androidx.lifecycle.livedata + implementation libs.androidx.lifecycle.livedata.ktx + implementation libs.androidx.lifecycle.process implementation "com.android.volley:volley:$androidVolleyVersion" implementation "com.google.android.play:review:$googlePlayReviewVersion" implementation "com.google.android.play:review-ktx:$googlePlayReviewVersion" @@ -559,7 +559,7 @@ dependencies { implementation "androidx.compose.ui:ui-tooling-preview" implementation "androidx.compose.material:material" // - Jetpack Compose - AndroidX - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$androidxLifecycleVersion" + implementation libs.androidx.lifecycle.viewmodel.compose implementation "androidx.constraintlayout:constraintlayout-compose:$androidxConstraintlayoutComposeVersion" // - Jetpack Compose - Other implementation "io.coil-kt:coil-compose:$coilComposeVersion" diff --git a/build.gradle b/build.gradle index 0b7798da1a9c..e644315cefb8 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,6 @@ ext { androidxActivityVersion = '1.8.0' androidxFragmentVersion = '1.6.2' androidxGridlayoutVersion = '1.0.0' - androidxLifecycleVersion = '2.6.2' androidxPercentlayoutVersion = '1.0.0' androidxPreferenceVersion = '1.2.0' androidxRecyclerviewVersion = '1.3.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 80fe55dd67f3..151034836e98 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,6 +2,7 @@ androidxArchCore = '2.2.0' androidxComposeNavigation = '2.7.6' androidxCore = '1.10.0' +androidxLifecycle = '2.6.2' androidxWebkit = '1.11.0' automatticRest = '1.0.8' googlePlayAppUpdate = '2.1.0' @@ -21,6 +22,17 @@ androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "an automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } +androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime", version.ref = "androidxLifecycle" } +androidx-lifecycle-common = { group = "androidx.lifecycle", name = "lifecycle-common", version.ref = "androidxLifecycle" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" } +androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidxLifecycle" } +androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" } +androidx-lifecycle-livedata-core = { group = "androidx.lifecycle", name = "lifecycle-livedata-core", version.ref = "androidxLifecycle" } +androidx-lifecycle-livedata = { group = "androidx.lifecycle", name = "lifecycle-livedata", version.ref = "androidxLifecycle" } +androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidxLifecycle" } +androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidxLifecycle" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" } +androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } [plugins] diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 59284cc59c73..8117249c0b31 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -96,9 +96,9 @@ dependencies { implementation "org.wordpress:utils:$wordPressUtilsVersion" - implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion" + implementation libs.androidx.lifecycle.common + implementation libs.androidx.lifecycle.runtime + implementation libs.androidx.lifecycle.livedata.core implementation libs.androidx.core implementation "androidx.fragment:fragment:$androidxFragmentVersion" implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 4bb363acb45b..bbb34255976a 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -57,11 +57,11 @@ dependencies { implementation "com.google.android.material:material:$googleMaterialVersion" implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion" implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion" - implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-viewmodel:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$androidxLifecycleVersion" - implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion" + implementation libs.androidx.lifecycle.common + implementation libs.androidx.lifecycle.runtime + implementation libs.androidx.lifecycle.viewmodel + implementation libs.androidx.lifecycle.viewmodel.savedstate + implementation libs.androidx.lifecycle.livedata.core implementation ("com.github.yalantis:ucrop:$uCropVersion") { exclude group: 'com.squareup.okhttp3' exclude group: 'androidx.core', module: 'core' From 5ef4251ef1163ee1d0682e229558325540fdffd2 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 12:40:22 +0530 Subject: [PATCH 013/117] Reordered libraries alphabetically --- gradle/libs.versions.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 151034836e98..ab7674c1cd7f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,22 +17,22 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = androidx-coreCommon = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCore" } androidx-coreRuntime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCore" } androidx-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" } -google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } -wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } -androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime", version.ref = "androidxLifecycle" } androidx-lifecycle-common = { group = "androidx.lifecycle", name = "lifecycle-common", version.ref = "androidxLifecycle" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" } -androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidxLifecycle" } -androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" } -androidx-lifecycle-livedata-core = { group = "androidx.lifecycle", name = "lifecycle-livedata-core", version.ref = "androidxLifecycle" } androidx-lifecycle-livedata = { group = "androidx.lifecycle", name = "lifecycle-livedata", version.ref = "androidxLifecycle" } +androidx-lifecycle-livedata-core = { group = "androidx.lifecycle", name = "lifecycle-livedata-core", version.ref = "androidxLifecycle" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidxLifecycle" } androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidxLifecycle" } +androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime", version.ref = "androidxLifecycle" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" } +androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidxLifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" } +androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } +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" } +google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } [plugins] From d8902be651812ad86de93356499e06005a2f3a91 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 12:52:06 +0530 Subject: [PATCH 014/117] Deps: Migrated `androidxActivity` to Version Catalog --- WordPress/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 5 +++++ libs/image-editor/build.gradle | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) 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 e644315cefb8..d920444d1c74 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" From 9f49b24b98c3ed12f4fa28a43da940a5c4a5de97 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 12:59:45 +0530 Subject: [PATCH 015/117] Deps: Migrated `androidxFragment` to Version Catalog --- WordPress/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 4 +++- libs/editor/build.gradle | 2 +- libs/image-editor/build.gradle | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 8b531e7e361b..31b7f7b8728d 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -410,8 +410,8 @@ dependencies { 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 libs.androidx.fragment + implementation libs.androidx.fragment.ktx implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" implementation "androidx.appcompat:appcompat-resources:$androidxAppcompatVersion" implementation "androidx.cardview:cardview:$androidxCardviewVersion" diff --git a/build.gradle b/build.gradle index d920444d1c74..84ad73c3bb02 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,6 @@ ext { androidxCardviewVersion = '1.0.0' androidxConstraintlayoutVersion = '2.1.4' androidxConstraintlayoutComposeVersion = '1.0.1' - androidxFragmentVersion = '1.6.2' androidxGridlayoutVersion = '1.0.0' androidxPercentlayoutVersion = '1.0.0' androidxPreferenceVersion = '1.2.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aac5bca727b6..5a98170d3374 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,7 @@ androidxActivity = '1.8.0' androidxArchCore = '2.2.0' androidxComposeNavigation = '2.7.6' androidxCore = '1.10.0' +androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' androidxWebkit = '1.11.0' automatticRest = '1.0.8' @@ -21,6 +22,8 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = androidx-coreCommon = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCore" } androidx-coreRuntime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCore" } androidx-coreTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidxArchCore" } +androidx-fragment = { group = "androidx.fragment", name = "fragment", version.ref = "androidxFragment"} +androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidxFragment"} androidx-lifecycle-common = { group = "androidx.lifecycle", name = "lifecycle-common", version.ref = "androidxLifecycle" } androidx-lifecycle-livedata = { group = "androidx.lifecycle", name = "lifecycle-livedata", version.ref = "androidxLifecycle" } androidx-lifecycle-livedata-core = { group = "androidx.lifecycle", name = "lifecycle-livedata-core", version.ref = "androidxLifecycle" } @@ -38,6 +41,5 @@ 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/editor/build.gradle b/libs/editor/build.gradle index 8117249c0b31..7498712d2dde 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -100,7 +100,7 @@ dependencies { implementation libs.androidx.lifecycle.runtime implementation libs.androidx.lifecycle.livedata.core implementation libs.androidx.core - implementation "androidx.fragment:fragment:$androidxFragmentVersion" + implementation libs.androidx.fragment implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" implementation "androidx.preference:preference:$androidxPreferenceVersion" implementation "com.google.android.material:material:$googleMaterialVersion" diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 57e6c8a15e9e..a7c15d5c9d90 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation libs.androidx.core implementation libs.androidx.activity implementation libs.androidx.activity.ktx - implementation "androidx.fragment:fragment:$androidxFragmentVersion" + implementation libs.androidx.fragment implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion" implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" From e79acf9aa6ae9aba50c8d4b03a5bb82a3d200865 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 13:18:36 +0530 Subject: [PATCH 016/117] Deps: Migrated `androidxCompose` dependencies to Version Catalog --- WordPress/build.gradle | 26 +++++++++++++------------- gradle/libs.versions.toml | 13 +++++++++++++ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 31b7f7b8728d..e9867cc47c81 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -545,19 +545,19 @@ dependencies { implementation(composeBom) androidTestImplementation(composeBom) // - Jetpack Compose - Android Studio - debugImplementation "androidx.compose.ui:ui-test-manifest" - debugImplementation "androidx.compose.ui:ui-tooling" + debugImplementation libs.androidx.compose.testManifest + debugImplementation libs.androidx.compose.tooling // - Jetpack Compose - Main - implementation "androidx.compose.runtime:runtime" - implementation "androidx.compose.runtime:runtime-livedata" - implementation "androidx.compose.foundation:foundation" - implementation "androidx.compose.foundation:foundation-layout" - implementation "androidx.compose.ui:ui" - implementation "androidx.compose.ui:ui-graphics" - implementation "androidx.compose.ui:ui-text" - implementation "androidx.compose.ui:ui-unit" - implementation "androidx.compose.ui:ui-tooling-preview" - implementation "androidx.compose.material:material" + implementation libs.androidx.compose.runtime + implementation libs.androidx.compose.runtime.livedata + implementation libs.androidx.compose.foundation + implementation libs.androidx.compose.foundation.layout + implementation libs.androidx.compose.ui + implementation libs.androidx.compose.ui.graphics + implementation libs.androidx.compose.ui.text + implementation libs.androidx.compose.ui.unit + implementation libs.androidx.compose.ui.tooling.preview + implementation libs.androidx.compose.material // - Jetpack Compose - AndroidX implementation libs.androidx.lifecycle.viewmodel.compose implementation "androidx.constraintlayout:constraintlayout-compose:$androidxConstraintlayoutComposeVersion" @@ -565,7 +565,7 @@ dependencies { implementation "io.coil-kt:coil-compose:$coilComposeVersion" implementation "com.airbnb.android:lottie-compose:$lottieVersion" // - Jetpack Compose - UI Tests - androidTestImplementation "androidx.compose.ui:ui-test-junit4" + androidTestImplementation libs.androidx.compose.ui.test implementation "androidx.compose.material3:material3:$androidxComposeMaterial3Version" // Cascade - Compose nested menu diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5a98170d3374..9d0a11c20452 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,6 +17,19 @@ 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-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" } +androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" } +androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } +androidx-compose-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-compose-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-compose-ui-text = { group = "androidx.compose.ui", name = "ui-text" } +androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-compose-ui-unit = { group = "androidx.compose.ui", name = "ui-unit" } 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" } From 091499ae28fe5a6ce1f6b5ddffc69f6da3756962 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 13:27:03 +0530 Subject: [PATCH 017/117] Deps: Migrated `androidxAppcompat` to Version Catalog --- WordPress/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ libs/editor/build.gradle | 2 +- libs/image-editor/build.gradle | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) 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 84ad73c3bb02..ff2438d77487 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" From ecfa922b1658a62e09dc13e420ee1ed6af266a4a Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 13:36:55 +0530 Subject: [PATCH 018/117] Deps: Migrated `glide` to Version Catalog --- WordPress/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index ddc367a06a66..4684cff75066 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -456,9 +456,9 @@ dependencies { exclude group: 'androidx.constraintlayout', module: 'constraintlayout' exclude group: 'androidx.appcompat', module: 'appcompat' } - implementation "com.github.bumptech.glide:glide:$glideVersion" - ksp "com.github.bumptech.glide:ksp:$glideVersion" - implementation "com.github.bumptech.glide:volley-integration:$glideVersion" + implementation libs.glide + ksp libs.glide.ksp + implementation libs.glide.volley.integration implementation "com.github.indexos.media-for-mobile:domain:$indexosMediaForMobileVersion" implementation "com.github.indexos.media-for-mobile:android:$indexosMediaForMobileVersion" implementation "com.zendesk:support:$zendeskVersion" diff --git a/build.gradle b/build.gradle index ff2438d77487..183ae67223e2 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,6 @@ ext { facebookShimmerVersion = '0.5.0' firebaseBomVersion = '32.1.0' firebaseIidVersion = '21.1.0' - glideVersion = '4.16.0' googleAutoServiceVersion = '1.0.1' googleExoPlayerVersion = '2.13.3' googleFlexboxlayoutVersion = '3.0.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 75aa8856f784..ecb7cef19960 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' androidxWebkit = '1.11.0' automatticRest = '1.0.8' +glide = '4.16.0' googlePlayAppUpdate = '2.1.0' gson = '2.10.1' wordPressPersistentEditText = '1.0.2' @@ -54,6 +55,9 @@ androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = 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" } +glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } +glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } +glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } From b445cc6bf89412916e82dd7fa8caab2aa4e8bb59 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 14:04:41 +0530 Subject: [PATCH 019/117] Deps & Plugin: Migrated `dagger` to Version Catalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- WordPress/build.gradle | 14 +++++++------- gradle/libs.versions.toml | 9 ++++++++- settings.gradle | 2 -- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 4684cff75066..3f1b59fe4176 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -10,7 +10,7 @@ plugins { id "io.sentry.android.gradle" id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" id "com.google.gms.google-services" - id "com.google.dagger.hilt.android" + alias(libs.plugins.dagger) id "org.jetbrains.kotlinx.kover" id "com.google.devtools.ksp" } @@ -470,10 +470,10 @@ dependencies { implementation ("com.google.android.exoplayer:exoplayer:$googleExoPlayerVersion") { exclude group: 'com.android.support', module: 'support-annotations' } - implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion" - ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion" - implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion" - ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion" + implementation libs.dagger.android.support + ksp libs.dagger.android.processor + implementation libs.dagger.hilt.android + ksp libs.dagger.hilt.compiler testImplementation(libs.androidx.coreTesting, { exclude group: 'com.android.support', module: 'support-compat' @@ -526,8 +526,8 @@ dependencies { } androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing androidTestImplementation "androidx.work:work-testing:$androidxWorkManagerVersion" - androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion" - kspAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion" + androidTestImplementation libs.dagger.hilt.android.testing + kspAndroidTest libs.dagger.hilt.android.compiler // Enables Java 8+ API desugaring support coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$androidDesugarVersion" lintChecks "org.wordpress:lint:$wordPressLintVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ecb7cef19960..2a5b81f899fd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' androidxWebkit = '1.11.0' automatticRest = '1.0.8' +dagger = '2.50' glide = '4.16.0' googlePlayAppUpdate = '2.1.0' gson = '2.10.1' @@ -55,6 +56,12 @@ androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = 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" } +dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "dagger" } +dagger-android-support = { group = "com.google.dagger", name = "dagger-android-support", version.ref = "dagger" } +dagger-hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger" } +dagger-hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "dagger" } +dagger-hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "dagger" } +dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" } glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } @@ -62,4 +69,4 @@ google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gs wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } [plugins] - +dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } diff --git a/settings.gradle b/settings.gradle index 987cdf6d6775..4521a3425529 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,6 @@ pluginManagement { gradle.ext.googleServicesVersion = '4.3.15' gradle.ext.navigationVersion = '2.7.7' gradle.ext.sentryVersion = '4.3.1' - gradle.ext.daggerVersion = "2.50" gradle.ext.detektVersion = '1.23.0' gradle.ext.violationCommentsVersion = '1.70.0' gradle.ext.measureBuildsVersion = '3.1.0' @@ -27,7 +26,6 @@ pluginManagement { id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion id "org.jetbrains.kotlinx.kover" version gradle.ext.koverVersion - id "com.google.dagger.hilt.android" version gradle.ext.daggerVersion id "com.google.devtools.ksp" version gradle.ext.kspVersion id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion } From dd99a5d0d6bec66c156478f5eb517538c51b4174 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 14:33:32 +0530 Subject: [PATCH 020/117] Deps: Migrated `lottie` to Version Catalog --- WordPress/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 3f1b59fe4176..1b7cb1d69252 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -449,7 +449,7 @@ dependencies { implementation "org.greenrobot:eventbus-java:$eventBusVersion" implementation "com.squareup.retrofit2:retrofit:$squareupRetrofitVersion" implementation "org.apache.commons:commons-text:$apacheCommonsTextVersion" - implementation "com.airbnb.android:lottie:$lottieVersion" + implementation libs.lottie implementation "com.facebook.shimmer:shimmer:$facebookShimmerVersion" implementation ("com.github.yalantis:ucrop:$uCropVersion") { exclude group: 'androidx.core', module: 'core' @@ -563,7 +563,7 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout-compose:$androidxConstraintlayoutComposeVersion" // - Jetpack Compose - Other implementation "io.coil-kt:coil-compose:$coilComposeVersion" - implementation "com.airbnb.android:lottie-compose:$lottieVersion" + implementation libs.lottie.compose // - Jetpack Compose - UI Tests androidTestImplementation libs.androidx.compose.ui.test implementation "androidx.compose.material3:material3:$androidxComposeMaterial3Version" diff --git a/build.gradle b/build.gradle index 183ae67223e2..dd5bb9f0397b 100644 --- a/build.gradle +++ b/build.gradle @@ -73,7 +73,6 @@ ext { googlePlayServicesCodeScannerVersion = '16.0.0-beta3' jsoupVersion = '1.16.2' kotlinxCoroutinesVersion = '1.7.3' - lottieVersion = '6.1.0' 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 2a5b81f899fd..ad641ce00670 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' +lottie = '6.1.0' wordPressPersistentEditText = '1.0.2' [libraries] @@ -66,6 +67,8 @@ glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="gli glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +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" } [plugins] From 5487189d5cecae5e97b7559f04448fcc2f962368 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 14:41:41 +0530 Subject: [PATCH 021/117] 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 dd5bb9f0397b..a90404b55755 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" } From 053832618d415bd1fb24d55975029d1e35ccdcdb Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 15:31:03 +0530 Subject: [PATCH 022/117] Deps: Migrated `androidxCamera` to Version Catalog --- WordPress/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 1401c66b5fae..36a853a445d3 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -439,9 +439,9 @@ dependencies { implementation "com.google.mlkit:barcode-scanning:$googleMLKitBarcodeScanningVersion" // CameraX - implementation "androidx.camera:camera-camera2:$androidxCameraVersion" - implementation "androidx.camera:camera-lifecycle:$androidxCameraVersion" - implementation "androidx.camera:camera-view:$androidxCameraVersion" + implementation libs.androidx.camera + implementation libs.androidx.camera.lifecycle + implementation libs.androidx.camera.view implementation "com.android.installreferrer:installreferrer:$androidInstallReferrerVersion" implementation "com.github.chrisbanes:PhotoView:$chrisbanesPhotoviewVersion" diff --git a/build.gradle b/build.gradle index a90404b55755..48b437b0f640 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,6 @@ ext { androidInstallReferrerVersion = '2.2' androidVolleyVersion = '1.2.1' androidxAnnotationVersion = '1.6.0' - androidxCameraVersion = '1.3.4' androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' androidxCardviewVersion = '1.0.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index eafe8af60d4c..16424ae901e5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,6 +2,7 @@ androidxActivity = '1.8.0' androidxAppcompat = '1.6.1' androidxArchCore = '2.2.0' +androidxCamera = '1.3.4' androidxComposeNavigation = '2.7.6' androidxCore = '1.10.0' androidxFragment = '1.6.2' @@ -76,5 +77,8 @@ kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-cor 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" } +androidx-camera = { group = "androidx.camera", name = "camera-camera2", version.ref ="androidxCamera" } +androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref ="androidxCamera" } +androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref ="androidxCamera" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } From 56db936aaa70b4a738126ab67f2ecaa0f3c78e3b Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 15:31:48 +0530 Subject: [PATCH 023/117] Reordered libraries alphabetically --- gradle/libs.versions.toml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 16424ae901e5..694dcddf6459 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,6 +25,9 @@ androidx-activity-compose = { group = "androidx.activity", name = "activity-comp 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-camera = { group = "androidx.camera", name = "camera-camera2", version.ref ="androidxCamera" } +androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref ="androidxCamera" } +androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref ="androidxCamera" } 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" } @@ -69,16 +72,12 @@ glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="gli glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutines" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } +kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutines" } 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" } - -androidx-camera = { group = "androidx.camera", name = "camera-camera2", version.ref ="androidxCamera" } -androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref ="androidxCamera" } -androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref ="androidxCamera" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } From dc7ea89e33cb58861977620e2febe20cac252fb6 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 15:38:55 +0530 Subject: [PATCH 024/117] Deps: Migrated `androidxWorkManager` to Version Catalog --- WordPress/build.gradle | 6 +++--- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 36a853a445d3..686bdfc7732b 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -421,8 +421,8 @@ dependencies { implementation "androidx.percentlayout:percentlayout:$androidxPercentlayoutVersion" implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeToRefreshVersion" implementation "androidx.preference:preference:$androidxPreferenceVersion" - implementation "androidx.work:work-runtime:$androidxWorkManagerVersion" - implementation "androidx.work:work-runtime-ktx:$androidxWorkManagerVersion" + implementation libs.androidx.workManager.runtime + implementation libs.androidx.workManager.runtime.ktx implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" implementation libs.androidx.lifecycle.viewmodel implementation libs.androidx.lifecycle.viewmodel.ktx @@ -525,7 +525,7 @@ dependencies { exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18' } androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing - androidTestImplementation "androidx.work:work-testing:$androidxWorkManagerVersion" + androidTestImplementation libs.androidx.workManager.workTesting androidTestImplementation libs.dagger.hilt.android.testing kspAndroidTest libs.dagger.hilt.android.compiler // Enables Java 8+ API desugaring support diff --git a/build.gradle b/build.gradle index 48b437b0f640..cc4601d4459f 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,6 @@ ext { androidxRecyclerviewVersion = '1.3.0' androidxSwipeToRefreshVersion = '1.1.0' androidxViewpager2Version = '1.0.0' - androidxWorkManagerVersion = "2.9.0" androidxComposeMaterial3Version = '1.1.1' apacheCommonsTextVersion = '1.10.0' coilComposeVersion = '2.4.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 694dcddf6459..43b1ac518b6e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ androidxCore = '1.10.0' androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' androidxWebkit = '1.11.0' +androidxWorkManager = "2.9.0" automatticRest = '1.0.8' dagger = '2.50' glide = '4.16.0' @@ -78,6 +79,9 @@ kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-cor 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" } +androidx-workManager-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" } +androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" } +androidx-workManager-workTesting = { group = "androidx.work", name = "work-testing", version.ref = "androidxWorkManager" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } From 7ad97f3acd010047d5adae5e7a1c67ebe8196850 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 15:40:47 +0530 Subject: [PATCH 025/117] Reordered libraries alphabetically --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 43b1ac518b6e..f62e6f4de338 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -62,6 +62,9 @@ androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifec androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} +androidx-workManager-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" } +androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" } +androidx-workManager-workTesting = { group = "androidx.work", name = "work-testing", version.ref = "androidxWorkManager" } automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "dagger" } dagger-android-support = { group = "com.google.dagger", name = "dagger-android-support", version.ref = "dagger" } @@ -79,9 +82,6 @@ kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-cor 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" } -androidx-workManager-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" } -androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" } -androidx-workManager-workTesting = { group = "androidx.work", name = "work-testing", version.ref = "androidxWorkManager" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } From e0597707d724cb9b7042442b799d4261424a3c23 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Fri, 5 Jul 2024 16:00:24 +0530 Subject: [PATCH 026/117] Deps: Migrated `TestEspresso` to Version Catalog --- WordPress/build.gradle | 16 +++------------- build.gradle | 1 - gradle/libs.versions.toml | 4 ++++ libs/image-editor/build.gradle | 6 +----- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 686bdfc7732b..c1b5666bba41 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -492,25 +492,15 @@ dependencies { androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" androidTestImplementation "com.squareup.okhttp3:mockwebserver:$squareupMockWebServerVersion" androidTestImplementation "androidx.test.uiautomator:uiautomator:$androidxTestUiAutomatorVersion" - androidTestImplementation "androidx.test.espresso:espresso-core:$androidxTestEspressoVersion", { - version { - strictly androidxTestEspressoVersion - } + androidTestImplementation libs.androidx.test.espresso.core, { exclude group: 'com.android.support', module: 'support-annotations' } - androidTestImplementation("androidx.test.espresso:espresso-contrib:$androidxTestEspressoVersion") { - version { - strictly androidxTestEspressoVersion - } + androidTestImplementation(libs.androidx.test.espresso.contrib) { exclude group: 'com.android.support', module: 'appcompat' exclude group: 'com.android.support', module: 'support-v4' exclude module: 'recyclerview-v7' } - androidTestImplementation("androidx.test.espresso:espresso-accessibility:$androidxTestEspressoVersion") { - version { - strictly androidxTestEspressoVersion - } - } + androidTestImplementation(libs.androidx.test.espresso.accessibility) androidTestImplementation("com.github.tomakehurst:wiremock:$wiremockVersion") { exclude group: 'org.apache.httpcomponents', module: 'httpclient' exclude group: 'org.apache.commons', module: 'commons-lang3' diff --git a/build.gradle b/build.gradle index cc4601d4459f..ec956595b594 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,6 @@ ext { // android test androidxTestCoreVersion = '1.5.0' - androidxTestEspressoVersion = '3.4.0' androidxTestExtJunitVersion = '1.1.5' androidxTestUiAutomatorVersion = '2.2.0' screengrabVersion = '2.1.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f62e6f4de338..c140593acdb4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,7 @@ androidxComposeNavigation = '2.7.6' androidxCore = '1.10.0' androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' +androidxTestEspresso = '3.4.0' androidxWebkit = '1.11.0' androidxWorkManager = "2.9.0" automatticRest = '1.0.8' @@ -61,6 +62,9 @@ androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "l androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } +androidx-test-espresso-accessibility = { group = "androidx.test.espresso", name = "espresso-accessibility", version.ref ="androidxTestEspresso" } +androidx-test-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref ="androidxTestEspresso" } +androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref ="androidxTestEspresso" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} androidx-workManager-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" } androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index d45779f1f73a..b849078374e4 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -79,9 +79,5 @@ dependencies { }) androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion" - androidTestImplementation("androidx.test.espresso:espresso-core:$androidxTestEspressoVersion") { - version { - strictly androidxTestEspressoVersion - } - } + androidTestImplementation(libs.androidx.test.espresso.core) } From 71d1d4dbc6f70749f2a5e106d4e888464159adca Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 04:32:19 +0530 Subject: [PATCH 027/117] Deps: Migrated `androidxCardview` to Version Catalog --- WordPress/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index c1b5666bba41..f5f6f91bdc0e 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -414,7 +414,7 @@ dependencies { implementation libs.androidx.fragment.ktx implementation libs.androidx.appcompat implementation libs.androidx.appcompat.resources - implementation "androidx.cardview:cardview:$androidxCardviewVersion" + implementation libs.androidx.cardView implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" implementation "com.google.android.material:material:$googleMaterialVersion" implementation "com.google.android.flexbox:flexbox:$googleFlexboxlayoutVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c140593acdb4..b3d914d10100 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,7 @@ androidxActivity = '1.8.0' androidxAppcompat = '1.6.1' androidxArchCore = '2.2.0' androidxCamera = '1.3.4' +androidxCardview = '1.0.0' androidxComposeNavigation = '2.7.6' androidxCore = '1.10.0' androidxFragment = '1.6.2' @@ -30,6 +31,7 @@ androidx-appcompat-resources = { group = "androidx.appcompat", name = "appcompat androidx-camera = { group = "androidx.camera", name = "camera-camera2", version.ref ="androidxCamera" } androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref ="androidxCamera" } androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref ="androidxCamera" } +androidx-cardView = { group = "androidx.cardview", name = "cardview", version.ref = "androidxCardview" } 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" } From d555d16053e1753f04b35f09700d4b61f2e3527a Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 04:38:26 +0530 Subject: [PATCH 028/117] Deps: Migrated `flipper` to Version Catalog --- WordPress/build.gradle | 6 +++--- gradle/libs.versions.toml | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index f5f6f91bdc0e..2756636643fa 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -564,14 +564,14 @@ dependencies { implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" // - Flipper - debugImplementation ("com.facebook.flipper:flipper:$flipperVersion") { + debugImplementation (libs.facebook.flipper) { exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm' } debugImplementation "com.facebook.soloader:soloader:$soLoaderVersion" - debugImplementation ("com.facebook.flipper:flipper-network-plugin:$flipperVersion"){ + debugImplementation (libs.facebook.flipper.network.plugin){ exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm' } - releaseImplementation "com.facebook.flipper:flipper-noop:$flipperVersion" + releaseImplementation libs.facebook.flipper.noop } configurations.all { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b3d914d10100..09d57baf0517 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,6 +13,7 @@ androidxWebkit = '1.11.0' androidxWorkManager = "2.9.0" automatticRest = '1.0.8' dagger = '2.50' +flipper = '0.247.0' glide = '4.16.0' googlePlayAppUpdate = '2.1.0' gson = '2.10.1' @@ -78,6 +79,9 @@ dagger-hilt-android = { group = "com.google.dagger", name = "hilt-android", vers dagger-hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "dagger" } dagger-hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "dagger" } dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" } +facebook-flipper = { group = "com.facebook.flipper", name = "flipper", version.ref ="flipper" } +facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref ="flipper" } +facebook-flipper-noop = { group = "com.facebook.flipper", name = "flipper-noop", version.ref ="flipper" } glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } From d5ec0fd62d069cf0230514af89a1e2f644577836 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 04:39:08 +0530 Subject: [PATCH 029/117] Removed carview ext which got left off in #ba820ce --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index ec956595b594..bded423d75ef 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,6 @@ ext { androidxAnnotationVersion = '1.6.0' androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' - androidxCardviewVersion = '1.0.0' androidxConstraintlayoutVersion = '2.1.4' androidxConstraintlayoutComposeVersion = '1.0.1' androidxGridlayoutVersion = '1.0.0' From 352b6f168c8d359ff392f1acd9f37b652d9f5178 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 04:45:41 +0530 Subject: [PATCH 030/117] Deps: Migrated `soLoader` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 4 ---- gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 2756636643fa..d6546e210adf 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -567,7 +567,7 @@ dependencies { debugImplementation (libs.facebook.flipper) { exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm' } - debugImplementation "com.facebook.soloader:soloader:$soLoaderVersion" + debugImplementation libs.facebook.soLoader debugImplementation (libs.facebook.flipper.network.plugin){ exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm' } diff --git a/build.gradle b/build.gradle index bded423d75ef..5bcdaf2028d0 100644 --- a/build.gradle +++ b/build.gradle @@ -31,10 +31,6 @@ ext { indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' gravatarVersion = '1.0.0' - // debug - flipperVersion = '0.247.0' - soLoaderVersion = '0.10.5' - // main androidInstallReferrerVersion = '2.2' androidVolleyVersion = '1.2.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 09d57baf0517..884717279799 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,6 +19,7 @@ googlePlayAppUpdate = '2.1.0' gson = '2.10.1' kotlinxCoroutines = '1.7.3' lottie = '6.1.0' +soLoader = '0.10.5' wordPressPersistentEditText = '1.0.2' [libraries] @@ -82,6 +83,7 @@ dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", ve facebook-flipper = { group = "com.facebook.flipper", name = "flipper", version.ref ="flipper" } facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref ="flipper" } facebook-flipper-noop = { group = "com.facebook.flipper", name = "flipper-noop", version.ref ="flipper" } +facebook-soLoader = { group = "com.facebook.soloader", name = "soloader", version.ref ="soLoader" } glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } From 037189cbaa41f15b8845f65bd83def636d2d6d7c Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 04:51:28 +0530 Subject: [PATCH 031/117] Deps: Migrated `facebookReact` to Version Catalog --- build.gradle | 3 --- gradle/libs.versions.toml | 3 +++ libs/editor/build.gradle | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 5bcdaf2028d0..57b554ce4cc2 100644 --- a/build.gradle +++ b/build.gradle @@ -71,9 +71,6 @@ ext { uCropVersion = '2.2.9' zendeskVersion = '5.1.2' - // react native - facebookReactVersion = '0.73.3' - // test assertjVersion = '3.23.1' junitVersion = '4.13.2' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 884717279799..766f6306d2aa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,6 +13,7 @@ androidxWebkit = '1.11.0' androidxWorkManager = "2.9.0" automatticRest = '1.0.8' dagger = '2.50' +facebookReact = '0.73.3' flipper = '0.247.0' glide = '4.16.0' googlePlayAppUpdate = '2.1.0' @@ -83,6 +84,8 @@ dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", ve facebook-flipper = { group = "com.facebook.flipper", name = "flipper", version.ref ="flipper" } facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref ="flipper" } facebook-flipper-noop = { group = "com.facebook.flipper", name = "flipper-noop", version.ref ="flipper" } +facebook-react-android = { group = "com.facebook.react", name = "react-android", version.ref ="facebookReact" } +facebook-react-hermesAndroid = { group = "com.facebook.react", name = "hermes-android", version.ref ="facebookReact" } facebook-soLoader = { group = "com.facebook.soloader", name = "soloader", version.ref ="soLoader" } glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 5722ddb6c887..8ba0e2dc898d 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -80,8 +80,8 @@ dependencies { } } - implementation "com.facebook.react:hermes-android:$facebookReactVersion" - implementation "com.facebook.react:react-android:$facebookReactVersion" + implementation libs.facebook.react.hermesAndroid + implementation libs.facebook.react.android // This dependency will be substituted if the `local-builds.gradle` file contains // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file. From 6ece5463fc196b7f6f3d2744952a48bdfcaa3eff Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 04:58:14 +0530 Subject: [PATCH 032/117] Deps: Migrated `mockito` to Version Catalog --- WordPress/build.gradle | 6 +++--- build.gradle | 2 -- gradle/libs.versions.toml | 4 ++++ libs/image-editor/build.gradle | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index d6546e210adf..0a6ad402e813 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -481,15 +481,15 @@ dependencies { exclude group: 'com.android.support', module: 'support-core-utils' }) testImplementation "junit:junit:$junitVersion" - testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + testImplementation libs.mockito.kotlin testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" testImplementation libs.kotlinx.coroutines.test androidTestImplementation project(path:':libs:mocks') - androidTestImplementation "org.mockito:mockito-android:$mockitoAndroidVersion" - androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + androidTestImplementation libs.mockito.android + androidTestImplementation libs.mockito.kotlin androidTestImplementation "com.squareup.okhttp3:mockwebserver:$squareupMockWebServerVersion" androidTestImplementation "androidx.test.uiautomator:uiautomator:$androidxTestUiAutomatorVersion" androidTestImplementation libs.androidx.test.espresso.core, { diff --git a/build.gradle b/build.gradle index 57b554ce4cc2..3842bf5759ea 100644 --- a/build.gradle +++ b/build.gradle @@ -74,8 +74,6 @@ ext { // test assertjVersion = '3.23.1' junitVersion = '4.13.2' - mockitoAndroidVersion = '4.5.1' - mockitoKotlinVersion = '4.1.0' // android test androidxTestCoreVersion = '1.5.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 766f6306d2aa..43527e1263e3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,6 +20,8 @@ googlePlayAppUpdate = '2.1.0' gson = '2.10.1' kotlinxCoroutines = '1.7.3' lottie = '6.1.0' +mockitoAndroid = '4.5.1' +mockitoKotlin = '4.1.0' soLoader = '0.10.5' wordPressPersistentEditText = '1.0.2' @@ -96,6 +98,8 @@ kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-cor kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutines" } lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" } lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } +mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } +mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" } 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 b849078374e4..278b080fed78 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -69,7 +69,7 @@ dependencies { exclude group: 'androidx.appcompat', module: 'appcompat' } - testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" + testImplementation libs.mockito.kotlin testImplementation "junit:junit:$junitVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" testImplementation(libs.androidx.coreTesting, { From e9bac9e8572f55ec457713b4857ea29d440ae524 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 05:02:02 +0530 Subject: [PATCH 033/117] Deps: Migrated `junit` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/image-editor/build.gradle | 2 +- libs/processors/build.gradle | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 0a6ad402e813..45a249cc2548 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -480,7 +480,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-core-utils' }) - testImplementation "junit:junit:$junitVersion" + testImplementation libs.junit testImplementation libs.mockito.kotlin 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 3842bf5759ea..ca4c37cea0e9 100644 --- a/build.gradle +++ b/build.gradle @@ -73,7 +73,6 @@ ext { // test assertjVersion = '3.23.1' - junitVersion = '4.13.2' // android test androidxTestCoreVersion = '1.5.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 43527e1263e3..4c1d8b8d24b7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,6 +18,7 @@ flipper = '0.247.0' glide = '4.16.0' googlePlayAppUpdate = '2.1.0' gson = '2.10.1' +junit = '4.13.2' kotlinxCoroutines = '1.7.3' lottie = '6.1.0' mockitoAndroid = '4.5.1' @@ -93,6 +94,7 @@ glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="gli glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +junit = { group = "junit", name = "junit", version.ref ="junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutines" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 278b080fed78..98e325bc1e51 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -70,7 +70,7 @@ dependencies { } testImplementation libs.mockito.kotlin - testImplementation "junit:junit:$junitVersion" + testImplementation libs.junit testImplementation "org.assertj:assertj-core:$assertjVersion" testImplementation(libs.androidx.coreTesting, { exclude group: 'com.android.support', module: 'support-compat' diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index 6baeb1bb411d..cc7a602683a5 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -16,7 +16,7 @@ dependencies { def kctVersion = "1.5.0" testImplementation "com.github.tschuchortdev:kotlin-compile-testing:$kctVersion" testImplementation "com.github.tschuchortdev:kotlin-compile-testing-ksp:$kctVersion" - testImplementation "junit:junit:$junitVersion" + testImplementation libs.junit testImplementation "org.assertj:assertj-core:$assertjVersion" testImplementation "org.jetbrains.kotlin:kotlin-reflect:$gradle.ext.kotlinVersion" } From 8c5524d6bbe5b965300cebeca919995cd5cbc94d Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 05:05:21 +0530 Subject: [PATCH 034/117] Deps: Migrated `assertj` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 3 --- gradle/libs.versions.toml | 2 ++ libs/image-editor/build.gradle | 2 +- libs/processors/build.gradle | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 45a249cc2548..401352b05f1c 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -483,7 +483,7 @@ dependencies { testImplementation libs.junit testImplementation libs.mockito.kotlin 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 androidTestImplementation project(path:':libs:mocks') diff --git a/build.gradle b/build.gradle index ca4c37cea0e9..68906aa34511 100644 --- a/build.gradle +++ b/build.gradle @@ -71,9 +71,6 @@ ext { uCropVersion = '2.2.9' zendeskVersion = '5.1.2' - // test - assertjVersion = '3.23.1' - // android test androidxTestCoreVersion = '1.5.0' androidxTestExtJunitVersion = '1.1.5' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4c1d8b8d24b7..b1fa011c5d8d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,6 +11,7 @@ androidxLifecycle = '2.6.2' androidxTestEspresso = '3.4.0' androidxWebkit = '1.11.0' androidxWorkManager = "2.9.0" +assertj = '3.23.1' automatticRest = '1.0.8' dagger = '2.50' facebookReact = '0.73.3' @@ -77,6 +78,7 @@ androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "an androidx-workManager-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" } androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" } androidx-workManager-workTesting = { group = "androidx.work", name = "work-testing", version.ref = "androidxWorkManager" } +assertj-core = { group = "org.assertj", name = "assertj-core", version.ref ="assertj" } automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "dagger" } dagger-android-support = { group = "com.google.dagger", name = "dagger-android-support", version.ref = "dagger" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 98e325bc1e51..2dda7b7e77f3 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -71,7 +71,7 @@ dependencies { testImplementation libs.mockito.kotlin testImplementation libs.junit - testImplementation "org.assertj:assertj-core:$assertjVersion" + testImplementation libs.assertj.core testImplementation(libs.androidx.coreTesting, { exclude group: 'com.android.support', module: 'support-compat' exclude group: 'com.android.support', module: 'support-annotations' diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index cc7a602683a5..51dbeb22e4cb 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -17,6 +17,6 @@ dependencies { testImplementation "com.github.tschuchortdev:kotlin-compile-testing:$kctVersion" testImplementation "com.github.tschuchortdev:kotlin-compile-testing-ksp:$kctVersion" testImplementation libs.junit - testImplementation "org.assertj:assertj-core:$assertjVersion" + testImplementation libs.assertj.core testImplementation "org.jetbrains.kotlin:kotlin-reflect:$gradle.ext.kotlinVersion" } From b9ec4de2d66e6e8c99dfc2618ae8bc1320a41989 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 05:18:19 +0530 Subject: [PATCH 035/117] Deps: Migrated `androidxTest` to Version Catalog --- WordPress/build.gradle | 8 ++++---- build.gradle | 3 --- gradle/libs.versions.toml | 7 +++++++ libs/image-editor/build.gradle | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 401352b05f1c..135a09b3cd6d 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -491,7 +491,7 @@ dependencies { androidTestImplementation libs.mockito.android androidTestImplementation libs.mockito.kotlin androidTestImplementation "com.squareup.okhttp3:mockwebserver:$squareupMockWebServerVersion" - androidTestImplementation "androidx.test.uiautomator:uiautomator:$androidxTestUiAutomatorVersion" + androidTestImplementation libs.androidx.test.ui.automator androidTestImplementation libs.androidx.test.espresso.core, { exclude group: 'com.android.support', module: 'support-annotations' } @@ -508,9 +508,9 @@ dependencies { exclude group: 'org.json', module: 'json' } androidTestImplementation "org.apache.httpcomponents:httpclient-android:$wiremockHttpClientVersion" - androidTestImplementation "androidx.test:runner:$androidxTestCoreVersion" - androidTestImplementation "androidx.test:rules:$androidxTestCoreVersion" - androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion" + androidTestImplementation libs.androidx.test.runner + androidTestImplementation libs.androidx.test.rules + androidTestImplementation libs.androidx.test.ext.junit androidTestImplementation "tools.fastlane:screengrab:$screengrabVersion", { exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18' } diff --git a/build.gradle b/build.gradle index 68906aa34511..3fb8a824a4e0 100644 --- a/build.gradle +++ b/build.gradle @@ -72,9 +72,6 @@ ext { zendeskVersion = '5.1.2' // android test - androidxTestCoreVersion = '1.5.0' - androidxTestExtJunitVersion = '1.1.5' - androidxTestUiAutomatorVersion = '2.2.0' screengrabVersion = '2.1.1' squareupMockWebServerVersion = '4.12.0' wiremockVersion = '2.26.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b1fa011c5d8d..26728bcf471c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,10 @@ androidxComposeNavigation = '2.7.6' androidxCore = '1.10.0' androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' +androidxTest = '1.5.0' androidxTestEspresso = '3.4.0' +androidxTestExtJunit = '1.1.5' +androidxTestUiAutomator = '2.2.0' androidxWebkit = '1.11.0' androidxWorkManager = "2.9.0" assertj = '3.23.1' @@ -74,6 +77,10 @@ androidx-navigation = { group = "androidx.navigation", name = "navigation-compos androidx-test-espresso-accessibility = { group = "androidx.test.espresso", name = "espresso-accessibility", version.ref ="androidxTestEspresso" } androidx-test-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref ="androidxTestEspresso" } androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref ="androidxTestEspresso" } +androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref ="androidxTestExtJunit" } +androidx-test-rules = { group = "androidx.test", name = "rules", version.ref ="androidxTest" } +androidx-test-runner = { group = "androidx.test", name = "runner", version.ref ="androidxTest" } +androidx-test-ui-automator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref ="androidxTestUiAutomator" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} androidx-workManager-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" } androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 2dda7b7e77f3..1c52f8084ffc 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -78,6 +78,6 @@ dependencies { exclude group: 'com.android.support', module: 'support-core-utils' }) - androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion" + androidTestImplementation libs.androidx.test.ext.junit androidTestImplementation(libs.androidx.test.espresso.core) } From ef5215e0402be8080bab6de357de7ca4752322f7 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 05:25:36 +0530 Subject: [PATCH 036/117] Deps: Migrated `wiremock` to Version Catalog --- WordPress/build.gradle | 4 ++-- build.gradle | 2 -- gradle/libs.versions.toml | 4 ++++ libs/mocks/build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 135a09b3cd6d..4dd089718516 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -501,13 +501,13 @@ dependencies { exclude module: 'recyclerview-v7' } androidTestImplementation(libs.androidx.test.espresso.accessibility) - androidTestImplementation("com.github.tomakehurst:wiremock:$wiremockVersion") { + androidTestImplementation(libs.wiremock) { 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' } - androidTestImplementation "org.apache.httpcomponents:httpclient-android:$wiremockHttpClientVersion" + androidTestImplementation libs.wiremock.httpclient.android androidTestImplementation libs.androidx.test.runner androidTestImplementation libs.androidx.test.rules androidTestImplementation libs.androidx.test.ext.junit diff --git a/build.gradle b/build.gradle index 3fb8a824a4e0..a21eafdfddef 100644 --- a/build.gradle +++ b/build.gradle @@ -74,8 +74,6 @@ ext { // android test screengrabVersion = '2.1.1' squareupMockWebServerVersion = '4.12.0' - wiremockVersion = '2.26.3' - wiremockHttpClientVersion = '4.3.5.1' // other androidDesugarVersion = '2.0.4' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 26728bcf471c..702bb18eefae 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,6 +29,8 @@ mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' soLoader = '0.10.5' wordPressPersistentEditText = '1.0.2' +wiremock = '2.26.3' +wiremockHttpClient = '4.3.5.1' [libraries] android-appUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayAppUpdate" } @@ -111,6 +113,8 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" } +wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" } +wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } [plugins] diff --git a/libs/mocks/build.gradle b/libs/mocks/build.gradle index a6ee6d448194..0bc0fcc6995e 100644 --- a/libs/mocks/build.gradle +++ b/libs/mocks/build.gradle @@ -18,11 +18,11 @@ android { } dependencies { - implementation("com.github.tomakehurst:wiremock:$wiremockVersion") { + implementation(libs.wiremock) { 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' } - implementation "org.apache.httpcomponents:httpclient-android:$wiremockHttpClientVersion" + implementation libs.wiremock.httpclient.android } From fb92d2ba353e5d62edce56230a6870f74f1439c8 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 05:35:16 +0530 Subject: [PATCH 037/117] Deps: Migrated `googlePlayReview` to Version Catalog --- WordPress/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 4dd089718516..788301c58e30 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -431,8 +431,8 @@ dependencies { implementation libs.androidx.lifecycle.livedata.ktx implementation libs.androidx.lifecycle.process implementation "com.android.volley:volley:$androidVolleyVersion" - implementation "com.google.android.play:review:$googlePlayReviewVersion" - implementation "com.google.android.play:review-ktx:$googlePlayReviewVersion" + implementation libs.google.play.review + implementation libs.google.play.review.ktx implementation "com.google.android.gms:play-services-auth:$googlePlayServicesAuthVersion" implementation "com.google.mlkit:barcode-scanning-common:$googleMLKitBarcodeScanningCommonVersion" implementation "com.google.mlkit:text-recognition:$googleMLKitTextRecognitionVersion" diff --git a/build.gradle b/build.gradle index a21eafdfddef..2a5b04b5cacd 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,6 @@ ext { googleMLKitBarcodeScanningVersion = '17.2.0' googleMLKitBarcodeScanningCommonVersion = '17.0.0' googleMLKitTextRecognitionVersion = '16.0.0' - googlePlayReviewVersion = '2.0.1' googlePlayServicesAuthVersion = '20.4.1' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' jsoupVersion = '1.16.2' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 702bb18eefae..af4b5bed882a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,6 +31,7 @@ soLoader = '0.10.5' wordPressPersistentEditText = '1.0.2' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' +googlePlayReview = '2.0.1' [libraries] android-appUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayAppUpdate" } @@ -116,6 +117,8 @@ mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", versio wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" } wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } +google-play-review = { group = "com.google.android.play", name = "review", version.ref ="googlePlayReview" } +google-play-review-ktx = { group = "com.google.android.play", name = "review-ktx", version.ref ="googlePlayReview" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } From e6dd2329d2f1708a111c7e93acfb5df347ea4139 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 05:36:51 +0530 Subject: [PATCH 038/117] Reordered libraries alphabetically --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af4b5bed882a..84a61e2e2b0f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,6 +21,7 @@ facebookReact = '0.73.3' flipper = '0.247.0' glide = '4.16.0' googlePlayAppUpdate = '2.1.0' +googlePlayReview = '2.0.1' gson = '2.10.1' junit = '4.13.2' kotlinxCoroutines = '1.7.3' @@ -28,10 +29,9 @@ lottie = '6.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' soLoader = '0.10.5' -wordPressPersistentEditText = '1.0.2' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' -googlePlayReview = '2.0.1' +wordPressPersistentEditText = '1.0.2' [libraries] android-appUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayAppUpdate" } @@ -106,6 +106,8 @@ glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="gli glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +google-play-review = { group = "com.google.android.play", name = "review", version.ref ="googlePlayReview" } +google-play-review-ktx = { group = "com.google.android.play", name = "review-ktx", version.ref ="googlePlayReview" } junit = { group = "junit", name = "junit", version.ref ="junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } @@ -117,8 +119,6 @@ mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", versio wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" } wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } -google-play-review = { group = "com.google.android.play", name = "review", version.ref ="googlePlayReview" } -google-play-review-ktx = { group = "com.google.android.play", name = "review-ktx", version.ref ="googlePlayReview" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } From ee96dffaff6787525b82e68f2cc134c18a122a5b Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 05:41:32 +0530 Subject: [PATCH 039/117] Deps: Migrated `volley` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/editor/build.gradle | 2 +- libs/networking/build.gradle | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 788301c58e30..6f02538f3975 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -430,7 +430,7 @@ dependencies { implementation libs.androidx.lifecycle.livedata implementation libs.androidx.lifecycle.livedata.ktx implementation libs.androidx.lifecycle.process - implementation "com.android.volley:volley:$androidVolleyVersion" + implementation libs.volley implementation libs.google.play.review implementation libs.google.play.review.ktx implementation "com.google.android.gms:play-services-auth:$googlePlayServicesAuthVersion" diff --git a/build.gradle b/build.gradle index 2a5b04b5cacd..092d86c31b9d 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,6 @@ ext { // main androidInstallReferrerVersion = '2.2' - androidVolleyVersion = '1.2.1' androidxAnnotationVersion = '1.6.0' androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 84a61e2e2b0f..8149f29615a5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,6 +29,7 @@ lottie = '6.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' soLoader = '0.10.5' +volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' wordPressPersistentEditText = '1.0.2' @@ -116,6 +117,7 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" } +volley = { group = "com.android.volley", name = "volley", version.ref = "volley" } wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" } wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 8ba0e2dc898d..534abdc4b3f5 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -104,7 +104,7 @@ dependencies { implementation libs.androidx.appcompat implementation "androidx.preference:preference:$androidxPreferenceVersion" implementation "com.google.android.material:material:$googleMaterialVersion" - implementation "com.android.volley:volley:$androidVolleyVersion" + implementation libs.volley implementation libs.google.gson implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle index f88dff748c38..6102b959ef92 100644 --- a/libs/networking/build.gradle +++ b/libs/networking/build.gradle @@ -32,7 +32,7 @@ dependencies { } implementation "org.wordpress:utils:$wordPressUtilsVersion" - implementation "com.android.volley:volley:$androidVolleyVersion" + implementation libs.volley implementation "androidx.annotation:annotation:$androidxAnnotationVersion" lintChecks "org.wordpress:lint:$wordPressLintVersion" From d59033b1993b9c7dc62b72f66cb13df6f9bd106f Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 05:45:45 +0530 Subject: [PATCH 040/117] Deps: Migrated `eventBus` to Version Catalog --- WordPress/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 6f02538f3975..07ed2bf66032 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -445,8 +445,8 @@ dependencies { implementation "com.android.installreferrer:installreferrer:$androidInstallReferrerVersion" implementation "com.github.chrisbanes:PhotoView:$chrisbanesPhotoviewVersion" - implementation "org.greenrobot:eventbus:$eventBusVersion" - implementation "org.greenrobot:eventbus-java:$eventBusVersion" + implementation libs.greenrobot.eventBus + implementation libs.greenrobot.eventBus.java implementation "com.squareup.retrofit2:retrofit:$squareupRetrofitVersion" implementation "org.apache.commons:commons-text:$apacheCommonsTextVersion" implementation libs.lottie diff --git a/build.gradle b/build.gradle index 092d86c31b9d..24d4d6b243cf 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,6 @@ ext { apacheCommonsTextVersion = '1.10.0' coilComposeVersion = '2.4.0' chrisbanesPhotoviewVersion = '2.3.0' - eventBusVersion = '3.3.1' facebookShimmerVersion = '0.5.0' firebaseBomVersion = '32.1.0' firebaseIidVersion = '21.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8149f29615a5..bcc347727434 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,6 +17,7 @@ androidxWorkManager = "2.9.0" assertj = '3.23.1' automatticRest = '1.0.8' dagger = '2.50' +eventBus = '3.3.1' facebookReact = '0.73.3' flipper = '0.247.0' glide = '4.16.0' @@ -109,6 +110,8 @@ glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } google-play-review = { group = "com.google.android.play", name = "review", version.ref ="googlePlayReview" } google-play-review-ktx = { group = "com.google.android.play", name = "review-ktx", version.ref ="googlePlayReview" } +greenrobot-eventBus = { group = "org.greenrobot", name = "eventbus", version.ref ="eventBus" } +greenrobot-eventBus-java = { group = "org.greenrobot", name = "eventbus-java", version.ref ="eventBus" } junit = { group = "junit", name = "junit", version.ref ="junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } From 849a80b2552f4e29b86eecbe898f17bf4b607b6a Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 06:28:52 +0530 Subject: [PATCH 041/117] Deps: Migrated `constraintLayout` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/image-editor/build.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 07ed2bf66032..dfa4af3d77e9 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -423,7 +423,7 @@ dependencies { implementation "androidx.preference:preference:$androidxPreferenceVersion" implementation libs.androidx.workManager.runtime implementation libs.androidx.workManager.runtime.ktx - implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" + implementation libs.androidx.constraintLayout implementation libs.androidx.lifecycle.viewmodel implementation libs.androidx.lifecycle.viewmodel.ktx implementation libs.androidx.lifecycle.livedata.core diff --git a/build.gradle b/build.gradle index 24d4d6b243cf..706a98d74fca 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,6 @@ ext { androidxAnnotationVersion = '1.6.0' androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' - androidxConstraintlayoutVersion = '2.1.4' androidxConstraintlayoutComposeVersion = '1.0.1' androidxGridlayoutVersion = '1.0.0' androidxPercentlayoutVersion = '1.0.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bcc347727434..3586cdac39cd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ androidxArchCore = '2.2.0' androidxCamera = '1.3.4' androidxCardview = '1.0.0' androidxComposeNavigation = '2.7.6' +androidxConstraintlayout = '2.1.4' androidxCore = '1.10.0' androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' @@ -60,6 +61,7 @@ androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-juni androidx-compose-ui-text = { group = "androidx.compose.ui", name = "ui-text" } androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } androidx-compose-ui-unit = { group = "androidx.compose.ui", name = "ui-unit" } +androidx-constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintlayout" } 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" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 1c52f8084ffc..c221d7cd5e07 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation libs.androidx.fragment implementation libs.androidx.appcompat implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" - implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion" + implementation libs.androidx.constraintLayout implementation "androidx.viewpager2:viewpager2:$androidxViewpager2Version" implementation "com.google.android.material:material:$googleMaterialVersion" implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion" From 66e893e3150b19f2dde27302426eda5bed3511d7 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 06:37:23 +0530 Subject: [PATCH 042/117] Deps: Migrated `ConstraintlayoutCompose` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index dfa4af3d77e9..5fa7ccca95ca 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -550,7 +550,7 @@ dependencies { implementation libs.androidx.compose.material // - Jetpack Compose - AndroidX implementation libs.androidx.lifecycle.viewmodel.compose - implementation "androidx.constraintlayout:constraintlayout-compose:$androidxConstraintlayoutComposeVersion" + implementation libs.androidx.constraintLayout.compose // - Jetpack Compose - Other implementation "io.coil-kt:coil-compose:$coilComposeVersion" implementation libs.lottie.compose diff --git a/build.gradle b/build.gradle index 706a98d74fca..2c05e0bc7116 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,6 @@ ext { androidxAnnotationVersion = '1.6.0' androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' - androidxConstraintlayoutComposeVersion = '1.0.1' androidxGridlayoutVersion = '1.0.0' androidxPercentlayoutVersion = '1.0.0' androidxPreferenceVersion = '1.2.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3586cdac39cd..46eaf0745f0b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ androidxCamera = '1.3.4' androidxCardview = '1.0.0' androidxComposeNavigation = '2.7.6' androidxConstraintlayout = '2.1.4' +androidxConstraintlayoutCompose = '1.0.1' androidxCore = '1.10.0' androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' @@ -62,6 +63,7 @@ androidx-compose-ui-text = { group = "androidx.compose.ui", name = "ui-text" } androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } androidx-compose-ui-unit = { group = "androidx.compose.ui", name = "ui-unit" } androidx-constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintlayout" } +androidx-constraintLayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref ="androidxConstraintlayoutCompose" } 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" } From 2f8ca3de5b95f7e6b63117391dd25e5aa143c96d Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 06:40:25 +0530 Subject: [PATCH 043/117] Deps: Migrated `RecyclerView` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/image-editor/build.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 5fa7ccca95ca..10f2b96940e9 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -415,7 +415,7 @@ dependencies { implementation libs.androidx.appcompat implementation libs.androidx.appcompat.resources implementation libs.androidx.cardView - implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" + implementation libs.androidx.recyclerView implementation "com.google.android.material:material:$googleMaterialVersion" implementation "com.google.android.flexbox:flexbox:$googleFlexboxlayoutVersion" implementation "androidx.percentlayout:percentlayout:$androidxPercentlayoutVersion" diff --git a/build.gradle b/build.gradle index 2c05e0bc7116..92e206526fd4 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,6 @@ ext { androidxGridlayoutVersion = '1.0.0' androidxPercentlayoutVersion = '1.0.0' androidxPreferenceVersion = '1.2.0' - androidxRecyclerviewVersion = '1.3.0' androidxSwipeToRefreshVersion = '1.1.0' androidxViewpager2Version = '1.0.0' androidxComposeMaterial3Version = '1.1.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 46eaf0745f0b..9d5f665e53dd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,6 +10,7 @@ androidxConstraintlayoutCompose = '1.0.1' androidxCore = '1.10.0' androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' +androidxRecyclerview = '1.3.0' androidxTest = '1.5.0' androidxTestEspresso = '3.4.0' androidxTestExtJunit = '1.1.5' @@ -83,6 +84,7 @@ androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "l androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } +androidx-recyclerView = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidxRecyclerview" } androidx-test-espresso-accessibility = { group = "androidx.test.espresso", name = "espresso-accessibility", version.ref ="androidxTestEspresso" } androidx-test-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref ="androidxTestEspresso" } androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref ="androidxTestEspresso" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index c221d7cd5e07..78c34f8c76c9 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation libs.androidx.activity.ktx implementation libs.androidx.fragment implementation libs.androidx.appcompat - implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion" + implementation libs.androidx.recyclerView implementation libs.androidx.constraintLayout implementation "androidx.viewpager2:viewpager2:$androidxViewpager2Version" implementation "com.google.android.material:material:$googleMaterialVersion" From 49fda1f3c29f122dca13050565635222ae508642 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 06:53:15 +0530 Subject: [PATCH 044/117] Deps: Migrated `Mlkit` to Version Catalog --- WordPress/build.gradle | 6 +++--- build.gradle | 4 ---- gradle/libs.versions.toml | 6 ++++++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 10f2b96940e9..9f2b435f757b 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -434,9 +434,9 @@ dependencies { implementation libs.google.play.review implementation libs.google.play.review.ktx implementation "com.google.android.gms:play-services-auth:$googlePlayServicesAuthVersion" - implementation "com.google.mlkit:barcode-scanning-common:$googleMLKitBarcodeScanningCommonVersion" - implementation "com.google.mlkit:text-recognition:$googleMLKitTextRecognitionVersion" - implementation "com.google.mlkit:barcode-scanning:$googleMLKitBarcodeScanningVersion" + implementation libs.google.mlkit.barcode.scanning.common + implementation libs.google.mlkit.text.recognition + implementation libs.google.mlkit.barcode.scanning // CameraX implementation libs.androidx.camera diff --git a/build.gradle b/build.gradle index 92e206526fd4..0f2162b4ee4c 100644 --- a/build.gradle +++ b/build.gradle @@ -52,10 +52,6 @@ ext { googleExoPlayerVersion = '2.13.3' googleFlexboxlayoutVersion = '3.0.0' googleMaterialVersion = '1.9.0' - - googleMLKitBarcodeScanningVersion = '17.2.0' - googleMLKitBarcodeScanningCommonVersion = '17.0.0' - googleMLKitTextRecognitionVersion = '16.0.0' googlePlayServicesAuthVersion = '20.4.1' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' jsoupVersion = '1.16.2' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9d5f665e53dd..1629f3394e6c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,9 @@ eventBus = '3.3.1' facebookReact = '0.73.3' flipper = '0.247.0' glide = '4.16.0' +googleMLKitBarcodeScanning = '17.2.0' +googleMLKitBarcodeScanningCommon = '17.0.0' +googleMLKitTextRecognition = '16.0.0' googlePlayAppUpdate = '2.1.0' googlePlayReview = '2.0.1' gson = '2.10.1' @@ -114,6 +117,9 @@ glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="gli glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +google-mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref ="googleMLKitBarcodeScanning" } +google-mlkit-barcode-scanning-common = { group = "com.google.mlkit", name = "barcode-scanning-common", version.ref ="googleMLKitBarcodeScanningCommon" } +google-mlkit-text-recognition = { group = "com.google.mlkit", name = "text-recognition", version.ref ="googleMLKitTextRecognition" } google-play-review = { group = "com.google.android.play", name = "review", version.ref ="googlePlayReview" } google-play-review-ktx = { group = "com.google.android.play", name = "review-ktx", version.ref ="googlePlayReview" } greenrobot-eventBus = { group = "org.greenrobot", name = "eventbus", version.ref ="eventBus" } From 344673c11d34d3dfc369c18ad7419bb74dff3b22 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 08:27:53 +0530 Subject: [PATCH 045/117] Deps: Migrated `googlePlayServicesAuth ` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 9f2b435f757b..80d017a9de84 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -433,7 +433,7 @@ dependencies { implementation libs.volley implementation libs.google.play.review implementation libs.google.play.review.ktx - implementation "com.google.android.gms:play-services-auth:$googlePlayServicesAuthVersion" + implementation libs.google.play.services.auth implementation libs.google.mlkit.barcode.scanning.common implementation libs.google.mlkit.text.recognition implementation libs.google.mlkit.barcode.scanning diff --git a/build.gradle b/build.gradle index 0f2162b4ee4c..ce5929e608af 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,6 @@ ext { googleExoPlayerVersion = '2.13.3' googleFlexboxlayoutVersion = '3.0.0' googleMaterialVersion = '1.9.0' - googlePlayServicesAuthVersion = '20.4.1' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' jsoupVersion = '1.16.2' philjayMpAndroidChartVersion = 'v3.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1629f3394e6c..3d1a92c64a7b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,6 +29,7 @@ googleMLKitBarcodeScanningCommon = '17.0.0' googleMLKitTextRecognition = '16.0.0' googlePlayAppUpdate = '2.1.0' googlePlayReview = '2.0.1' +googlePlayServicesAuth = '20.4.1' gson = '2.10.1' junit = '4.13.2' kotlinxCoroutines = '1.7.3' @@ -122,6 +123,7 @@ google-mlkit-barcode-scanning-common = { group = "com.google.mlkit", name = "bar google-mlkit-text-recognition = { group = "com.google.mlkit", name = "text-recognition", version.ref ="googleMLKitTextRecognition" } google-play-review = { group = "com.google.android.play", name = "review", version.ref ="googlePlayReview" } google-play-review-ktx = { group = "com.google.android.play", name = "review-ktx", version.ref ="googlePlayReview" } +google-play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref ="googlePlayServicesAuth" } greenrobot-eventBus = { group = "org.greenrobot", name = "eventbus", version.ref ="eventBus" } greenrobot-eventBus-java = { group = "org.greenrobot", name = "eventbus-java", version.ref ="eventBus" } junit = { group = "junit", name = "junit", version.ref ="junit" } From 7d201f8ef3f352c9c58921f47d0713ec8add1956 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 08:33:57 +0530 Subject: [PATCH 046/117] Deps: Migrated `googleMaterial` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/editor/build.gradle | 2 +- libs/image-editor/build.gradle | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 80d017a9de84..bb670f97409f 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -416,7 +416,7 @@ dependencies { implementation libs.androidx.appcompat.resources implementation libs.androidx.cardView implementation libs.androidx.recyclerView - implementation "com.google.android.material:material:$googleMaterialVersion" + implementation libs.google.material implementation "com.google.android.flexbox:flexbox:$googleFlexboxlayoutVersion" implementation "androidx.percentlayout:percentlayout:$androidxPercentlayoutVersion" implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeToRefreshVersion" diff --git a/build.gradle b/build.gradle index ce5929e608af..af6b8b65410e 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,6 @@ ext { googleAutoServiceVersion = '1.0.1' googleExoPlayerVersion = '2.13.3' googleFlexboxlayoutVersion = '3.0.0' - googleMaterialVersion = '1.9.0' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' jsoupVersion = '1.16.2' philjayMpAndroidChartVersion = 'v3.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3d1a92c64a7b..6c467ee642bf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,7 @@ eventBus = '3.3.1' facebookReact = '0.73.3' flipper = '0.247.0' glide = '4.16.0' +googleMaterial = '1.9.0' googleMLKitBarcodeScanning = '17.2.0' googleMLKitBarcodeScanningCommon = '17.0.0' googleMLKitTextRecognition = '16.0.0' @@ -118,6 +119,7 @@ glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="gli glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +google-material = { group = "com.google.android.material", name = "material", version.ref = "googleMaterial" } google-mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref ="googleMLKitBarcodeScanning" } google-mlkit-barcode-scanning-common = { group = "com.google.mlkit", name = "barcode-scanning-common", version.ref ="googleMLKitBarcodeScanningCommon" } google-mlkit-text-recognition = { group = "com.google.mlkit", name = "text-recognition", version.ref ="googleMLKitTextRecognition" } diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 534abdc4b3f5..c59bcd782a92 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -103,7 +103,7 @@ dependencies { implementation libs.androidx.fragment implementation libs.androidx.appcompat implementation "androidx.preference:preference:$androidxPreferenceVersion" - implementation "com.google.android.material:material:$googleMaterialVersion" + implementation libs.google.material implementation libs.volley implementation libs.google.gson implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 78c34f8c76c9..f4189006c4ef 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -54,7 +54,7 @@ dependencies { implementation libs.androidx.recyclerView implementation libs.androidx.constraintLayout implementation "androidx.viewpager2:viewpager2:$androidxViewpager2Version" - implementation "com.google.android.material:material:$googleMaterialVersion" + implementation libs.google.material implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion" implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion" implementation libs.androidx.lifecycle.common From 738d961f3a6668812e17a9908dfc7080b20f7b30 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 08:40:15 +0530 Subject: [PATCH 047/117] Deps: Migrated `composeMaterial` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index bb670f97409f..98b760901ed6 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -556,7 +556,7 @@ dependencies { implementation libs.lottie.compose // - Jetpack Compose - UI Tests androidTestImplementation libs.androidx.compose.ui.test - implementation "androidx.compose.material3:material3:$androidxComposeMaterial3Version" + implementation libs.androidx.compose.material3 // Cascade - Compose nested menu implementation "me.saket.cascade:cascade-compose:2.3.0" diff --git a/build.gradle b/build.gradle index af6b8b65410e..f2bb080ab64c 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,6 @@ ext { androidxPreferenceVersion = '1.2.0' androidxSwipeToRefreshVersion = '1.1.0' androidxViewpager2Version = '1.0.0' - androidxComposeMaterial3Version = '1.1.1' apacheCommonsTextVersion = '1.10.0' coilComposeVersion = '2.4.0' chrisbanesPhotoviewVersion = '2.3.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6c467ee642bf..73873e22253f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,6 +4,7 @@ androidxAppcompat = '1.6.1' androidxArchCore = '2.2.0' androidxCamera = '1.3.4' androidxCardview = '1.0.0' +androidxComposeMaterial3 = '1.1.1' androidxComposeNavigation = '2.7.6' androidxConstraintlayout = '2.1.4' androidxConstraintlayoutCompose = '1.0.1' @@ -58,6 +59,7 @@ androidx-cardView = { group = "androidx.cardview", name = "cardview", version.re 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" } +androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref ="androidxComposeMaterial3" } androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" } androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } androidx-compose-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } From 2f86b085dc6102c0606d63e79f8efd07c6bfbd62 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 08:43:08 +0530 Subject: [PATCH 048/117] Deps: Migrated `googleFlexbox` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 98b760901ed6..ce59271046a7 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -417,7 +417,7 @@ dependencies { implementation libs.androidx.cardView implementation libs.androidx.recyclerView implementation libs.google.material - implementation "com.google.android.flexbox:flexbox:$googleFlexboxlayoutVersion" + implementation libs.google.flexbox implementation "androidx.percentlayout:percentlayout:$androidxPercentlayoutVersion" implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeToRefreshVersion" implementation "androidx.preference:preference:$androidxPreferenceVersion" diff --git a/build.gradle b/build.gradle index f2bb080ab64c..a1b2472c8550 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,6 @@ ext { firebaseIidVersion = '21.1.0' googleAutoServiceVersion = '1.0.1' googleExoPlayerVersion = '2.13.3' - googleFlexboxlayoutVersion = '3.0.0' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' jsoupVersion = '1.16.2' philjayMpAndroidChartVersion = 'v3.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 73873e22253f..60442d3b9180 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,6 +25,7 @@ eventBus = '3.3.1' facebookReact = '0.73.3' flipper = '0.247.0' glide = '4.16.0' +googleFlexbox = '3.0.0' googleMaterial = '1.9.0' googleMLKitBarcodeScanning = '17.2.0' googleMLKitBarcodeScanningCommon = '17.0.0' @@ -120,6 +121,7 @@ facebook-soLoader = { group = "com.facebook.soloader", name = "soloader", versio glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } +google-flexbox = { group = "com.google.android.flexbox", name = "flexbox", version.ref = "googleFlexbox" } google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } google-material = { group = "com.google.android.material", name = "material", version.ref = "googleMaterial" } google-mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref ="googleMLKitBarcodeScanning" } From 2bb31ee9de4b43b869d15178b803adb84847aa34 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 08:45:49 +0530 Subject: [PATCH 049/117] Deps: Migrated `androidxPercentLayout` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index ce59271046a7..ef3360bb3509 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -418,7 +418,7 @@ dependencies { implementation libs.androidx.recyclerView implementation libs.google.material implementation libs.google.flexbox - implementation "androidx.percentlayout:percentlayout:$androidxPercentlayoutVersion" + implementation libs.androidx.percentLayout implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeToRefreshVersion" implementation "androidx.preference:preference:$androidxPreferenceVersion" implementation libs.androidx.workManager.runtime diff --git a/build.gradle b/build.gradle index a1b2472c8550..860017820ef4 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,6 @@ ext { androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' androidxGridlayoutVersion = '1.0.0' - androidxPercentlayoutVersion = '1.0.0' androidxPreferenceVersion = '1.2.0' androidxSwipeToRefreshVersion = '1.1.0' androidxViewpager2Version = '1.0.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60442d3b9180..e24dfb8579d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,6 +11,7 @@ androidxConstraintlayoutCompose = '1.0.1' androidxCore = '1.10.0' androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' +androidxPercentLayout = '1.0.0' androidxRecyclerview = '1.3.0' androidxTest = '1.5.0' androidxTestEspresso = '3.4.0' @@ -92,6 +93,7 @@ androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "l androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } +androidx-percentLayout = { group = "androidx.percentlayout", name = "percentlayout", version.ref = "androidxPercentLayout" } androidx-recyclerView = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidxRecyclerview" } androidx-test-espresso-accessibility = { group = "androidx.test.espresso", name = "espresso-accessibility", version.ref ="androidxTestEspresso" } androidx-test-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref ="androidxTestEspresso" } From d2e3085ac1ef55dec483db16380d3075e3c03119 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 08:48:58 +0530 Subject: [PATCH 050/117] Deps: Migrated `androidxPreference` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/analytics/build.gradle | 2 +- libs/editor/build.gradle | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index ef3360bb3509..48f120dd7cb3 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -420,7 +420,7 @@ dependencies { implementation libs.google.flexbox implementation libs.androidx.percentLayout implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeToRefreshVersion" - implementation "androidx.preference:preference:$androidxPreferenceVersion" + implementation libs.androidx.preference implementation libs.androidx.workManager.runtime implementation libs.androidx.workManager.runtime.ktx implementation libs.androidx.constraintLayout diff --git a/build.gradle b/build.gradle index 860017820ef4..124cb602dd09 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,6 @@ ext { androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' androidxGridlayoutVersion = '1.0.0' - androidxPreferenceVersion = '1.2.0' androidxSwipeToRefreshVersion = '1.1.0' androidxViewpager2Version = '1.0.0' apacheCommonsTextVersion = '1.10.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e24dfb8579d7..cc5f2ea98562 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,6 +12,7 @@ androidxCore = '1.10.0' androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' androidxPercentLayout = '1.0.0' +androidxPreference = '1.2.0' androidxRecyclerview = '1.3.0' androidxTest = '1.5.0' androidxTestEspresso = '3.4.0' @@ -94,6 +95,7 @@ androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifec androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } androidx-percentLayout = { group = "androidx.percentlayout", name = "percentlayout", version.ref = "androidxPercentLayout" } +androidx-preference = { group = "androidx.preference", name = "preference", version.ref = "androidxPreference" } androidx-recyclerView = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidxRecyclerview" } androidx-test-espresso-accessibility = { group = "androidx.test.espresso", name = "espresso-accessibility", version.ref ="androidxTestEspresso" } androidx-test-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref ="androidxTestEspresso" } diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle index d3e8edf28570..d82e29b11570 100644 --- a/libs/analytics/build.gradle +++ b/libs/analytics/build.gradle @@ -17,7 +17,7 @@ dependencies { implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion" implementation "org.wordpress:utils:$wordPressUtilsVersion" - implementation "androidx.preference:preference:$androidxPreferenceVersion" + implementation libs.androidx.preference lintChecks "org.wordpress:lint:$wordPressLintVersion" } diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index c59bcd782a92..ea6ba710146b 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -102,7 +102,7 @@ dependencies { implementation libs.androidx.core implementation libs.androidx.fragment implementation libs.androidx.appcompat - implementation "androidx.preference:preference:$androidxPreferenceVersion" + implementation libs.androidx.preference implementation libs.google.material implementation libs.volley implementation libs.google.gson From 825982e703433cfda217b1b4a5e093b1aeeed24f Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 08:55:34 +0530 Subject: [PATCH 051/117] Deps: Migrated `androidxSwipeRefreshLayout` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 48f120dd7cb3..9fab5958363d 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -419,7 +419,7 @@ dependencies { implementation libs.google.material implementation libs.google.flexbox implementation libs.androidx.percentLayout - implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeToRefreshVersion" + implementation libs.androidx.swiperefreshlayout implementation libs.androidx.preference implementation libs.androidx.workManager.runtime implementation libs.androidx.workManager.runtime.ktx diff --git a/build.gradle b/build.gradle index 124cb602dd09..915cfe9cd33e 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,6 @@ ext { androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' androidxGridlayoutVersion = '1.0.0' - androidxSwipeToRefreshVersion = '1.1.0' androidxViewpager2Version = '1.0.0' apacheCommonsTextVersion = '1.10.0' coilComposeVersion = '2.4.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cc5f2ea98562..94feaba5135d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,6 +14,7 @@ androidxLifecycle = '2.6.2' androidxPercentLayout = '1.0.0' androidxPreference = '1.2.0' androidxRecyclerview = '1.3.0' +androidxSwipeRefreshLayout = '1.1.0' androidxTest = '1.5.0' androidxTestEspresso = '3.4.0' androidxTestExtJunit = '1.1.5' @@ -97,6 +98,7 @@ androidx-navigation = { group = "androidx.navigation", name = "navigation-compos androidx-percentLayout = { group = "androidx.percentlayout", name = "percentlayout", version.ref = "androidxPercentLayout" } androidx-preference = { group = "androidx.preference", name = "preference", version.ref = "androidxPreference" } androidx-recyclerView = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidxRecyclerview" } +androidx-swiperefreshlayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "androidxSwipeRefreshLayout" } androidx-test-espresso-accessibility = { group = "androidx.test.espresso", name = "espresso-accessibility", version.ref ="androidxTestEspresso" } androidx-test-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref ="androidxTestEspresso" } androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref ="androidxTestEspresso" } From 1dd413bc0e9f155b107cf576f46d4e0298673b33 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 08:58:18 +0530 Subject: [PATCH 052/117] Deps: Migrated `zendesk` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 9fab5958363d..38882713e6ba 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -461,7 +461,7 @@ dependencies { implementation libs.glide.volley.integration implementation "com.github.indexos.media-for-mobile:domain:$indexosMediaForMobileVersion" implementation "com.github.indexos.media-for-mobile:android:$indexosMediaForMobileVersion" - implementation "com.zendesk:support:$zendeskVersion" + implementation libs.zendesk implementation (name:'tenor-android-core-jetified', ext:'aar') // Jetified Tenor Gif library implementation libs.kotlinx.coroutines.core implementation libs.kotlinx.coroutines.android diff --git a/build.gradle b/build.gradle index 915cfe9cd33e..1adc30bf106e 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,6 @@ ext { squareupKotlinPoetVersion = '1.16.0' squareupRetrofitVersion = '2.9.0' uCropVersion = '2.2.9' - zendeskVersion = '5.1.2' // android test screengrabVersion = '2.1.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94feaba5135d..70dce687f78f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -47,6 +47,7 @@ volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' wordPressPersistentEditText = '1.0.2' +zendesk = '5.1.2' [libraries] android-appUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayAppUpdate" } @@ -150,6 +151,7 @@ volley = { group = "com.android.volley", name = "volley", version.ref = "volley" wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" } wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } +zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } From 7f4743c2c6b7ae24e18b841f8714333d9028ef99 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 09:01:52 +0530 Subject: [PATCH 053/117] Deps: Migrated `squareupMockWebServer` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 38882713e6ba..1cfae35da31f 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -490,7 +490,7 @@ dependencies { androidTestImplementation libs.mockito.android androidTestImplementation libs.mockito.kotlin - androidTestImplementation "com.squareup.okhttp3:mockwebserver:$squareupMockWebServerVersion" + androidTestImplementation libs.squareup.okhttp.mockWebServer androidTestImplementation libs.androidx.test.ui.automator androidTestImplementation libs.androidx.test.espresso.core, { exclude group: 'com.android.support', module: 'support-annotations' diff --git a/build.gradle b/build.gradle index 1adc30bf106e..69466f723ce5 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,6 @@ ext { // android test screengrabVersion = '2.1.1' - squareupMockWebServerVersion = '4.12.0' // other androidDesugarVersion = '2.0.4' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 70dce687f78f..e8d7649f4f33 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,6 +43,7 @@ lottie = '6.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' soLoader = '0.10.5' +squareupMockWebServer = '4.12.0' volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' @@ -147,6 +148,7 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" } +squareup-okhttp-mockWebServer = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref ="squareupMockWebServer" } volley = { group = "com.android.volley", name = "volley", version.ref = "volley" } wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" } wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } From 530608b6f768ac86e039d51d230d33d7fa4a107f Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 09:04:08 +0530 Subject: [PATCH 054/117] Deps: Migrated `screengrab` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 3 --- gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 1cfae35da31f..9a2034ebbf13 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -511,7 +511,7 @@ dependencies { androidTestImplementation libs.androidx.test.runner androidTestImplementation libs.androidx.test.rules androidTestImplementation libs.androidx.test.ext.junit - androidTestImplementation "tools.fastlane:screengrab:$screengrabVersion", { + androidTestImplementation libs.fastlane.screengrab, { exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18' } androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing diff --git a/build.gradle b/build.gradle index 69466f723ce5..350f325d74b6 100644 --- a/build.gradle +++ b/build.gradle @@ -53,9 +53,6 @@ ext { squareupRetrofitVersion = '2.9.0' uCropVersion = '2.2.9' - // android test - screengrabVersion = '2.1.1' - // other androidDesugarVersion = '2.0.4' wordPressLintVersion = '2.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e8d7649f4f33..2541a709c2d8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -42,6 +42,7 @@ kotlinxCoroutines = '1.7.3' lottie = '6.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' +screengrab = '2.1.1' soLoader = '0.10.5' squareupMockWebServer = '4.12.0' volley = '1.2.1' @@ -126,6 +127,7 @@ facebook-flipper-noop = { group = "com.facebook.flipper", name = "flipper-noop", facebook-react-android = { group = "com.facebook.react", name = "react-android", version.ref ="facebookReact" } facebook-react-hermesAndroid = { group = "com.facebook.react", name = "hermes-android", version.ref ="facebookReact" } facebook-soLoader = { group = "com.facebook.soloader", name = "soloader", version.ref ="soLoader" } +fastlane-screengrab = { group = "tools.fastlane", name = "screengrab", version.ref ="screengrab" } glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } From 0917165ab073c6b16256e5a49a6e10316ecc5641 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 09:21:19 +0530 Subject: [PATCH 055/117] Deps: Migrated `jsoup` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 9a2034ebbf13..867a80b681b3 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -466,7 +466,7 @@ dependencies { implementation libs.kotlinx.coroutines.core implementation libs.kotlinx.coroutines.android implementation "com.github.PhilJay:MPAndroidChart:$philjayMpAndroidChartVersion" - implementation "org.jsoup:jsoup:$jsoupVersion" + implementation libs.jsoup implementation ("com.google.android.exoplayer:exoplayer:$googleExoPlayerVersion") { exclude group: 'com.android.support', module: 'support-annotations' } diff --git a/build.gradle b/build.gradle index 350f325d74b6..4ef4392a9f80 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,6 @@ ext { googleAutoServiceVersion = '1.0.1' googleExoPlayerVersion = '2.13.3' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' - jsoupVersion = '1.16.2' 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 2541a709c2d8..1090d63d7079 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,6 +37,7 @@ googlePlayAppUpdate = '2.1.0' googlePlayReview = '2.0.1' googlePlayServicesAuth = '20.4.1' gson = '2.10.1' +jsoup = '1.16.2' junit = '4.13.2' kotlinxCoroutines = '1.7.3' lottie = '6.1.0' @@ -142,6 +143,7 @@ google-play-review-ktx = { group = "com.google.android.play", name = "review-ktx google-play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref ="googlePlayServicesAuth" } greenrobot-eventBus = { group = "org.greenrobot", name = "eventbus", version.ref ="eventBus" } greenrobot-eventBus-java = { group = "org.greenrobot", name = "eventbus-java", version.ref ="eventBus" } +jsoup = { group = "org.jsoup", name = "jsoup", version.ref ="jsoup" } junit = { group = "junit", name = "junit", version.ref ="junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } From ad3f08a079f56b31fb9bcf79e20989a83646ec9a Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 09:24:39 +0530 Subject: [PATCH 056/117] Deps: Migrated `facebookShimmer` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 867a80b681b3..49bb3ffa2cc6 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -450,7 +450,7 @@ dependencies { implementation "com.squareup.retrofit2:retrofit:$squareupRetrofitVersion" implementation "org.apache.commons:commons-text:$apacheCommonsTextVersion" implementation libs.lottie - implementation "com.facebook.shimmer:shimmer:$facebookShimmerVersion" + implementation libs.facebook.shimmer implementation ("com.github.yalantis:ucrop:$uCropVersion") { exclude group: 'androidx.core', module: 'core' exclude group: 'androidx.constraintlayout', module: 'constraintlayout' diff --git a/build.gradle b/build.gradle index 4ef4392a9f80..01b1aa6d80ac 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,6 @@ ext { apacheCommonsTextVersion = '1.10.0' coilComposeVersion = '2.4.0' chrisbanesPhotoviewVersion = '2.3.0' - facebookShimmerVersion = '0.5.0' firebaseBomVersion = '32.1.0' firebaseIidVersion = '21.1.0' googleAutoServiceVersion = '1.0.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1090d63d7079..0a5b02240da2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,6 +26,7 @@ automatticRest = '1.0.8' dagger = '2.50' eventBus = '3.3.1' facebookReact = '0.73.3' +facebookShimmer = '0.5.0' flipper = '0.247.0' glide = '4.16.0' googleFlexbox = '3.0.0' @@ -127,6 +128,7 @@ facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flip facebook-flipper-noop = { group = "com.facebook.flipper", name = "flipper-noop", version.ref ="flipper" } facebook-react-android = { group = "com.facebook.react", name = "react-android", version.ref ="facebookReact" } facebook-react-hermesAndroid = { group = "com.facebook.react", name = "hermes-android", version.ref ="facebookReact" } +facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref ="facebookShimmer" } facebook-soLoader = { group = "com.facebook.soloader", name = "soloader", version.ref ="soLoader" } fastlane-screengrab = { group = "tools.fastlane", name = "screengrab", version.ref ="screengrab" } glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } From 280e4d4a050f8a7314da720eed6aac1d6a3fd137 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 09:27:20 +0530 Subject: [PATCH 057/117] Deps: Migrated `chrisbanesPhotoview` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 49bb3ffa2cc6..9ff7eadd7d78 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -444,7 +444,7 @@ dependencies { implementation libs.androidx.camera.view implementation "com.android.installreferrer:installreferrer:$androidInstallReferrerVersion" - implementation "com.github.chrisbanes:PhotoView:$chrisbanesPhotoviewVersion" + implementation libs.chrisbanes.photoview implementation libs.greenrobot.eventBus implementation libs.greenrobot.eventBus.java implementation "com.squareup.retrofit2:retrofit:$squareupRetrofitVersion" diff --git a/build.gradle b/build.gradle index 01b1aa6d80ac..e2781874a1aa 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,6 @@ ext { androidxViewpager2Version = '1.0.0' apacheCommonsTextVersion = '1.10.0' coilComposeVersion = '2.4.0' - chrisbanesPhotoviewVersion = '2.3.0' firebaseBomVersion = '32.1.0' firebaseIidVersion = '21.1.0' googleAutoServiceVersion = '1.0.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0a5b02240da2..8a0dc08bfc96 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,6 +23,7 @@ androidxWebkit = '1.11.0' androidxWorkManager = "2.9.0" assertj = '3.23.1' automatticRest = '1.0.8' +chrisbanesPhotoview = '2.3.0' dagger = '2.50' eventBus = '3.3.1' facebookReact = '0.73.3' @@ -117,6 +118,7 @@ androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runti androidx-workManager-workTesting = { group = "androidx.work", name = "work-testing", version.ref = "androidxWorkManager" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref ="assertj" } automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } +chrisbanes-photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoview" } dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "dagger" } dagger-android-support = { group = "com.google.dagger", name = "dagger-android-support", version.ref = "dagger" } dagger-hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger" } From 0184e34549aa398d8dcf60279b0e899c2deb61f2 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 09:31:57 +0530 Subject: [PATCH 058/117] Deps: Migrated `squareupRetrofit` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 9ff7eadd7d78..9f372215454e 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -447,7 +447,7 @@ dependencies { implementation libs.chrisbanes.photoview implementation libs.greenrobot.eventBus implementation libs.greenrobot.eventBus.java - implementation "com.squareup.retrofit2:retrofit:$squareupRetrofitVersion" + implementation libs.squareup.retrofit2 implementation "org.apache.commons:commons-text:$apacheCommonsTextVersion" implementation libs.lottie implementation libs.facebook.shimmer diff --git a/build.gradle b/build.gradle index e2781874a1aa..cb06c6912de0 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,6 @@ ext { googlePlayServicesCodeScannerVersion = '16.0.0-beta3' philjayMpAndroidChartVersion = 'v3.1.0' squareupKotlinPoetVersion = '1.16.0' - squareupRetrofitVersion = '2.9.0' uCropVersion = '2.2.9' // other diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a0dc08bfc96..13b157194d4b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -48,6 +48,7 @@ mockitoKotlin = '4.1.0' screengrab = '2.1.1' soLoader = '0.10.5' squareupMockWebServer = '4.12.0' +squareupRetrofit = '2.9.0' volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' @@ -157,6 +158,7 @@ lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", versio mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" } squareup-okhttp-mockWebServer = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref ="squareupMockWebServer" } +squareup-retrofit2 = { group = "com.squareup.retrofit2", name = "retrofit", version.ref ="squareupRetrofit" } volley = { group = "com.android.volley", name = "volley", version.ref = "volley" } wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" } wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } From 6b1d890653f568760bfc2fe85e11a8add1c39ca7 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 09:35:39 +0530 Subject: [PATCH 059/117] Deps: Migrated `apacheCommonsText` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 9f372215454e..bc075c580eec 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -448,7 +448,7 @@ dependencies { implementation libs.greenrobot.eventBus implementation libs.greenrobot.eventBus.java implementation libs.squareup.retrofit2 - implementation "org.apache.commons:commons-text:$apacheCommonsTextVersion" + implementation libs.apache.commons.text implementation libs.lottie implementation libs.facebook.shimmer implementation ("com.github.yalantis:ucrop:$uCropVersion") { diff --git a/build.gradle b/build.gradle index cb06c6912de0..bcd553b0df24 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,6 @@ ext { androidxComposeCompilerVersion = '1.5.9' androidxGridlayoutVersion = '1.0.0' androidxViewpager2Version = '1.0.0' - apacheCommonsTextVersion = '1.10.0' coilComposeVersion = '2.4.0' firebaseBomVersion = '32.1.0' firebaseIidVersion = '21.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 13b157194d4b..ab6afcbd2d68 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,6 +21,7 @@ androidxTestExtJunit = '1.1.5' androidxTestUiAutomator = '2.2.0' androidxWebkit = '1.11.0' androidxWorkManager = "2.9.0" +apacheCommonsText = '1.10.0' assertj = '3.23.1' automatticRest = '1.0.8' chrisbanesPhotoview = '2.3.0' @@ -117,6 +118,7 @@ androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "an androidx-workManager-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" } androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" } androidx-workManager-workTesting = { group = "androidx.work", name = "work-testing", version.ref = "androidxWorkManager" } +apache-commons-text = { group = "org.apache.commons", name = "commons-text", version.ref ="apacheCommonsText" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref ="assertj" } automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } chrisbanes-photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoview" } From 76751ca7bb192926a0331b3e929c7dd3e48bff9d Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:11:52 +0530 Subject: [PATCH 060/117] Deps: Migrated `firebase` to Version Catalog --- WordPress/build.gradle | 6 +++--- build.gradle | 2 -- gradle/libs.versions.toml | 5 +++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index bc075c580eec..785c7b333d26 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -523,12 +523,12 @@ dependencies { lintChecks "org.wordpress:lint:$wordPressLintVersion" // Firebase - def firebaseBom = platform("com.google.firebase:firebase-bom:$firebaseBomVersion") + def firebaseBom = platform(libs.firebase.bom) implementation(firebaseBom) // Firebase - Main - implementation "com.google.firebase:firebase-messaging" + implementation libs.firebase.messaging // Firebase - Deprecated - implementation "com.google.firebase:firebase-iid:$firebaseIidVersion" + implementation libs.firebase.iid // Jetpack Compose def composeBom = platform("androidx.compose:compose-bom:$androidxComposeBomVersion") diff --git a/build.gradle b/build.gradle index bcd553b0df24..c60af5c2f9f7 100644 --- a/build.gradle +++ b/build.gradle @@ -39,8 +39,6 @@ ext { androidxGridlayoutVersion = '1.0.0' androidxViewpager2Version = '1.0.0' coilComposeVersion = '2.4.0' - firebaseBomVersion = '32.1.0' - firebaseIidVersion = '21.1.0' googleAutoServiceVersion = '1.0.1' googleExoPlayerVersion = '2.13.3' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ab6afcbd2d68..18b2f5372776 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,6 +29,8 @@ dagger = '2.50' eventBus = '3.3.1' facebookReact = '0.73.3' facebookShimmer = '0.5.0' +firebaseBom = '32.1.0' +firebaseIid = '21.1.0' flipper = '0.247.0' glide = '4.16.0' googleFlexbox = '3.0.0' @@ -136,6 +138,9 @@ facebook-react-hermesAndroid = { group = "com.facebook.react", name = "hermes-an facebook-shimmer = { group = "com.facebook.shimmer", name = "shimmer", version.ref ="facebookShimmer" } facebook-soLoader = { group = "com.facebook.soloader", name = "soloader", version.ref ="soLoader" } fastlane-screengrab = { group = "tools.fastlane", name = "screengrab", version.ref ="screengrab" } +firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom"} +firebase-iid = { group = "com.google.firebase", name = "firebase-iid", version.ref ="firebaseIid" } +firebase-messaging = { module = "com.google.firebase:firebase-messaging" } glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } From 7ba9b00a4d8ec339c1ded545ab701476a05b4002 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:14:37 +0530 Subject: [PATCH 061/117] Deps: Migrated `coilCompose` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 785c7b333d26..be864b62cba4 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -552,7 +552,7 @@ dependencies { implementation libs.androidx.lifecycle.viewmodel.compose implementation libs.androidx.constraintLayout.compose // - Jetpack Compose - Other - implementation "io.coil-kt:coil-compose:$coilComposeVersion" + implementation libs.coil.compose implementation libs.lottie.compose // - Jetpack Compose - UI Tests androidTestImplementation libs.androidx.compose.ui.test diff --git a/build.gradle b/build.gradle index c60af5c2f9f7..19e85539c748 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,6 @@ ext { androidxComposeCompilerVersion = '1.5.9' androidxGridlayoutVersion = '1.0.0' androidxViewpager2Version = '1.0.0' - coilComposeVersion = '2.4.0' googleAutoServiceVersion = '1.0.1' googleExoPlayerVersion = '2.13.3' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 18b2f5372776..4b0fa11675d1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,6 +25,7 @@ apacheCommonsText = '1.10.0' assertj = '3.23.1' automatticRest = '1.0.8' chrisbanesPhotoview = '2.3.0' +coilCompose = '2.4.0' dagger = '2.50' eventBus = '3.3.1' facebookReact = '0.73.3' @@ -124,6 +125,7 @@ apache-commons-text = { group = "org.apache.commons", name = "commons-text", ver assertj-core = { group = "org.assertj", name = "assertj-core", version.ref ="assertj" } automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } chrisbanes-photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoview" } +coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref ="coilCompose" } dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "dagger" } dagger-android-support = { group = "com.google.dagger", name = "dagger-android-support", version.ref = "dagger" } dagger-hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger" } From 5bd2dc28cdb66fba66731e61e20b2fa0b0a47566 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:16:52 +0530 Subject: [PATCH 062/117] Deps: Migrated `cascadeCompose` to Version Catalog --- WordPress/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index be864b62cba4..30121a052455 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -559,7 +559,7 @@ dependencies { implementation libs.androidx.compose.material3 // Cascade - Compose nested menu - implementation "me.saket.cascade:cascade-compose:2.3.0" + implementation libs.cascade.compose implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4b0fa11675d1..ba821b6f0cd5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,7 @@ androidxWorkManager = "2.9.0" apacheCommonsText = '1.10.0' assertj = '3.23.1' automatticRest = '1.0.8' +cascadeCompose = '2.3.0' chrisbanesPhotoview = '2.3.0' coilCompose = '2.4.0' dagger = '2.50' @@ -124,6 +125,7 @@ androidx-workManager-workTesting = { group = "androidx.work", name = "work-testi apache-commons-text = { group = "org.apache.commons", name = "commons-text", version.ref ="apacheCommonsText" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref ="assertj" } automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } +cascade-compose = { group = "me.saket.cascade", name = "cascade-compose", version.ref ="cascadeCompose" } chrisbanes-photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoview" } coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref ="coilCompose" } dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "dagger" } From 2901c614007ade7d054dad25a3eb9013f48ef37b Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:20:36 +0530 Subject: [PATCH 063/117] Deps: Migrated `composeBom` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 30121a052455..1f179a30844e 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -531,7 +531,7 @@ dependencies { implementation libs.firebase.iid // Jetpack Compose - def composeBom = platform("androidx.compose:compose-bom:$androidxComposeBomVersion") + def composeBom = platform(libs.compose.bom) implementation(composeBom) androidTestImplementation(composeBom) // - Jetpack Compose - Android Studio diff --git a/build.gradle b/build.gradle index 19e85539c748..85c9f6ded12e 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,6 @@ ext { // main androidInstallReferrerVersion = '2.2' androidxAnnotationVersion = '1.6.0' - androidxComposeBomVersion = '2023.10.00' androidxComposeCompilerVersion = '1.5.9' androidxGridlayoutVersion = '1.0.0' androidxViewpager2Version = '1.0.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ba821b6f0cd5..7dd6fe872eec 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,6 +27,7 @@ automatticRest = '1.0.8' cascadeCompose = '2.3.0' chrisbanesPhotoview = '2.3.0' coilCompose = '2.4.0' +composeBom = '2023.10.00' dagger = '2.50' eventBus = '3.3.1' facebookReact = '0.73.3' @@ -128,6 +129,7 @@ automattic-rest = { group = "com.automattic", name = "rest", version.ref = "auto cascade-compose = { group = "me.saket.cascade", name = "cascade-compose", version.ref ="cascadeCompose" } chrisbanes-photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoview" } coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref ="coilCompose" } +compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "dagger" } dagger-android-support = { group = "com.google.dagger", name = "dagger-android-support", version.ref = "dagger" } dagger-hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger" } From 91aae38ccc75b950239c263dc377c4c42eb66ca5 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:23:59 +0530 Subject: [PATCH 064/117] Deps: Migrated `exoplayer` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 1f179a30844e..9bd269923040 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -467,7 +467,7 @@ dependencies { implementation libs.kotlinx.coroutines.android implementation "com.github.PhilJay:MPAndroidChart:$philjayMpAndroidChartVersion" implementation libs.jsoup - implementation ("com.google.android.exoplayer:exoplayer:$googleExoPlayerVersion") { + implementation (libs.google.exoPlayer) { exclude group: 'com.android.support', module: 'support-annotations' } implementation libs.dagger.android.support diff --git a/build.gradle b/build.gradle index 85c9f6ded12e..95325930816c 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,6 @@ ext { androidxGridlayoutVersion = '1.0.0' androidxViewpager2Version = '1.0.0' googleAutoServiceVersion = '1.0.1' - googleExoPlayerVersion = '2.13.3' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' philjayMpAndroidChartVersion = 'v3.1.0' squareupKotlinPoetVersion = '1.16.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7dd6fe872eec..fb604d10030d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,6 +30,7 @@ coilCompose = '2.4.0' composeBom = '2023.10.00' dagger = '2.50' eventBus = '3.3.1' +exoPlayer = '2.13.3' facebookReact = '0.73.3' facebookShimmer = '0.5.0' firebaseBom = '32.1.0' @@ -150,6 +151,7 @@ firebase-messaging = { module = "com.google.firebase:firebase-messaging" } glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } +google-exoPlayer = { group = "com.google.android.exoplayer", name = "exoplayer", version.ref ="exoPlayer" } google-flexbox = { group = "com.google.android.flexbox", name = "flexbox", version.ref = "googleFlexbox" } google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } google-material = { group = "com.google.android.material", name = "material", version.ref = "googleMaterial" } From f6e17a878faaafb3fa27283f318ea49ec15cb9bc Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:29:31 +0530 Subject: [PATCH 065/117] Deps: Migrated `Viewpager2` to Version Catalog --- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/image-editor/build.gradle | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 95325930816c..2933e709b7f5 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,6 @@ ext { androidxAnnotationVersion = '1.6.0' androidxComposeCompilerVersion = '1.5.9' androidxGridlayoutVersion = '1.0.0' - androidxViewpager2Version = '1.0.0' googleAutoServiceVersion = '1.0.1' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' philjayMpAndroidChartVersion = 'v3.1.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fb604d10030d..b8ff121fc5bc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,6 +19,7 @@ androidxTest = '1.5.0' androidxTestEspresso = '3.4.0' androidxTestExtJunit = '1.1.5' androidxTestUiAutomator = '2.2.0' +androidxViewpager2 = '1.0.0' androidxWebkit = '1.11.0' androidxWorkManager = "2.9.0" apacheCommonsText = '1.10.0' @@ -120,6 +121,7 @@ androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version androidx-test-rules = { group = "androidx.test", name = "rules", version.ref ="androidxTest" } androidx-test-runner = { group = "androidx.test", name = "runner", version.ref ="androidxTest" } androidx-test-ui-automator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref ="androidxTestUiAutomator" } +androidx-viewPager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref ="androidxViewpager2" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} androidx-workManager-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" } androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index f4189006c4ef..c941440161d9 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -53,7 +53,7 @@ dependencies { implementation libs.androidx.appcompat implementation libs.androidx.recyclerView implementation libs.androidx.constraintLayout - implementation "androidx.viewpager2:viewpager2:$androidxViewpager2Version" + implementation libs.androidx.viewPager2 implementation libs.google.material implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion" implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion" From efaa201ec2436113c97bb1297a2e47d8507a350d Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:34:55 +0530 Subject: [PATCH 066/117] Deps: Migrated `squareupKotlinPoet` to Version Catalog --- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ libs/processors/build.gradle | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2933e709b7f5..f19738354d81 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,6 @@ ext { googleAutoServiceVersion = '1.0.1' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' philjayMpAndroidChartVersion = 'v3.1.0' - squareupKotlinPoetVersion = '1.16.0' uCropVersion = '2.2.9' // other diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b8ff121fc5bc..44456a8d4367 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,6 +55,7 @@ mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' screengrab = '2.1.1' soLoader = '0.10.5' +squareupKotlinPoet = '1.16.0' squareupMockWebServer = '4.12.0' squareupRetrofit = '2.9.0' volley = '1.2.1' @@ -174,6 +175,8 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" } +squareup-kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version.ref ="squareupKotlinPoet" } +squareup-kotlinpoet-ksp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref ="squareupKotlinPoet" } squareup-okhttp-mockWebServer = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref ="squareupMockWebServer" } squareup-retrofit2 = { group = "com.squareup.retrofit2", name = "retrofit", version.ref ="squareupRetrofit" } volley = { group = "com.android.volley", name = "volley", version.ref = "volley" } diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index 51dbeb22e4cb..49545b3aaae3 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_1_8 dependencies { implementation project(":libs:annotations") - implementation "com.squareup:kotlinpoet:$squareupKotlinPoetVersion" - implementation "com.squareup:kotlinpoet-ksp:$squareupKotlinPoetVersion" + implementation libs.squareup.kotlinpoet + implementation libs.squareup.kotlinpoet.ksp implementation "com.google.devtools.ksp:symbol-processing-api:$gradle.ext.kspVersion" def kctVersion = "1.5.0" From 9292d747e98add380af85f9f3a440b50a667de04 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:41:11 +0530 Subject: [PATCH 067/117] Deps: Migrated `philjayMpAndroidChart` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 9bd269923040..d51e130dceac 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -465,7 +465,7 @@ dependencies { implementation (name:'tenor-android-core-jetified', ext:'aar') // Jetified Tenor Gif library implementation libs.kotlinx.coroutines.core implementation libs.kotlinx.coroutines.android - implementation "com.github.PhilJay:MPAndroidChart:$philjayMpAndroidChartVersion" + implementation libs.philJay.mpAndroidChart implementation libs.jsoup implementation (libs.google.exoPlayer) { exclude group: 'com.android.support', module: 'support-annotations' diff --git a/build.gradle b/build.gradle index f19738354d81..5e0c13e0782e 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,6 @@ ext { androidxGridlayoutVersion = '1.0.0' googleAutoServiceVersion = '1.0.1' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' - philjayMpAndroidChartVersion = 'v3.1.0' uCropVersion = '2.2.9' // other diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 44456a8d4367..f180b4108d8b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -53,6 +53,7 @@ kotlinxCoroutines = '1.7.3' lottie = '6.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' +philjayMpAndroidChart = 'v3.1.0' screengrab = '2.1.1' soLoader = '0.10.5' squareupKotlinPoet = '1.16.0' @@ -175,6 +176,7 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" } +philJay-mpAndroidChart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref ="philjayMpAndroidChart" } squareup-kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version.ref ="squareupKotlinPoet" } squareup-kotlinpoet-ksp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref ="squareupKotlinPoet" } squareup-okhttp-mockWebServer = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref ="squareupMockWebServer" } From 1cf34b797ee524806014579d2c2a5b9f40ff456e Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:44:52 +0530 Subject: [PATCH 068/117] Deps: Migrated `androidInstallReferrer` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index d51e130dceac..01feb87b844d 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -443,7 +443,7 @@ dependencies { implementation libs.androidx.camera.lifecycle implementation libs.androidx.camera.view - implementation "com.android.installreferrer:installreferrer:$androidInstallReferrerVersion" + implementation libs.installReferrer implementation libs.chrisbanes.photoview implementation libs.greenrobot.eventBus implementation libs.greenrobot.eventBus.java diff --git a/build.gradle b/build.gradle index 5e0c13e0782e..f7ffd527ef3d 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,6 @@ ext { gravatarVersion = '1.0.0' // main - androidInstallReferrerVersion = '2.2' androidxAnnotationVersion = '1.6.0' androidxComposeCompilerVersion = '1.5.9' androidxGridlayoutVersion = '1.0.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f180b4108d8b..9412917a7ca2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,5 @@ [versions] +androidInstallReferrer = '2.2' androidxActivity = '1.8.0' androidxAppcompat = '1.6.1' androidxArchCore = '2.2.0' @@ -167,6 +168,7 @@ google-play-review-ktx = { group = "com.google.android.play", name = "review-ktx google-play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref ="googlePlayServicesAuth" } greenrobot-eventBus = { group = "org.greenrobot", name = "eventbus", version.ref ="eventBus" } greenrobot-eventBus-java = { group = "org.greenrobot", name = "eventbus-java", version.ref ="eventBus" } +installReferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref ="androidInstallReferrer" } jsoup = { group = "org.jsoup", name = "jsoup", version.ref ="jsoup" } junit = { group = "junit", name = "junit", version.ref ="junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutines" } From 4160ec34e50cb08f5d7fb3cdb564de4d459158ce Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:48:55 +0530 Subject: [PATCH 069/117] Deps: Migrated `indexosMediaForMobile` to Version Catalog --- WordPress/build.gradle | 4 ++-- build.gradle | 1 - gradle/libs.versions.toml | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 01feb87b844d..8e5467af1b79 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -459,8 +459,8 @@ dependencies { implementation libs.glide ksp libs.glide.ksp implementation libs.glide.volley.integration - implementation "com.github.indexos.media-for-mobile:domain:$indexosMediaForMobileVersion" - implementation "com.github.indexos.media-for-mobile:android:$indexosMediaForMobileVersion" + implementation libs.indexos.media.for.mobile.domain + implementation libs.indexos.media.for.mobile.android implementation libs.zendesk implementation (name:'tenor-android-core-jetified', ext:'aar') // Jetified Tenor Gif library implementation libs.kotlinx.coroutines.core diff --git a/build.gradle b/build.gradle index f7ffd527ef3d..d6b3b319e777 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,6 @@ ext { wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' wordPressLoginVersion = '1.16.0' wordPressUtilsVersion = '3.14.0' - indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' gravatarVersion = '1.0.0' // main diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9412917a7ca2..f51bde5ff732 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -48,6 +48,7 @@ googlePlayAppUpdate = '2.1.0' googlePlayReview = '2.0.1' googlePlayServicesAuth = '20.4.1' gson = '2.10.1' +indexosMediaForMobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jsoup = '1.16.2' junit = '4.13.2' kotlinxCoroutines = '1.7.3' @@ -168,6 +169,8 @@ google-play-review-ktx = { group = "com.google.android.play", name = "review-ktx google-play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref ="googlePlayServicesAuth" } greenrobot-eventBus = { group = "org.greenrobot", name = "eventbus", version.ref ="eventBus" } greenrobot-eventBus-java = { group = "org.greenrobot", name = "eventbus-java", version.ref ="eventBus" } +indexos-media-for-mobile-android = { group = "com.github.indexos.media-for-mobile", name = "android", version.ref ="indexosMediaForMobile" } +indexos-media-for-mobile-domain = { group = "com.github.indexos.media-for-mobile", name = "domain", version.ref ="indexosMediaForMobile" } installReferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref ="androidInstallReferrer" } jsoup = { group = "org.jsoup", name = "jsoup", version.ref ="jsoup" } junit = { group = "junit", name = "junit", version.ref ="junit" } From a7bccc899aae554eb199a1a4afa6c91ba00f1203 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:53:53 +0530 Subject: [PATCH 070/117] Deps: Migrated `uCrop` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/image-editor/build.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 8e5467af1b79..a66a05b0e10b 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -451,7 +451,7 @@ dependencies { implementation libs.apache.commons.text implementation libs.lottie implementation libs.facebook.shimmer - implementation ("com.github.yalantis:ucrop:$uCropVersion") { + implementation (libs.ucrop) { exclude group: 'androidx.core', module: 'core' exclude group: 'androidx.constraintlayout', module: 'constraintlayout' exclude group: 'androidx.appcompat', module: 'appcompat' diff --git a/build.gradle b/build.gradle index d6b3b319e777..56651c238403 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,6 @@ ext { androidxGridlayoutVersion = '1.0.0' googleAutoServiceVersion = '1.0.1' googlePlayServicesCodeScannerVersion = '16.0.0-beta3' - uCropVersion = '2.2.9' // other androidDesugarVersion = '2.0.4' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f51bde5ff732..60ff16601c2a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -61,6 +61,7 @@ soLoader = '0.10.5' squareupKotlinPoet = '1.16.0' squareupMockWebServer = '4.12.0' squareupRetrofit = '2.9.0' +uCrop = '2.2.9' volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' @@ -186,6 +187,7 @@ squareup-kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version.ref squareup-kotlinpoet-ksp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref ="squareupKotlinPoet" } squareup-okhttp-mockWebServer = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref ="squareupMockWebServer" } squareup-retrofit2 = { group = "com.squareup.retrofit2", name = "retrofit", version.ref ="squareupRetrofit" } +ucrop = { group = "com.github.yalantis", name = "ucrop", version.ref = "uCrop" } volley = { group = "com.android.volley", name = "volley", version.ref = "volley" } wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" } wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index c941440161d9..d21bda7f1d02 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -62,7 +62,7 @@ dependencies { implementation libs.androidx.lifecycle.viewmodel implementation libs.androidx.lifecycle.viewmodel.savedstate implementation libs.androidx.lifecycle.livedata.core - implementation ("com.github.yalantis:ucrop:$uCropVersion") { + implementation (libs.ucrop) { exclude group: 'com.squareup.okhttp3' exclude group: 'androidx.core', module: 'core' exclude group: 'androidx.constraintlayout', module: 'constraintlayout' From 7d4972a80439e2799764c354a97d847485a7952a Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 10:55:09 +0530 Subject: [PATCH 071/117] unused : gradle version Needs Removal From the docs : https://github.com/wordpress-mobile/WordPress-Android/blob/4f5ea84a7142d03d55400d5086f11e59ebc98f63/docs/test_instructions_per_dependency_update.md#navigation --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index 56651c238403..e95ea06e1c18 100644 --- a/build.gradle +++ b/build.gradle @@ -33,9 +33,6 @@ ext { // main androidxAnnotationVersion = '1.6.0' androidxComposeCompilerVersion = '1.5.9' - androidxGridlayoutVersion = '1.0.0' - googleAutoServiceVersion = '1.0.1' - googlePlayServicesCodeScannerVersion = '16.0.0-beta3' // other androidDesugarVersion = '2.0.4' From 8b06067956a68a7bed7a2cf3140ff36d32532bce Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 11:17:55 +0530 Subject: [PATCH 072/117] Plugin : Migrated `Sentry` to Version Catlog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- WordPress/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ settings.gradle | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index a66a05b0e10b..59e131f8a4a1 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -7,7 +7,7 @@ plugins { id "org.jetbrains.kotlin.android" id "org.jetbrains.kotlin.plugin.parcelize" id "org.jetbrains.kotlin.plugin.allopen" - id "io.sentry.android.gradle" + alias(libs.plugins.sentry) id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" id "com.google.gms.google-services" alias(libs.plugins.dagger) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60ff16601c2a..4eb8a4864ed1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -57,6 +57,7 @@ mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' philjayMpAndroidChart = 'v3.1.0' screengrab = '2.1.1' +sentry = "4.3.1" soLoader = '0.10.5' squareupKotlinPoet = '1.16.0' squareupMockWebServer = '4.12.0' @@ -196,3 +197,4 @@ zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } +sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } diff --git a/settings.gradle b/settings.gradle index 4521a3425529..356bd5110f10 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,6 @@ pluginManagement { gradle.ext.agpVersion = '8.1.0' gradle.ext.googleServicesVersion = '4.3.15' gradle.ext.navigationVersion = '2.7.7' - gradle.ext.sentryVersion = '4.3.1' gradle.ext.detektVersion = '1.23.0' gradle.ext.violationCommentsVersion = '1.70.0' gradle.ext.measureBuildsVersion = '3.1.0' @@ -21,7 +20,6 @@ pluginManagement { id "com.android.library" version gradle.ext.agpVersion id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion id "androidx.navigation.safeargs.kotlin" version gradle.ext.navigationVersion - id "io.sentry.android.gradle" version gradle.ext.sentryVersion id "io.gitlab.arturbosch.detekt" version gradle.ext.detektVersion id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion From 9d47993d786669bff85e8cb76e3d2c26e239b9d4 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 11:38:05 +0530 Subject: [PATCH 073/117] Plugin & Deps: Migrated `androidx.navigation` to Version Catlog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- build.gradle | 2 +- gradle/libs.versions.toml | 4 ++++ libs/image-editor/build.gradle | 6 +++--- settings.gradle | 2 -- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index e95ea06e1c18..19762725cc80 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'com.automattic.android.measure-builds' id "org.jetbrains.kotlinx.kover" id "com.autonomousapps.dependency-analysis" - id "androidx.navigation.safeargs.kotlin" apply false + alias(libs.plugins.navigation.safeargs).apply(false) id "com.android.library" apply false id 'com.google.gms.google-services' apply false id "org.jetbrains.kotlin.plugin.parcelize" apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4eb8a4864ed1..59d370820b26 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,6 +55,7 @@ kotlinxCoroutines = '1.7.3' lottie = '6.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' +navigation = "2.7.7" philjayMpAndroidChart = 'v3.1.0' screengrab = '2.1.1' sentry = "4.3.1" @@ -183,6 +184,8 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" } +navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "navigation" } +navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "navigation" } philJay-mpAndroidChart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref ="philjayMpAndroidChart" } squareup-kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version.ref ="squareupKotlinPoet" } squareup-kotlinpoet-ksp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref ="squareupKotlinPoet" } @@ -197,4 +200,5 @@ zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } +navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index d21bda7f1d02..824616e81b44 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -2,7 +2,7 @@ plugins { id "com.android.library" id "org.jetbrains.kotlin.android" id "org.jetbrains.kotlin.plugin.parcelize" - id "androidx.navigation.safeargs.kotlin" + alias(libs.plugins.navigation.safeargs) id "org.jetbrains.kotlinx.kover" } @@ -55,8 +55,8 @@ dependencies { implementation libs.androidx.constraintLayout implementation libs.androidx.viewPager2 implementation libs.google.material - implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion" - implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion" + implementation libs.navigation.fragment + implementation libs.navigation.ui implementation libs.androidx.lifecycle.common implementation libs.androidx.lifecycle.runtime implementation libs.androidx.lifecycle.viewmodel diff --git a/settings.gradle b/settings.gradle index 356bd5110f10..4f15e41ce4ce 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,6 @@ pluginManagement { gradle.ext.kspVersion = '1.9.22-1.0.17' gradle.ext.agpVersion = '8.1.0' gradle.ext.googleServicesVersion = '4.3.15' - gradle.ext.navigationVersion = '2.7.7' gradle.ext.detektVersion = '1.23.0' gradle.ext.violationCommentsVersion = '1.70.0' gradle.ext.measureBuildsVersion = '3.1.0' @@ -19,7 +18,6 @@ pluginManagement { id "com.android.application" version gradle.ext.agpVersion id "com.android.library" version gradle.ext.agpVersion id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion - id "androidx.navigation.safeargs.kotlin" version gradle.ext.navigationVersion id "io.gitlab.arturbosch.detekt" version gradle.ext.detektVersion id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion From 79e6859bd48e7b92874eaf16514efaa20f7305bd Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 15:27:11 +0530 Subject: [PATCH 074/117] Plugin : Migrated `dependencyAnalysis` to Version Catalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- 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 19762725cc80..77eed2ef5a7c 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id "io.gitlab.arturbosch.detekt" id 'com.automattic.android.measure-builds' id "org.jetbrains.kotlinx.kover" - id "com.autonomousapps.dependency-analysis" + alias(libs.plugins.dependency.analysis) alias(libs.plugins.navigation.safeargs).apply(false) id "com.android.library" apply false id 'com.google.gms.google-services' apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 59d370820b26..695daae57925 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,6 +31,7 @@ chrisbanesPhotoview = '2.3.0' coilCompose = '2.4.0' composeBom = '2023.10.00' dagger = '2.50' +dependencyAnalysis = "1.28.0" eventBus = '3.3.1' exoPlayer = '2.13.3' facebookReact = '0.73.3' @@ -200,5 +201,6 @@ zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } +dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } diff --git a/settings.gradle b/settings.gradle index 4f15e41ce4ce..cbca4b3bea40 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,7 +7,6 @@ pluginManagement { gradle.ext.violationCommentsVersion = '1.70.0' gradle.ext.measureBuildsVersion = '3.1.0' gradle.ext.koverVersion = '0.7.5' - gradle.ext.dependencyAnalysisVersion = '1.28.0' plugins { id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion @@ -23,7 +22,6 @@ pluginManagement { id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion id "org.jetbrains.kotlinx.kover" version gradle.ext.koverVersion id "com.google.devtools.ksp" version gradle.ext.kspVersion - id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion } repositories { maven { From 34bf93fa57ebd20d297b81034732a2a9e9ce8ce1 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sat, 6 Jul 2024 15:33:25 +0530 Subject: [PATCH 075/117] Plugin : Migrated `kover` to Version Catalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- WordPress/build.gradle | 2 +- build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ libs/editor/build.gradle | 2 +- libs/image-editor/build.gradle | 2 +- libs/processors/build.gradle | 2 +- settings.gradle | 2 -- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 59e131f8a4a1..1a07143f75a4 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -11,7 +11,7 @@ plugins { id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" id "com.google.gms.google-services" alias(libs.plugins.dagger) - id "org.jetbrains.kotlinx.kover" + alias(libs.plugins.kover) id "com.google.devtools.ksp" } diff --git a/build.gradle b/build.gradle index 77eed2ef5a7c..1060db123779 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id "io.gitlab.arturbosch.detekt" id 'com.automattic.android.measure-builds' - id "org.jetbrains.kotlinx.kover" + alias(libs.plugins.kover) alias(libs.plugins.dependency.analysis) alias(libs.plugins.navigation.safeargs).apply(false) id "com.android.library" apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 695daae57925..114a1e308bd3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -53,6 +53,7 @@ indexosMediaForMobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jsoup = '1.16.2' junit = '4.13.2' kotlinxCoroutines = '1.7.3' +kover = "0.7.5" lottie = '6.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' @@ -202,5 +203,6 @@ zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } +kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index ea6ba710146b..f331305ac8e2 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -2,7 +2,7 @@ plugins { id "com.android.library" id "org.jetbrains.kotlin.android" id "org.jetbrains.kotlin.plugin.parcelize" - id "org.jetbrains.kotlinx.kover" + alias(libs.plugins.kover) } repositories { diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 824616e81b44..10e1d77898a7 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.android" id "org.jetbrains.kotlin.plugin.parcelize" alias(libs.plugins.navigation.safeargs) - id "org.jetbrains.kotlinx.kover" + alias(libs.plugins.kover) } android { diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index 49545b3aaae3..eb8ee2f3703a 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -1,6 +1,6 @@ plugins { id "org.jetbrains.kotlin.jvm" - id "org.jetbrains.kotlinx.kover" + alias(libs.plugins.kover) } sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/settings.gradle b/settings.gradle index cbca4b3bea40..4a53b1cd63ca 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,6 @@ pluginManagement { gradle.ext.detektVersion = '1.23.0' gradle.ext.violationCommentsVersion = '1.70.0' gradle.ext.measureBuildsVersion = '3.1.0' - gradle.ext.koverVersion = '0.7.5' plugins { id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion @@ -20,7 +19,6 @@ pluginManagement { id "io.gitlab.arturbosch.detekt" version gradle.ext.detektVersion id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion - id "org.jetbrains.kotlinx.kover" version gradle.ext.koverVersion id "com.google.devtools.ksp" version gradle.ext.kspVersion } repositories { From fb7c5bae5994766b2281c37b70f2a87ba9933075 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sun, 7 Jul 2024 00:28:57 +0530 Subject: [PATCH 076/117] Plugin : Migrated `detekt` to Version Catalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- build.gradle | 5 ++--- gradle/libs.versions.toml | 3 +++ settings.gradle | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 1060db123779..b1211b3a7766 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import com.automattic.android.measure.reporters.InternalA8cCiReporter import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id "io.gitlab.arturbosch.detekt" + alias(libs.plugins.detekt) id 'com.automattic.android.measure-builds' alias(libs.plugins.kover) alias(libs.plugins.dependency.analysis) @@ -91,7 +91,6 @@ allprojects { } detekt { - toolVersion = gradle.ext.detektVersion baseline = file("${project.rootDir}/config/detekt/baseline.xml") config = files("${project.rootDir}/config/detekt/detekt.yml") autoCorrect = false @@ -181,7 +180,7 @@ tasks.register("configureApply") { } dependencies { - detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:$gradle.ext.detektVersion" + detektPlugins libs.detekt.formatting } apply from: './config/gradle/code_coverage.gradle' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 114a1e308bd3..55199bf21181 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,6 +32,7 @@ coilCompose = '2.4.0' composeBom = '2023.10.00' dagger = '2.50' dependencyAnalysis = "1.28.0" +detekt = "1.23.0" eventBus = '3.3.1' exoPlayer = '2.13.3' facebookReact = '0.73.3' @@ -148,6 +149,7 @@ dagger-hilt-android = { group = "com.google.dagger", name = "hilt-android", vers dagger-hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "dagger" } dagger-hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "dagger" } dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" } +detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" } facebook-flipper = { group = "com.facebook.flipper", name = "flipper", version.ref ="flipper" } facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref ="flipper" } facebook-flipper-noop = { group = "com.facebook.flipper", name = "flipper-noop", version.ref ="flipper" } @@ -203,6 +205,7 @@ zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } diff --git a/settings.gradle b/settings.gradle index 4a53b1cd63ca..0a9130c4e786 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,6 @@ pluginManagement { gradle.ext.kspVersion = '1.9.22-1.0.17' gradle.ext.agpVersion = '8.1.0' gradle.ext.googleServicesVersion = '4.3.15' - gradle.ext.detektVersion = '1.23.0' gradle.ext.violationCommentsVersion = '1.70.0' gradle.ext.measureBuildsVersion = '3.1.0' @@ -16,7 +15,6 @@ pluginManagement { id "com.android.application" version gradle.ext.agpVersion id "com.android.library" version gradle.ext.agpVersion id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion - id "io.gitlab.arturbosch.detekt" version gradle.ext.detektVersion id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion id "com.google.devtools.ksp" version gradle.ext.kspVersion From 4ffa04c4f142c285bbd0d03552ec106ad8ac4013 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sun, 7 Jul 2024 00:46:31 +0530 Subject: [PATCH 077/117] Plugin : Migrated measureBuilds to Version Catalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- 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 b1211b3a7766..a72a94bdf9d9 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { alias(libs.plugins.detekt) - id 'com.automattic.android.measure-builds' + alias(libs.plugins.measure.builds) alias(libs.plugins.kover) alias(libs.plugins.dependency.analysis) alias(libs.plugins.navigation.safeargs).apply(false) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 55199bf21181..c56b4d855ea9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -56,6 +56,7 @@ junit = '4.13.2' kotlinxCoroutines = '1.7.3' kover = "0.7.5" lottie = '6.1.0' +measureBuilds = '3.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' navigation = "2.7.7" @@ -207,5 +208,6 @@ dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } +measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } diff --git a/settings.gradle b/settings.gradle index 0a9130c4e786..22f804192801 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,6 @@ pluginManagement { gradle.ext.agpVersion = '8.1.0' gradle.ext.googleServicesVersion = '4.3.15' gradle.ext.violationCommentsVersion = '1.70.0' - gradle.ext.measureBuildsVersion = '3.1.0' plugins { id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion @@ -16,7 +15,6 @@ pluginManagement { id "com.android.library" version gradle.ext.agpVersion id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion - id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion id "com.google.devtools.ksp" version gradle.ext.kspVersion } repositories { From d1ff69fe46686b33b61694f801e1fae736d67042 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sun, 7 Jul 2024 00:55:30 +0530 Subject: [PATCH 078/117] Plugin & Deps: Migrated `ksp` to Version Catlog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- WordPress/build.gradle | 2 +- build.gradle | 2 +- gradle/libs.versions.toml | 3 +++ libs/processors/build.gradle | 2 +- settings.gradle | 2 -- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 1a07143f75a4..4ac759a41035 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -12,7 +12,7 @@ plugins { id "com.google.gms.google-services" alias(libs.plugins.dagger) alias(libs.plugins.kover) - id "com.google.devtools.ksp" + alias(libs.plugins.ksp) } sentry { diff --git a/build.gradle b/build.gradle index a72a94bdf9d9..07221fa1ab1b 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { id "com.android.library" apply false id 'com.google.gms.google-services' apply false id "org.jetbrains.kotlin.plugin.parcelize" apply false - id "com.google.devtools.ksp" apply false + alias(libs.plugins.ksp).apply(false) } ext { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c56b4d855ea9..8bf9759945d3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,6 +55,7 @@ jsoup = '1.16.2' junit = '4.13.2' kotlinxCoroutines = '1.7.3' kover = "0.7.5" +ksp = "1.9.22-1.0.17" lottie = '6.1.0' measureBuilds = '3.1.0' mockitoAndroid = '4.5.1' @@ -185,6 +186,7 @@ junit = { group = "junit", name = "junit", version.ref ="junit" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutines" } +ksp-sympol-processing-api = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version.ref = "ksp" } lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" } lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } @@ -208,6 +210,7 @@ dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index eb8ee2f3703a..dcdc5757523d 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation libs.squareup.kotlinpoet implementation libs.squareup.kotlinpoet.ksp - implementation "com.google.devtools.ksp:symbol-processing-api:$gradle.ext.kspVersion" + implementation libs.ksp.sympol.processing.api def kctVersion = "1.5.0" testImplementation "com.github.tschuchortdev:kotlin-compile-testing:$kctVersion" diff --git a/settings.gradle b/settings.gradle index 22f804192801..4e972a62ac0f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ pluginManagement { gradle.ext.kotlinVersion = '1.9.22' - gradle.ext.kspVersion = '1.9.22-1.0.17' gradle.ext.agpVersion = '8.1.0' gradle.ext.googleServicesVersion = '4.3.15' gradle.ext.violationCommentsVersion = '1.70.0' @@ -15,7 +14,6 @@ pluginManagement { id "com.android.library" version gradle.ext.agpVersion id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion - id "com.google.devtools.ksp" version gradle.ext.kspVersion } repositories { maven { From ca291d138f5add3522893427afa1524e7f0b9daf Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sun, 7 Jul 2024 01:01:45 +0530 Subject: [PATCH 079/117] Plugin : Migrated `violationComments` to Version Catalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- WordPress/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ settings.gradle | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 4ac759a41035..3a4cc8b4d726 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -8,7 +8,7 @@ plugins { id "org.jetbrains.kotlin.plugin.parcelize" id "org.jetbrains.kotlin.plugin.allopen" alias(libs.plugins.sentry) - id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" + alias(libs.plugins.violation.comments) id "com.google.gms.google-services" alias(libs.plugins.dagger) alias(libs.plugins.kover) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8bf9759945d3..2c28230cf3ac 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -69,6 +69,7 @@ squareupKotlinPoet = '1.16.0' squareupMockWebServer = '4.12.0' squareupRetrofit = '2.9.0' uCrop = '2.2.9' +violationComments = '1.70.0' volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' @@ -214,3 +215,4 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } +violation-comments = { id = "se.bjurr.violations.violation-comments-to-github-gradle-plugin", version.ref = "violationComments" } diff --git a/settings.gradle b/settings.gradle index 4e972a62ac0f..f4d02842c4a7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,6 @@ pluginManagement { gradle.ext.kotlinVersion = '1.9.22' gradle.ext.agpVersion = '8.1.0' gradle.ext.googleServicesVersion = '4.3.15' - gradle.ext.violationCommentsVersion = '1.70.0' plugins { id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion @@ -13,7 +12,6 @@ pluginManagement { id "com.android.application" version gradle.ext.agpVersion id "com.android.library" version gradle.ext.agpVersion id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion - id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion } repositories { maven { From 2aea2cf1f2a9549cb95a033ed51adff2efbf960b Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Sun, 7 Jul 2024 01:27:18 +0530 Subject: [PATCH 080/117] Plugin : Migrated `googleServices` to Version Catalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- WordPress/build.gradle | 2 +- build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ settings.gradle | 2 -- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 3a4cc8b4d726..e1cf87e27e18 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -9,7 +9,7 @@ plugins { id "org.jetbrains.kotlin.plugin.allopen" alias(libs.plugins.sentry) alias(libs.plugins.violation.comments) - id "com.google.gms.google-services" + alias(libs.plugins.google.services) alias(libs.plugins.dagger) alias(libs.plugins.kover) alias(libs.plugins.ksp) diff --git a/build.gradle b/build.gradle index 07221fa1ab1b..65ca9a6861ed 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { alias(libs.plugins.dependency.analysis) alias(libs.plugins.navigation.safeargs).apply(false) id "com.android.library" apply false - id 'com.google.gms.google-services' apply false + alias(libs.plugins.google.services).apply(false) id "org.jetbrains.kotlin.plugin.parcelize" apply false alias(libs.plugins.ksp).apply(false) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2c28230cf3ac..7cb7abca0cde 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -49,6 +49,7 @@ googleMLKitTextRecognition = '16.0.0' googlePlayAppUpdate = '2.1.0' googlePlayReview = '2.0.1' googlePlayServicesAuth = '20.4.1' +googleServices = '4.3.15' gson = '2.10.1' indexosMediaForMobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jsoup = '1.16.2' @@ -210,6 +211,7 @@ zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } +google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } diff --git a/settings.gradle b/settings.gradle index f4d02842c4a7..e57112f510d7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,6 @@ pluginManagement { gradle.ext.kotlinVersion = '1.9.22' gradle.ext.agpVersion = '8.1.0' - gradle.ext.googleServicesVersion = '4.3.15' plugins { id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion @@ -11,7 +10,6 @@ pluginManagement { id "org.jetbrains.kotlin.plugin.allopen" version gradle.ext.kotlinVersion id "com.android.application" version gradle.ext.agpVersion id "com.android.library" version gradle.ext.agpVersion - id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion } repositories { maven { From c0bd45db5cdd9b5fe1d12c98325f4280c3f28099 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Mon, 8 Jul 2024 18:27:26 +0530 Subject: [PATCH 081/117] Plugin : Migrated `agp` to Version Catalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- WordPress/build.gradle | 2 +- build.gradle | 3 ++- gradle/libs.versions.toml | 3 +++ libs/analytics/build.gradle | 2 +- libs/editor/build.gradle | 2 +- libs/image-editor/build.gradle | 2 +- libs/mocks/build.gradle | 2 +- libs/networking/build.gradle | 2 +- settings.gradle | 3 --- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index e1cf87e27e18..0bd54003c3cf 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -3,7 +3,7 @@ import se.bjurr.violations.comments.github.plugin.gradle.ViolationCommentsToGitH import se.bjurr.violations.lib.model.SEVERITY plugins { - id "com.android.application" + alias(libs.plugins.android.application) id "org.jetbrains.kotlin.android" id "org.jetbrains.kotlin.plugin.parcelize" id "org.jetbrains.kotlin.plugin.allopen" diff --git a/build.gradle b/build.gradle index 65ca9a6861ed..10f7befc179d 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,8 @@ plugins { alias(libs.plugins.kover) alias(libs.plugins.dependency.analysis) alias(libs.plugins.navigation.safeargs).apply(false) - id "com.android.library" apply false + alias(libs.plugins.android.library).apply(false) + alias(libs.plugins.android.application).apply(false) alias(libs.plugins.google.services).apply(false) id "org.jetbrains.kotlin.plugin.parcelize" apply false alias(libs.plugins.ksp).apply(false) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7cb7abca0cde..df320af8048f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,5 @@ [versions] +agp = '8.1.0' androidInstallReferrer = '2.2' androidxActivity = '1.8.0' androidxAppcompat = '1.6.1' @@ -208,6 +209,8 @@ wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedit zendesk = { 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" } dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle index d82e29b11570..36e1d32fbd68 100644 --- a/libs/analytics/build.gradle +++ b/libs/analytics/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.android.library" + alias(libs.plugins.android.library) } repositories { diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index f331305ac8e2..6653c3f00efa 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/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" alias(libs.plugins.kover) diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 10e1d77898a7..a9fb28a214c5 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/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" alias(libs.plugins.navigation.safeargs) diff --git a/libs/mocks/build.gradle b/libs/mocks/build.gradle index 0bc0fcc6995e..a837cdcc184e 100644 --- a/libs/mocks/build.gradle +++ b/libs/mocks/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.android.library" + alias(libs.plugins.android.library) } android { diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle index 6102b959ef92..62166111f786 100644 --- a/libs/networking/build.gradle +++ b/libs/networking/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.android.library" + alias(libs.plugins.android.library) } android { diff --git a/settings.gradle b/settings.gradle index e57112f510d7..277fbe433ad5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ pluginManagement { gradle.ext.kotlinVersion = '1.9.22' - gradle.ext.agpVersion = '8.1.0' plugins { id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion @@ -8,8 +7,6 @@ pluginManagement { id "org.jetbrains.kotlin.plugin.serialization" version gradle.ext.kotlinVersion id "org.jetbrains.kotlin.plugin.parcelize" version gradle.ext.kotlinVersion id "org.jetbrains.kotlin.plugin.allopen" version gradle.ext.kotlinVersion - id "com.android.application" version gradle.ext.agpVersion - id "com.android.library" version gradle.ext.agpVersion } repositories { maven { From 5a51a06eb76cdce52819449785b5a51f31e69229 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Mon, 8 Jul 2024 19:05:50 +0530 Subject: [PATCH 082/117] Plugin : Migrated `kotlin` to Version Catalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- WordPress/build.gradle | 8 ++++---- build.gradle | 4 +++- gradle/libs.versions.toml | 7 +++++++ libs/annotations/build.gradle | 2 +- libs/editor/build.gradle | 4 ++-- libs/image-editor/build.gradle | 4 ++-- libs/processors/build.gradle | 4 ++-- settings.gradle | 9 --------- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 0bd54003c3cf..5b636557530e 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -4,9 +4,9 @@ import se.bjurr.violations.lib.model.SEVERITY plugins { alias(libs.plugins.android.application) - id "org.jetbrains.kotlin.android" - id "org.jetbrains.kotlin.plugin.parcelize" - id "org.jetbrains.kotlin.plugin.allopen" + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) + alias(libs.plugins.kotlin.allopen) alias(libs.plugins.sentry) alias(libs.plugins.violation.comments) alias(libs.plugins.google.services) @@ -482,7 +482,7 @@ dependencies { }) testImplementation libs.junit testImplementation libs.mockito.kotlin - 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/build.gradle b/build.gradle index 10f7befc179d..051a3bd7bd71 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,9 @@ plugins { alias(libs.plugins.android.library).apply(false) alias(libs.plugins.android.application).apply(false) alias(libs.plugins.google.services).apply(false) - id "org.jetbrains.kotlin.plugin.parcelize" apply false + alias(libs.plugins.kotlin.parcelize).apply(false) + alias(libs.plugins.kotlin.android).apply(false) + alias(libs.plugins.kotlin.jvm).apply(false) alias(libs.plugins.ksp).apply(false) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index df320af8048f..169de600c339 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,6 +55,7 @@ gson = '2.10.1' indexosMediaForMobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jsoup = '1.16.2' junit = '4.13.2' +kotlin = '1.9.22' kotlinxCoroutines = '1.7.3' kover = "0.7.5" ksp = "1.9.22-1.0.17" @@ -186,6 +187,8 @@ indexos-media-for-mobile-domain = { group = "com.github.indexos.media-for-mobile installReferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref ="androidInstallReferrer" } jsoup = { group = "org.jsoup", name = "jsoup", version.ref ="jsoup" } junit = { group = "junit", name = "junit", version.ref ="junit" } +kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" } +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 ="kotlinxCoroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutines" } @@ -215,6 +218,10 @@ dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" } +kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } diff --git a/libs/annotations/build.gradle b/libs/annotations/build.gradle index 38dacf593233..03c19ecfd20e 100644 --- a/libs/annotations/build.gradle +++ b/libs/annotations/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.jetbrains.kotlin.jvm" + alias(libs.plugins.kotlin.jvm) } sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 6653c3f00efa..88f805c47a17 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/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) alias(libs.plugins.kover) } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index a9fb28a214c5..f8b965e21dcf 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/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) alias(libs.plugins.navigation.safeargs) alias(libs.plugins.kover) } diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index dcdc5757523d..ee99a546b131 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.jetbrains.kotlin.jvm" + alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kover) } @@ -18,5 +18,5 @@ dependencies { testImplementation "com.github.tschuchortdev:kotlin-compile-testing-ksp:$kctVersion" testImplementation libs.junit testImplementation libs.assertj.core - testImplementation "org.jetbrains.kotlin:kotlin-reflect:$gradle.ext.kotlinVersion" + testImplementation libs.kotlin.reflect } diff --git a/settings.gradle b/settings.gradle index 277fbe433ad5..b63822b37efb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,13 +1,4 @@ pluginManagement { - gradle.ext.kotlinVersion = '1.9.22' - - plugins { - id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion - id "org.jetbrains.kotlin.jvm" version gradle.ext.kotlinVersion - id "org.jetbrains.kotlin.plugin.serialization" version gradle.ext.kotlinVersion - id "org.jetbrains.kotlin.plugin.parcelize" version gradle.ext.kotlinVersion - id "org.jetbrains.kotlin.plugin.allopen" version gradle.ext.kotlinVersion - } repositories { maven { url 'https://a8c-libs.s3.amazonaws.com/android' From 2e6fff0c1d0566f4307c2b876f13a3131dca1cfd Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 10:39:44 +0530 Subject: [PATCH 083/117] Revert "Plugin : Migrated `kotlin` to Version Catalog" This reverts commit 3fc48636acd12e1682272ad196cc8b5c7f454a32. --- WordPress/build.gradle | 8 ++++---- build.gradle | 4 +--- gradle/libs.versions.toml | 7 ------- libs/annotations/build.gradle | 2 +- libs/editor/build.gradle | 4 ++-- libs/image-editor/build.gradle | 4 ++-- libs/processors/build.gradle | 4 ++-- settings.gradle | 9 +++++++++ 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 5b636557530e..0bd54003c3cf 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -4,9 +4,9 @@ import se.bjurr.violations.lib.model.SEVERITY plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) - alias(libs.plugins.kotlin.allopen) + id "org.jetbrains.kotlin.android" + id "org.jetbrains.kotlin.plugin.parcelize" + id "org.jetbrains.kotlin.plugin.allopen" alias(libs.plugins.sentry) alias(libs.plugins.violation.comments) alias(libs.plugins.google.services) @@ -482,7 +482,7 @@ dependencies { }) testImplementation libs.junit testImplementation libs.mockito.kotlin - testImplementation libs.kotlin.test.junit + testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion" testImplementation libs.assertj.core testImplementation libs.kotlinx.coroutines.test diff --git a/build.gradle b/build.gradle index 051a3bd7bd71..10f7befc179d 100644 --- a/build.gradle +++ b/build.gradle @@ -10,9 +10,7 @@ plugins { alias(libs.plugins.android.library).apply(false) alias(libs.plugins.android.application).apply(false) alias(libs.plugins.google.services).apply(false) - alias(libs.plugins.kotlin.parcelize).apply(false) - alias(libs.plugins.kotlin.android).apply(false) - alias(libs.plugins.kotlin.jvm).apply(false) + id "org.jetbrains.kotlin.plugin.parcelize" apply false alias(libs.plugins.ksp).apply(false) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 169de600c339..df320af8048f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,7 +55,6 @@ gson = '2.10.1' indexosMediaForMobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jsoup = '1.16.2' junit = '4.13.2' -kotlin = '1.9.22' kotlinxCoroutines = '1.7.3' kover = "0.7.5" ksp = "1.9.22-1.0.17" @@ -187,8 +186,6 @@ indexos-media-for-mobile-domain = { group = "com.github.indexos.media-for-mobile installReferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref ="androidInstallReferrer" } jsoup = { group = "org.jsoup", name = "jsoup", version.ref ="jsoup" } junit = { group = "junit", name = "junit", version.ref ="junit" } -kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" } -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 ="kotlinxCoroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutines" } @@ -218,10 +215,6 @@ dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" } -kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } diff --git a/libs/annotations/build.gradle b/libs/annotations/build.gradle index 03c19ecfd20e..38dacf593233 100644 --- a/libs/annotations/build.gradle +++ b/libs/annotations/build.gradle @@ -1,5 +1,5 @@ plugins { - alias(libs.plugins.kotlin.jvm) + id "org.jetbrains.kotlin.jvm" } sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 88f805c47a17..6653c3f00efa 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) + id "org.jetbrains.kotlin.android" + id "org.jetbrains.kotlin.plugin.parcelize" alias(libs.plugins.kover) } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index f8b965e21dcf..a9fb28a214c5 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) + id "org.jetbrains.kotlin.android" + id "org.jetbrains.kotlin.plugin.parcelize" alias(libs.plugins.navigation.safeargs) alias(libs.plugins.kover) } diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index ee99a546b131..dcdc5757523d 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -1,5 +1,5 @@ plugins { - alias(libs.plugins.kotlin.jvm) + id "org.jetbrains.kotlin.jvm" alias(libs.plugins.kover) } @@ -18,5 +18,5 @@ dependencies { testImplementation "com.github.tschuchortdev:kotlin-compile-testing-ksp:$kctVersion" testImplementation libs.junit testImplementation libs.assertj.core - testImplementation libs.kotlin.reflect + testImplementation "org.jetbrains.kotlin:kotlin-reflect:$gradle.ext.kotlinVersion" } diff --git a/settings.gradle b/settings.gradle index b63822b37efb..277fbe433ad5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,13 @@ pluginManagement { + gradle.ext.kotlinVersion = '1.9.22' + + plugins { + id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion + id "org.jetbrains.kotlin.jvm" version gradle.ext.kotlinVersion + id "org.jetbrains.kotlin.plugin.serialization" version gradle.ext.kotlinVersion + id "org.jetbrains.kotlin.plugin.parcelize" version gradle.ext.kotlinVersion + id "org.jetbrains.kotlin.plugin.allopen" version gradle.ext.kotlinVersion + } repositories { maven { url 'https://a8c-libs.s3.amazonaws.com/android' From 326046daf24fe2f3b2a19f1351f40b6d4bc9512b Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 14:14:01 +0530 Subject: [PATCH 084/117] Plugin : Migrated `kotlin` to Version Catalog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- WordPress/build.gradle | 8 ++++---- build.gradle | 5 ++++- gradle/libs.versions.toml | 8 ++++++++ libs/annotations/build.gradle | 2 +- libs/editor/build.gradle | 4 ++-- libs/image-editor/build.gradle | 4 ++-- libs/processors/build.gradle | 4 ++-- settings.gradle | 9 --------- 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 0bd54003c3cf..5b636557530e 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -4,9 +4,9 @@ import se.bjurr.violations.lib.model.SEVERITY plugins { alias(libs.plugins.android.application) - id "org.jetbrains.kotlin.android" - id "org.jetbrains.kotlin.plugin.parcelize" - id "org.jetbrains.kotlin.plugin.allopen" + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) + alias(libs.plugins.kotlin.allopen) alias(libs.plugins.sentry) alias(libs.plugins.violation.comments) alias(libs.plugins.google.services) @@ -482,7 +482,7 @@ dependencies { }) testImplementation libs.junit testImplementation libs.mockito.kotlin - 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/build.gradle b/build.gradle index 10f7befc179d..b3839c8f1e09 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,10 @@ plugins { alias(libs.plugins.android.library).apply(false) alias(libs.plugins.android.application).apply(false) alias(libs.plugins.google.services).apply(false) - id "org.jetbrains.kotlin.plugin.parcelize" apply false + alias(libs.plugins.kotlin.jvm).apply(false) + alias(libs.plugins.kotlin.parcelize).apply(false) + alias(libs.plugins.kotlin.android).apply(false) + alias(libs.plugins.kotlin.serialization).apply(false) alias(libs.plugins.ksp).apply(false) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index df320af8048f..5864fc7eed64 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,6 +55,7 @@ gson = '2.10.1' indexosMediaForMobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jsoup = '1.16.2' junit = '4.13.2' +kotlin = '1.9.22' kotlinxCoroutines = '1.7.3' kover = "0.7.5" ksp = "1.9.22-1.0.17" @@ -207,6 +208,8 @@ wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref =" wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } +kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" } +kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } @@ -221,3 +224,8 @@ measure-builds = { id = "com.automattic.android.measure-builds", version.ref = " navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } violation-comments = { id = "se.bjurr.violations.violation-comments-to-github-gradle-plugin", version.ref = "violationComments" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } +kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } diff --git a/libs/annotations/build.gradle b/libs/annotations/build.gradle index 38dacf593233..03c19ecfd20e 100644 --- a/libs/annotations/build.gradle +++ b/libs/annotations/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.jetbrains.kotlin.jvm" + alias(libs.plugins.kotlin.jvm) } sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 6653c3f00efa..88f805c47a17 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/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) alias(libs.plugins.kover) } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index a9fb28a214c5..f8b965e21dcf 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/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) alias(libs.plugins.navigation.safeargs) alias(libs.plugins.kover) } diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index dcdc5757523d..ee99a546b131 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.jetbrains.kotlin.jvm" + alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kover) } @@ -18,5 +18,5 @@ dependencies { testImplementation "com.github.tschuchortdev:kotlin-compile-testing-ksp:$kctVersion" testImplementation libs.junit testImplementation libs.assertj.core - testImplementation "org.jetbrains.kotlin:kotlin-reflect:$gradle.ext.kotlinVersion" + testImplementation libs.kotlin.reflect } diff --git a/settings.gradle b/settings.gradle index 277fbe433ad5..b63822b37efb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,13 +1,4 @@ pluginManagement { - gradle.ext.kotlinVersion = '1.9.22' - - plugins { - id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion - id "org.jetbrains.kotlin.jvm" version gradle.ext.kotlinVersion - id "org.jetbrains.kotlin.plugin.serialization" version gradle.ext.kotlinVersion - id "org.jetbrains.kotlin.plugin.parcelize" version gradle.ext.kotlinVersion - id "org.jetbrains.kotlin.plugin.allopen" version gradle.ext.kotlinVersion - } repositories { maven { url 'https://a8c-libs.s3.amazonaws.com/android' From 05ebb7ae40845fe747c3a355ed34c956bf604391 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 14:18:38 +0530 Subject: [PATCH 085/117] Reordered Plugins & Library alphabetically MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Petros Paraskevopoulos <9729923+ParaskP7@users.noreply.github.com> Co-Authored-By: Wojciech Zięba --- gradle/libs.versions.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5864fc7eed64..87b34c6de484 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -187,6 +187,8 @@ indexos-media-for-mobile-domain = { group = "com.github.indexos.media-for-mobile installReferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref ="androidInstallReferrer" } jsoup = { group = "org.jsoup", name = "jsoup", version.ref ="jsoup" } junit = { group = "junit", name = "junit", version.ref ="junit" } +kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" } +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 ="kotlinxCoroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref ="kotlinxCoroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref ="kotlinxCoroutines" } @@ -208,8 +210,6 @@ wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref =" wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } -kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" } -kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } @@ -218,14 +218,14 @@ dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" } +kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } violation-comments = { id = "se.bjurr.violations.violation-comments-to-github-gradle-plugin", version.ref = "violationComments" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } -kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } -kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } From 755658b728a27adf5b859cbed501170d7aeea582 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 19:26:43 +0530 Subject: [PATCH 086/117] Renamed : androidxNavigation --- WordPress/build.gradle | 2 +- gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 5b636557530e..b75fa6323786 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -351,7 +351,7 @@ static def addBuildConfigFieldsFromPrefixedProperties(variant, properties, prefi dependencies { implementation libs.androidx.webkit - implementation libs.androidx.navigation + implementation libs.androidx.navigation.compose compileOnly project(path: ':libs:annotations') ksp project(':libs:processors') implementation (project(path:':libs:networking')) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 87b34c6de484..e0308fcb5cb7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,12 +7,12 @@ androidxArchCore = '2.2.0' androidxCamera = '1.3.4' androidxCardview = '1.0.0' androidxComposeMaterial3 = '1.1.1' -androidxComposeNavigation = '2.7.6' androidxConstraintlayout = '2.1.4' androidxConstraintlayoutCompose = '1.0.1' androidxCore = '1.10.0' androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' +androidxNavigationCompose = '2.7.6' androidxPercentLayout = '1.0.0' androidxPreference = '1.2.0' androidxRecyclerview = '1.3.0' @@ -125,7 +125,7 @@ androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" } androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } -androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigationCompose" } androidx-percentLayout = { group = "androidx.percentlayout", name = "percentlayout", version.ref = "androidxPercentLayout" } androidx-preference = { group = "androidx.preference", name = "preference", version.ref = "androidxPreference" } androidx-recyclerView = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidxRecyclerview" } From 8d52af4f260a3a4e33e81ec26b365732accc8c16 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 19:31:50 +0530 Subject: [PATCH 087/117] Renamed : `androidxNavigation` --- gradle/libs.versions.toml | 8 ++++---- libs/image-editor/build.gradle | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e0308fcb5cb7..535e66b335b1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,6 +12,7 @@ androidxConstraintlayoutCompose = '1.0.1' androidxCore = '1.10.0' androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' +androidxNavigation = "2.7.7" androidxNavigationCompose = '2.7.6' androidxPercentLayout = '1.0.0' androidxPreference = '1.2.0' @@ -63,7 +64,6 @@ lottie = '6.1.0' measureBuilds = '3.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' -navigation = "2.7.7" philjayMpAndroidChart = 'v3.1.0' screengrab = '2.1.1' sentry = "4.3.1" @@ -126,6 +126,8 @@ androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "l androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" } androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigationCompose" } +androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "androidxNavigation" } +androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "androidxNavigation" } androidx-percentLayout = { group = "androidx.percentlayout", name = "percentlayout", version.ref = "androidxPercentLayout" } androidx-preference = { group = "androidx.preference", name = "preference", version.ref = "androidxPreference" } androidx-recyclerView = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidxRecyclerview" } @@ -197,8 +199,6 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" } -navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "navigation" } -navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "navigation" } philJay-mpAndroidChart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref ="philjayMpAndroidChart" } squareup-kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version.ref ="squareupKotlinPoet" } squareup-kotlinpoet-ksp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref ="squareupKotlinPoet" } @@ -226,6 +226,6 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } -navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } +navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidxNavigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } violation-comments = { id = "se.bjurr.violations.violation-comments-to-github-gradle-plugin", version.ref = "violationComments" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index f8b965e21dcf..de260e843730 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -55,8 +55,8 @@ dependencies { implementation libs.androidx.constraintLayout implementation libs.androidx.viewPager2 implementation libs.google.material - implementation libs.navigation.fragment - implementation libs.navigation.ui + implementation libs.androidx.navigation.fragment + implementation libs.androidx.navigation.ui implementation libs.androidx.lifecycle.common implementation libs.androidx.lifecycle.runtime implementation libs.androidx.lifecycle.viewmodel From dbaed2662960db64d13905f8cc3fd56573ac4093 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 19:33:51 +0530 Subject: [PATCH 088/117] Renamed : `gson` --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 535e66b335b1..e6d7e6b4f74a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -44,6 +44,7 @@ firebaseIid = '21.1.0' flipper = '0.247.0' glide = '4.16.0' googleFlexbox = '3.0.0' +googleGson = '2.10.1' googleMaterial = '1.9.0' googleMLKitBarcodeScanning = '17.2.0' googleMLKitBarcodeScanningCommon = '17.0.0' @@ -52,7 +53,6 @@ googlePlayAppUpdate = '2.1.0' googlePlayReview = '2.0.1' googlePlayServicesAuth = '20.4.1' googleServices = '4.3.15' -gson = '2.10.1' indexosMediaForMobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jsoup = '1.16.2' junit = '4.13.2' @@ -174,7 +174,7 @@ glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="g glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } google-exoPlayer = { group = "com.google.android.exoplayer", name = "exoplayer", version.ref ="exoPlayer" } google-flexbox = { group = "com.google.android.flexbox", name = "flexbox", version.ref = "googleFlexbox" } -google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "googleGson" } google-material = { group = "com.google.android.material", name = "material", version.ref = "googleMaterial" } google-mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref ="googleMLKitBarcodeScanning" } google-mlkit-barcode-scanning-common = { group = "com.google.mlkit", name = "barcode-scanning-common", version.ref ="googleMLKitBarcodeScanningCommon" } From 4d5d5c9460d27f1261fb9b3565b581ee8965aeac Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 19:44:35 +0530 Subject: [PATCH 089/117] Renamed : `kover` --- WordPress/build.gradle | 2 +- build.gradle | 2 +- gradle/libs.versions.toml | 4 ++-- libs/editor/build.gradle | 2 +- libs/image-editor/build.gradle | 2 +- libs/processors/build.gradle | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index b75fa6323786..d60af89bcf7b 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -11,7 +11,7 @@ plugins { alias(libs.plugins.violation.comments) alias(libs.plugins.google.services) alias(libs.plugins.dagger) - alias(libs.plugins.kover) + alias(libs.plugins.kotlix.kover) alias(libs.plugins.ksp) } diff --git a/build.gradle b/build.gradle index b3839c8f1e09..7cab68d704f7 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { alias(libs.plugins.detekt) alias(libs.plugins.measure.builds) - alias(libs.plugins.kover) + alias(libs.plugins.kotlix.kover) alias(libs.plugins.dependency.analysis) alias(libs.plugins.navigation.safeargs).apply(false) alias(libs.plugins.android.library).apply(false) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e6d7e6b4f74a..059accdd1843 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -58,7 +58,7 @@ jsoup = '1.16.2' junit = '4.13.2' kotlin = '1.9.22' kotlinxCoroutines = '1.7.3' -kover = "0.7.5" +kotlinxKover = "0.7.5" ksp = "1.9.22-1.0.17" lottie = '6.1.0' measureBuilds = '3.1.0' @@ -223,7 +223,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } +kotlix-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kotlinxKover" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidxNavigation" } diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 88f805c47a17..3b306bd10b50 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.parcelize) - alias(libs.plugins.kover) + alias(libs.plugins.kotlix.kover) } repositories { diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index de260e843730..4fe5f466c144 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -3,7 +3,7 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.navigation.safeargs) - alias(libs.plugins.kover) + alias(libs.plugins.kotlix.kover) } android { diff --git a/libs/processors/build.gradle b/libs/processors/build.gradle index ee99a546b131..562a0080116d 100644 --- a/libs/processors/build.gradle +++ b/libs/processors/build.gradle @@ -1,6 +1,6 @@ plugins { alias(libs.plugins.kotlin.jvm) - alias(libs.plugins.kover) + alias(libs.plugins.kotlix.kover) } sourceCompatibility = JavaVersion.VERSION_1_8 From 2f56dee6858ea66bfd8caec2d149f6e8439ebe41 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 19:46:43 +0530 Subject: [PATCH 090/117] Renamed : `measureBuild` --- build.gradle | 2 +- gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 7cab68d704f7..d5ee17bd61f4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { alias(libs.plugins.detekt) - alias(libs.plugins.measure.builds) + alias(libs.plugins.automattic.measure.builds) alias(libs.plugins.kotlix.kover) alias(libs.plugins.dependency.analysis) alias(libs.plugins.navigation.safeargs).apply(false) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 059accdd1843..5499db560286 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,6 +27,7 @@ androidxWebkit = '1.11.0' androidxWorkManager = "2.9.0" apacheCommonsText = '1.10.0' assertj = '3.23.1' +automatticMeasureBuilds = '3.1.0' automatticRest = '1.0.8' cascadeCompose = '2.3.0' chrisbanesPhotoview = '2.3.0' @@ -61,7 +62,6 @@ kotlinxCoroutines = '1.7.3' kotlinxKover = "0.7.5" ksp = "1.9.22-1.0.17" lottie = '6.1.0' -measureBuilds = '3.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' philjayMpAndroidChart = 'v3.1.0' @@ -214,6 +214,7 @@ zendesk = { 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" } +automattic-measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "automatticMeasureBuilds" } dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } @@ -225,7 +226,6 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlix-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kotlinxKover" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -measure-builds = { id = "com.automattic.android.measure-builds", version.ref = "measureBuilds" } navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidxNavigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } violation-comments = { id = "se.bjurr.violations.violation-comments-to-github-gradle-plugin", version.ref = "violationComments" } From 66d3e46733887c0c57e5cddb3e5060036f9b9ace Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 19:51:46 +0530 Subject: [PATCH 091/117] Renamed : `android-appUpdate-ktx` --- WordPress/build.gradle | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index d60af89bcf7b..50fe37678881 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -397,7 +397,7 @@ dependencies { implementation "$gradle.ext.gravatarBinaryPath:$gravatarVersion" implementation libs.android.appUpdate - implementation libs.android.appUpdateKtx + implementation libs.android.appUpdate.ktx implementation libs.androidx.coreCommon implementation libs.androidx.coreRuntime diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5499db560286..13b703cd2ee9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -81,7 +81,7 @@ zendesk = '5.1.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" } +android-appUpdate-ktx = { 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" } From 299f8c775730764fb128a4bec6da8cf364e523c1 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 19:53:23 +0530 Subject: [PATCH 092/117] Renamed : `installReferrer` --- WordPress/build.gradle | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 50fe37678881..e207dcd43144 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -443,7 +443,7 @@ dependencies { implementation libs.androidx.camera.lifecycle implementation libs.androidx.camera.view - implementation libs.installReferrer + implementation libs.android.installReferrer implementation libs.chrisbanes.photoview implementation libs.greenrobot.eventBus implementation libs.greenrobot.eventBus.java diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 13b703cd2ee9..f385522c755c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -82,6 +82,7 @@ zendesk = '5.1.2' [libraries] android-appUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayAppUpdate" } android-appUpdate-ktx = { group = "com.google.android.play", name = "app-update-ktx", version.ref = "googlePlayAppUpdate" } +android-installReferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref ="androidInstallReferrer" } 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" } @@ -186,7 +187,6 @@ greenrobot-eventBus = { group = "org.greenrobot", name = "eventbus", version.ref greenrobot-eventBus-java = { group = "org.greenrobot", name = "eventbus-java", version.ref ="eventBus" } indexos-media-for-mobile-android = { group = "com.github.indexos.media-for-mobile", name = "android", version.ref ="indexosMediaForMobile" } indexos-media-for-mobile-domain = { group = "com.github.indexos.media-for-mobile", name = "domain", version.ref ="indexosMediaForMobile" } -installReferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref ="androidInstallReferrer" } jsoup = { group = "org.jsoup", name = "jsoup", version.ref ="jsoup" } junit = { group = "junit", name = "junit", version.ref ="junit" } kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" } From 912979461fdbe02a52ee5c6ac3affa23fcab05d6 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 19:57:10 +0530 Subject: [PATCH 093/117] Renamed : `androidx-compose-ui-test-manifest` & `androidx-compose-ui-tooling` --- WordPress/build.gradle | 4 ++-- gradle/libs.versions.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index e207dcd43144..e5f862fc5bf9 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -535,8 +535,8 @@ dependencies { implementation(composeBom) androidTestImplementation(composeBom) // - Jetpack Compose - Android Studio - debugImplementation libs.androidx.compose.testManifest - debugImplementation libs.androidx.compose.tooling + debugImplementation libs.androidx.compose.ui.test.manifest + debugImplementation libs.androidx.compose.ui.tooling // - Jetpack Compose - Main implementation libs.androidx.compose.runtime implementation libs.androidx.compose.runtime.livedata diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f385522c755c..44a44b483be6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -98,12 +98,12 @@ androidx-compose-material = { group = "androidx.compose.material", name = "mater androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref ="androidxComposeMaterial3" } androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" } androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } -androidx-compose-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -androidx-compose-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } androidx-compose-ui-test = { 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 = { group = "androidx.compose.ui", name = "ui-text" } +androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } androidx-compose-ui-unit = { group = "androidx.compose.ui", name = "ui-unit" } androidx-constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintlayout" } From 6820a99374353fde8828edde4c71f70b94272f9f Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 20:03:15 +0530 Subject: [PATCH 094/117] Renamed : `coreCommon`, `coreRuntime` and `coreTesting` --- WordPress/build.gradle | 6 +++--- gradle/libs.versions.toml | 6 +++--- libs/image-editor/build.gradle | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index e5f862fc5bf9..fc83591d4662 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -399,8 +399,8 @@ dependencies { implementation libs.android.appUpdate implementation libs.android.appUpdate.ktx - implementation libs.androidx.coreCommon - implementation libs.androidx.coreRuntime + implementation libs.androidx.arch.core.common + implementation libs.androidx.arch.core.runtime implementation libs.google.gson implementation libs.androidx.core implementation libs.androidx.core.ktx @@ -475,7 +475,7 @@ dependencies { implementation libs.dagger.hilt.android ksp libs.dagger.hilt.compiler - testImplementation(libs.androidx.coreTesting, { + 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' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 44a44b483be6..914f802a52a0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -88,6 +88,9 @@ androidx-activity-compose = { group = "androidx.activity", name = "activity-comp 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-arch-core-common = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCore" } +androidx-arch-core-runtime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCore" } +androidx-arch-core-testing = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidxArchCore" } androidx-camera = { group = "androidx.camera", name = "camera-camera2", version.ref ="androidxCamera" } androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref ="androidxCamera" } androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref ="androidxCamera" } @@ -110,9 +113,6 @@ androidx-constraintLayout = { group = "androidx.constraintlayout", name = "const androidx-constraintLayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref ="androidxConstraintlayoutCompose" } 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" } -androidx-coreRuntime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCore" } -androidx-coreTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidxArchCore" } androidx-fragment = { group = "androidx.fragment", name = "fragment", version.ref = "androidxFragment"} androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidxFragment"} androidx-lifecycle-common = { group = "androidx.lifecycle", name = "lifecycle-common", version.ref = "androidxLifecycle" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 4fe5f466c144..047b5140fb06 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -72,7 +72,7 @@ dependencies { testImplementation libs.mockito.kotlin testImplementation libs.junit testImplementation libs.assertj.core - testImplementation(libs.androidx.coreTesting, { + 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' From b9b1e8ad56ecda9fac35e7a5cc12aa993b284167 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 20:06:53 +0530 Subject: [PATCH 095/117] Renamed : `work` dependency --- WordPress/build.gradle | 6 +++--- gradle/libs.versions.toml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index fc83591d4662..f334602e6952 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -421,8 +421,8 @@ dependencies { implementation libs.androidx.percentLayout implementation libs.androidx.swiperefreshlayout implementation libs.androidx.preference - implementation libs.androidx.workManager.runtime - implementation libs.androidx.workManager.runtime.ktx + implementation libs.androidx.work.runtime + implementation libs.androidx.work.runtime.ktx implementation libs.androidx.constraintLayout implementation libs.androidx.lifecycle.viewmodel implementation libs.androidx.lifecycle.viewmodel.ktx @@ -515,7 +515,7 @@ dependencies { exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18' } androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing - androidTestImplementation libs.androidx.workManager.workTesting + androidTestImplementation libs.androidx.work.testing androidTestImplementation libs.dagger.hilt.android.testing kspAndroidTest libs.dagger.hilt.android.compiler // Enables Java 8+ API desugaring support diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 914f802a52a0..3466f5ba6a41 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -142,9 +142,9 @@ androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = androidx-test-ui-automator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref ="androidxTestUiAutomator" } androidx-viewPager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref ="androidxViewpager2" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} -androidx-workManager-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" } -androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" } -androidx-workManager-workTesting = { group = "androidx.work", name = "work-testing", version.ref = "androidxWorkManager" } +androidx-work-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" } +androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" } +androidx-work-testing = { group = "androidx.work", name = "work-testing", version.ref = "androidxWorkManager" } apache-commons-text = { group = "org.apache.commons", name = "commons-text", version.ref ="apacheCommonsText" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref ="assertj" } automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } From 1209ddba044362f555d789d1a1d582292fece128 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 20:10:15 +0530 Subject: [PATCH 096/117] fixed : revert & migrated configuration --- build.gradle | 1 + libs/image-editor/build.gradle | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d5ee17bd61f4..575810698255 100644 --- a/build.gradle +++ b/build.gradle @@ -95,6 +95,7 @@ allprojects { } detekt { + toolVersion = libs.versions.detekt.get() baseline = file("${project.rootDir}/config/detekt/baseline.xml") config = files("${project.rootDir}/config/detekt/detekt.yml") autoCorrect = false diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 047b5140fb06..68100291a0dd 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -79,5 +79,11 @@ dependencies { }) androidTestImplementation libs.androidx.test.ext.junit - androidTestImplementation(libs.androidx.test.espresso.core) + androidTestImplementation(libs.androidx.test.espresso.core){ + { + version { + strictly libs.versions.androidxTestEspresso.get() + } + } + } } From 492616dc734b92e4cf6c4c78bc753fb8b01ed7e4 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Tue, 9 Jul 2024 20:35:05 +0530 Subject: [PATCH 097/117] Docs : Links Updated --- ...test_instructions_per_dependency_update.md | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/docs/test_instructions_per_dependency_update.md b/docs/test_instructions_per_dependency_update.md index 6071e687cf58..f2c30c043b85 100644 --- a/docs/test_instructions_per_dependency_update.md +++ b/docs/test_instructions_per_dependency_update.md @@ -91,7 +91,7 @@ rather than strict requirements. ----- -### WorkManager [[androidxWorkManagerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### WorkManager [[androidxWorkManagerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP/WP] UploadWorker.kt @@ -144,7 +144,7 @@ rather than strict requirements. ----- -### Preference (AndroidX) [[androidxPreferenceVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Preference (AndroidX) [[androidxPreferenceVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP] Notifications Settings [NotificationsSettingsFragment.java] @@ -231,7 +231,7 @@ rather than strict requirements. ----- -### ExoPlayer [[googleExoPlayerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### ExoPlayer [[googleExoPlayerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP/WP] Image Preview @@ -262,7 +262,7 @@ rather than strict requirements. ----- -### Webkit [[androidxWebkitVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Webkit [[androidxWebkitVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [TODO] TODO @@ -275,7 +275,7 @@ rather than strict requirements. ----- -### Firebase [[firebaseBomVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Firebase [[firebaseBomVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP/WP] Push Notification on Post Being Published [GCMMessageService.java] @@ -291,7 +291,7 @@ rather than strict requirements. ----- -### FirebaseIid [[firebaseIidVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### FirebaseIid [[firebaseIidVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [TODO] TODO @@ -304,7 +304,7 @@ rather than strict requirements. ----- -### MLKitBarcodeScanning [[googleMLKitBarcodeScanningVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### MLKitBarcodeScanning [[googleMLKitBarcodeScanningVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
@@ -318,7 +318,7 @@ rather than strict requirements. ----- -### PlayServicesAuth [[googlePlayServicesAuthVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### PlayServicesAuth [[googlePlayServicesAuthVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ℹ️ These set of testing instructions are for internal contributors only, which can have access to upload an `.aab` to Google Play Store. As such, external contributors can't possibly test this @@ -420,7 +420,7 @@ Step.3: ----- -### PlayReview [[googlePlayReviewVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### PlayReview [[googlePlayReviewVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. In app reviews @@ -433,7 +433,7 @@ Step.3: ----- -### Zendesk [[zendeskVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Zendesk [[zendeskVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP] Zendesk Update [Tickets & Contact Support] @@ -458,7 +458,7 @@ Step.3: ----- -### JSoup [[jsoupVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### JSoup [[jsoupVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP/WP] Classic Editor [Aztec] @@ -516,7 +516,7 @@ all sites have this option. ----- -### AutoService [[googleAutoServiceVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### AutoService [[googleAutoServiceVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP/WP] Remote Features [@Feature] @@ -548,7 +548,7 @@ all sites have this option. ----- -### KotlinPoet [[squareupKotlinPoetVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### KotlinPoet [[squareupKotlinPoetVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP/WP] Remote Features [@Feature] @@ -580,7 +580,7 @@ all sites have this option. ----- -### Lottie [[lottieVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Lottie [[lottieVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP/WP] JP Install Full Plugin Animation [JPInstallFullPluginAnimation.kt] @@ -611,7 +611,7 @@ all sites have this option. ----- -### UCrop [[uCropVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### UCrop [[uCropVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP/WP] Image Edit Screen [PreviewImageFragment.kt + CropFragment.kt] @@ -672,111 +672,111 @@ all sites have this option. ----- -### GoogleServices [[googleServicesVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/settings.gradle)] +### GoogleServices [[googleServicesVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Dagger [[daggerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/settings.gradle)] +### Dagger [[daggerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Kotlin [[kotlinVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/settings.gradle)] + [[androidxComposeCompilerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Kotlin [[kotlinVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] + [[androidxComposeCompilerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Coroutines [[kotlinxCoroutinesVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Coroutines [[kotlinxCoroutinesVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### EventBus [[eventBusVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### EventBus [[eventBusVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Annotation [[androidxAnnotationVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Annotation [[androidxAnnotationVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### ArchCore [[androidxArchCoreVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### ArchCore [[androidxArchCoreVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Lifecycle [[androidxLifecycleVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Lifecycle [[androidxLifecycleVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Core [[androidxCoreVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Core [[androidxCoreVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Activity [[androidxActivityVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Activity [[androidxActivityVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Fragment [[androidxFragmentVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Fragment [[androidxFragmentVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### AppCompat [[androidxAppcompatVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### AppCompat [[androidxAppcompatVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Compose [[androidxComposeBomVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Compose [[androidxComposeBomVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### ComposeMaterial3 [[androidxComposeMaterial3Version](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### ComposeMaterial3 [[androidxComposeMaterial3Version](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### ComposeConstraintLayout [[androidxConstraintlayoutComposeVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### ComposeConstraintLayout [[androidxConstraintlayoutComposeVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Coil [[coilComposeVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Coil [[coilComposeVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### RecyclerView [[androidxRecyclerviewVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### RecyclerView [[androidxRecyclerviewVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### ViewPager2 [[androidxViewpager2Version](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### ViewPager2 [[androidxViewpager2Version](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Material [[googleMaterialVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Material [[googleMaterialVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### ConstraintLayout [[androidxConstraintlayoutVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### ConstraintLayout [[androidxConstraintlayoutVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Retrofit [[squareupRetrofitVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Retrofit [[squareupRetrofitVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Volley [[androidVolleyVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Volley [[androidVolleyVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Glide [[glideVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] + [[glideVolleyVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Glide [[glideVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] + [[glideVolleyVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Gson [[googleGsonVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Gson [[googleGsonVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### InstallReferrer [[androidInstallReferrerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### InstallReferrer [[androidInstallReferrerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### ApacheCommons [[apacheCommonsTextVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### ApacheCommons [[apacheCommonsTextVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ----- -### Desugar [[androidDesugarVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Desugar [[androidDesugarVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
Extra @@ -819,7 +819,7 @@ and [here](https://github.com/orgs/wordpress-mobile/projects/95)). ----- -### AGP [[agpVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/settings.gradle)] +### AGP [[agpVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
Why & How @@ -832,7 +832,7 @@ and [here](https://github.com/orgs/wordpress-mobile/projects/95)). ----- -### Sentry [[sentryVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/settings.gradle)] +### Sentry [[sentryVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
Why & How @@ -894,7 +894,7 @@ diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMain ----- -### Detekt [[detektVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/settings.gradle)] +### Detekt [[detektVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
Why & How @@ -907,7 +907,7 @@ diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMain ----- -### ViolationComments [[violationCommentsVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/settings.gradle)] +### ViolationComments [[violationCommentsVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
Why & How @@ -920,7 +920,7 @@ diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMain ----- -### ReactNative [[facebookReactVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### ReactNative [[facebookReactVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
Why & How From 12ab3fe207e1e3759d8b53337f9685d7ad9e4e84 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 16:32:14 +0530 Subject: [PATCH 098/117] Docs : Links Updated --- docs/test_instructions_per_dependency_update.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/test_instructions_per_dependency_update.md b/docs/test_instructions_per_dependency_update.md index f2c30c043b85..113352ad2c5f 100644 --- a/docs/test_instructions_per_dependency_update.md +++ b/docs/test_instructions_per_dependency_update.md @@ -74,7 +74,7 @@ rather than strict requirements. ----- -### Navigation [[navigationVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/settings.gradle)] +### Navigation [[navigationVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP/WP] Image Editing Flow [libs:image-editor] @@ -157,7 +157,7 @@ rather than strict requirements.
-### Preference (Android) [[N/A](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### Preference (Android) [[N/A](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)] ℹ️ Note that this is not an actual dependency, it being part of the `Android` SDK, that it is deprecated and will be migrated to its `AndroidX` equivalent in the future. [[Issue](https://github.com/wordpress-mobile/WordPress-Android/issues/17962)] @@ -386,7 +386,7 @@ rather than strict requirements. ----- -### PlayServicesCodeScanner [[googlePlayServicesCodeScannerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/build.gradle)] +### PlayServicesCodeScanner [[googlePlayServicesCodeScannerVersion](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/gradle/libs.versions.toml)]
1. [JP] Scan Login Code From f554f99667828418d2dcc938868e53d5f4f96e72 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 16:42:47 +0530 Subject: [PATCH 099/117] fixed : configuration of `androidxTestEspresso` --- WordPress/build.gradle | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index f334602e6952..323980176a41 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -493,14 +493,24 @@ dependencies { androidTestImplementation libs.squareup.okhttp.mockWebServer androidTestImplementation libs.androidx.test.ui.automator androidTestImplementation libs.androidx.test.espresso.core, { + version { + strictly libs.versions.androidxTestEspresso.get() + } exclude group: 'com.android.support', module: 'support-annotations' } androidTestImplementation(libs.androidx.test.espresso.contrib) { + version { + strictly libs.versions.androidxTestEspresso.get() + } exclude group: 'com.android.support', module: 'appcompat' exclude group: 'com.android.support', module: 'support-v4' exclude module: 'recyclerview-v7' } - androidTestImplementation(libs.androidx.test.espresso.accessibility) + androidTestImplementation(libs.androidx.test.espresso.accessibility){ + version { + strictly libs.versions.androidxTestEspresso.get() + } + } androidTestImplementation(libs.wiremock) { exclude group: 'org.apache.httpcomponents', module: 'httpclient' exclude group: 'org.apache.commons', module: 'commons-lang3' From be75ba98bec875ab0c4f0e1a6ce467b9cdf8ae73 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 17:17:06 +0530 Subject: [PATCH 100/117] Deps : Migrated `androidDesugar` to version catalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 323980176a41..4569dd1d355d 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -529,7 +529,7 @@ dependencies { androidTestImplementation libs.dagger.hilt.android.testing kspAndroidTest libs.dagger.hilt.android.compiler // Enables Java 8+ API desugaring support - coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$androidDesugarVersion" + coreLibraryDesugaring libs.desugar.jdk.libs lintChecks "org.wordpress:lint:$wordPressLintVersion" // Firebase diff --git a/build.gradle b/build.gradle index 575810698255..8a155d82fed6 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,6 @@ ext { androidxComposeCompilerVersion = '1.5.9' // other - androidDesugarVersion = '2.0.4' wordPressLintVersion = '2.1.0' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3466f5ba6a41..b69f1276a4a0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] agp = '8.1.0' +androidDesugar = '2.0.4' androidInstallReferrer = '2.2' androidxActivity = '1.8.0' androidxAppcompat = '1.6.1' @@ -158,6 +159,7 @@ dagger-hilt-android = { group = "com.google.dagger", name = "hilt-android", vers dagger-hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "dagger" } dagger-hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "dagger" } dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" } +desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref ="androidDesugar" } detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" } facebook-flipper = { group = "com.facebook.flipper", name = "flipper", version.ref ="flipper" } facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref ="flipper" } From 50e97d3864d40d1f183636cd41b9e2403a195a0a Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 17:26:40 +0530 Subject: [PATCH 101/117] Deps : Migrated `wordressLint` to Version Catalog --- WordPress/build.gradle | 2 +- build.gradle | 3 --- gradle/libs.versions.toml | 2 ++ libs/analytics/build.gradle | 2 +- libs/editor/build.gradle | 2 +- libs/networking/build.gradle | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 4569dd1d355d..a7888b220996 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -530,7 +530,7 @@ dependencies { kspAndroidTest libs.dagger.hilt.android.compiler // Enables Java 8+ API desugaring support coreLibraryDesugaring libs.desugar.jdk.libs - lintChecks "org.wordpress:lint:$wordPressLintVersion" + lintChecks libs.wordpress.lint // Firebase def firebaseBom = platform(libs.firebase.bom) diff --git a/build.gradle b/build.gradle index 8a155d82fed6..1e9c0f6ba8d0 100644 --- a/build.gradle +++ b/build.gradle @@ -37,9 +37,6 @@ ext { // main androidxAnnotationVersion = '1.6.0' androidxComposeCompilerVersion = '1.5.9' - - // other - wordPressLintVersion = '2.1.0' } measureBuilds { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b69f1276a4a0..ccb37f47b1d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -78,6 +78,7 @@ volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' wordPressPersistentEditText = '1.0.2' +wordressLint = '2.1.0' zendesk = '5.1.2' [libraries] @@ -210,6 +211,7 @@ ucrop = { group = "com.github.yalantis", name = "ucrop", version.ref = "uCrop" } volley = { group = "com.android.volley", name = "volley", version.ref = "volley" } wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" } wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } +wordpress-lint = { group = "org.wordpress", name = "lint", version.ref = "wordressLint" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle index 36e1d32fbd68..f69f61717714 100644 --- a/libs/analytics/build.gradle +++ b/libs/analytics/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation libs.androidx.preference - lintChecks "org.wordpress:lint:$wordPressLintVersion" + lintChecks libs.wordpress.lint } android { diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 3b306bd10b50..2f2c2673ed5e 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -108,5 +108,5 @@ dependencies { implementation libs.google.gson implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" - lintChecks "org.wordpress:lint:$wordPressLintVersion" + lintChecks libs.wordpress.lint } diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle index 62166111f786..a9672d8ff3b1 100644 --- a/libs/networking/build.gradle +++ b/libs/networking/build.gradle @@ -35,5 +35,5 @@ dependencies { implementation libs.volley implementation "androidx.annotation:annotation:$androidxAnnotationVersion" - lintChecks "org.wordpress:lint:$wordPressLintVersion" + lintChecks libs.wordpress.lint } From 546de14c5b1f85ef3d21a887e8844738dc2e0d8a Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 17:30:41 +0530 Subject: [PATCH 102/117] Version : Migrated `androidxComposeCompiler` to VersionCatalog --- WordPress/build.gradle | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index a7888b220996..4570d7d86f16 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -321,7 +321,7 @@ android { compose true composeOptions { - kotlinCompilerExtensionVersion = androidxComposeCompilerVersion + kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get() } } } diff --git a/build.gradle b/build.gradle index 1e9c0f6ba8d0..34f33c987bf6 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,6 @@ ext { // main androidxAnnotationVersion = '1.6.0' - androidxComposeCompilerVersion = '1.5.9' } measureBuilds { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ccb37f47b1d9..4053d7f0019c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,7 @@ androidxAppcompat = '1.6.1' androidxArchCore = '2.2.0' androidxCamera = '1.3.4' androidxCardview = '1.0.0' +androidxComposeCompiler = '1.5.9' androidxComposeMaterial3 = '1.1.1' androidxConstraintlayout = '2.1.4' androidxConstraintlayoutCompose = '1.0.1' From 98ca878a21ff2bc9ad7088c70d60db4fb6782838 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 17:38:39 +0530 Subject: [PATCH 103/117] Deps : Migrated `androidxAnnotation` to Version Catalog --- build.gradle | 3 --- gradle/libs.versions.toml | 2 ++ libs/networking/build.gradle | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 34f33c987bf6..91346a45d697 100644 --- a/build.gradle +++ b/build.gradle @@ -33,9 +33,6 @@ ext { wordPressLoginVersion = '1.16.0' wordPressUtilsVersion = '3.14.0' gravatarVersion = '1.0.0' - - // main - androidxAnnotationVersion = '1.6.0' } measureBuilds { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4053d7f0019c..24405a487455 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,7 @@ agp = '8.1.0' androidDesugar = '2.0.4' androidInstallReferrer = '2.2' androidxActivity = '1.8.0' +androidxAnnotation = '1.6.0' androidxAppcompat = '1.6.1' androidxArchCore = '2.2.0' androidxCamera = '1.3.4' @@ -89,6 +90,7 @@ android-installReferrer = { group = "com.android.installreferrer", name = "insta 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-annotation = { group = "androidx.annotation", name = "annotation", version.ref ="androidxAnnotation" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppcompat" } androidx-appcompat-resources = { group = "androidx.appcompat", name = "appcompat-resources", version.ref = "androidxAppcompat" } androidx-arch-core-common = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCore" } diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle index a9672d8ff3b1..059912327e5c 100644 --- a/libs/networking/build.gradle +++ b/libs/networking/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation "org.wordpress:utils:$wordPressUtilsVersion" implementation libs.volley - implementation "androidx.annotation:annotation:$androidxAnnotationVersion" + implementation libs.androidx.annotation lintChecks libs.wordpress.lint } From 776409fbaad0a07d931b2f78af154786b8400fe9 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 21:26:19 +0530 Subject: [PATCH 104/117] Migrate `wordPressUtils` to Version Catalog --- WordPress/build.gradle | 6 ++++-- build.gradle | 1 - gradle/libs.versions.toml | 2 ++ libs/analytics/build.gradle | 2 +- libs/editor/build.gradle | 4 ++-- libs/networking/build.gradle | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 4570d7d86f16..14ee69ba397f 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -373,9 +373,11 @@ dependencies { exclude group: 'org.wordpress', module: 'utils' exclude group: 'com.android.support', module: 'support-annotations' } - implementation ("$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion") { + // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml). + // noinspection UseTomlInstead + implementation ("$gradle.ext.wputilsBinaryPath:${libs.versions.wordPressUtils.get()}") { version { - strictly wordPressUtilsVersion + strictly libs.versions.wordPressUtils.get() } } implementation ("$gradle.ext.loginFlowBinaryPath:$wordPressLoginVersion") { diff --git a/build.gradle b/build.gradle index 91346a45d697..c0b0cfafcf1b 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,6 @@ ext { wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' wordPressLoginVersion = '1.16.0' - wordPressUtilsVersion = '3.14.0' gravatarVersion = '1.0.0' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 24405a487455..c3933f0e72e0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -80,6 +80,7 @@ volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' wordPressPersistentEditText = '1.0.2' +wordPressUtils = '3.14.0' wordressLint = '2.1.0' zendesk = '5.1.2' @@ -216,6 +217,7 @@ wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref =" wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } wordpress-lint = { group = "org.wordpress", name = "lint", version.ref = "wordressLint" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } +wordpress-utils = { group = "org.wordpress", name = "utils", version.ref = "wordPressUtils" } zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } [plugins] diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle index f69f61717714..2837e940650d 100644 --- a/libs/analytics/build.gradle +++ b/libs/analytics/build.gradle @@ -15,7 +15,7 @@ repositories { dependencies { implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion" - implementation "org.wordpress:utils:$wordPressUtilsVersion" + implementation libs.wordpress.utils implementation libs.androidx.preference diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 2f2c2673ed5e..46c847601bde 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -59,7 +59,7 @@ android { dependencies { implementation ("$gradle.ext.wputilsBinaryPath") { version { - strictly wordPressUtilsVersion + strictly libs.versions.wordPressUtils.get() } } api ("$gradle.ext.aztecAndroidAztecPath") { @@ -94,7 +94,7 @@ dependencies { exclude module: 'react-android' } - implementation "org.wordpress:utils:$wordPressUtilsVersion" + implementation libs.wordpress.utils implementation libs.androidx.lifecycle.common implementation libs.androidx.lifecycle.runtime diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle index 059912327e5c..131fd8dcc2e3 100644 --- a/libs/networking/build.gradle +++ b/libs/networking/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation (libs.automattic.rest) { exclude group: 'com.mcxiaoke.volley' } - implementation "org.wordpress:utils:$wordPressUtilsVersion" + implementation libs.wordpress.utils implementation libs.volley implementation libs.androidx.annotation From 2b46437867fe902b8af5ddb96bba7ca886b3e386 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 21:27:23 +0530 Subject: [PATCH 105/117] Renamed : Typo `wordPressLint` --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c3933f0e72e0..958884660356 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -79,9 +79,9 @@ violationComments = '1.70.0' volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' +wordPressLint = '2.1.0' wordPressPersistentEditText = '1.0.2' wordPressUtils = '3.14.0' -wordressLint = '2.1.0' zendesk = '5.1.2' [libraries] @@ -215,7 +215,7 @@ ucrop = { group = "com.github.yalantis", name = "ucrop", version.ref = "uCrop" } volley = { group = "com.android.volley", name = "volley", version.ref = "volley" } wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" } wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" } -wordpress-lint = { group = "org.wordpress", name = "lint", version.ref = "wordressLint" } +wordpress-lint = { group = "org.wordpress", name = "lint", version.ref = "wordPressLint" } wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } wordpress-utils = { group = "org.wordpress", name = "utils", version.ref = "wordPressUtils" } zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } From 75aeb1f00458a59fb13f7808069d96cbabce5c99 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 21:31:50 +0530 Subject: [PATCH 106/117] Migrated `gravatar` to Version Catalog --- WordPress/build.gradle | 4 +++- build.gradle | 1 - gradle/libs.versions.toml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 14ee69ba397f..245fe052d806 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -396,7 +396,9 @@ dependencies { exclude group: 'com.mcxiaoke.volley' } implementation libs.wordPress.persistentEditText - implementation "$gradle.ext.gravatarBinaryPath:$gravatarVersion" + // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml). + // noinspection UseTomlInstead + implementation "$gradle.ext.gravatarBinaryPath:${libs.versions.gravatar.get()}" implementation libs.android.appUpdate implementation libs.android.appUpdate.ktx diff --git a/build.gradle b/build.gradle index c0b0cfafcf1b..8f3590a4e3c3 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,6 @@ ext { wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' wordPressLoginVersion = '1.16.0' - gravatarVersion = '1.0.0' } measureBuilds { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 958884660356..d7ad5f8a4826 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -57,6 +57,7 @@ googlePlayAppUpdate = '2.1.0' googlePlayReview = '2.0.1' googlePlayServicesAuth = '20.4.1' googleServices = '4.3.15' +gravatar = '1.0.0' indexosMediaForMobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jsoup = '1.16.2' junit = '4.13.2' From 43f50aef1fa44ce1647d589cfac80982dd1699b2 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 21:35:43 +0530 Subject: [PATCH 107/117] Migrated `automatticAbout` to Version Catalog --- WordPress/build.gradle | 4 +++- build.gradle | 1 - gradle/libs.versions.toml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 245fe052d806..0e38a850b6bf 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -384,7 +384,9 @@ dependencies { exclude group: 'com.github.bumptech.glide' exclude group: 'org.wordpress', module: 'utils' } - implementation "$gradle.ext.aboutAutomatticBinaryPath:$automatticAboutVersion" + // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml). + // noinspection UseTomlInstead + implementation "$gradle.ext.aboutAutomatticBinaryPath:${libs.versions.automatticAbout.get()}" implementation("$gradle.ext.tracksBinaryPath:$automatticTracksVersion") { version { diff --git a/build.gradle b/build.gradle index 8f3590a4e3c3..768b5a75b2bd 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,6 @@ ext { ext { // libs - automatticAboutVersion = '1.4.0' automatticTracksVersion = '5.1.0' gutenbergMobileVersion = 'v1.121.0-alpha1' wordPressAztecVersion = 'v2.1.3' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d7ad5f8a4826..93bfba75dc58 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,6 +30,7 @@ androidxWebkit = '1.11.0' androidxWorkManager = "2.9.0" apacheCommonsText = '1.10.0' assertj = '3.23.1' +automatticAbout = '1.4.0' automatticMeasureBuilds = '3.1.0' automatticRest = '1.0.8' cascadeCompose = '2.3.0' From 24373caa943d25d7c9c2ccfd0f94a70f6801ac75 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 21:37:57 +0530 Subject: [PATCH 108/117] Migrated `wordPressLogin` to Version catalog --- WordPress/build.gradle | 4 +++- build.gradle | 3 +-- gradle/libs.versions.toml | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 0e38a850b6bf..540459b76493 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -380,7 +380,9 @@ dependencies { strictly libs.versions.wordPressUtils.get() } } - implementation ("$gradle.ext.loginFlowBinaryPath:$wordPressLoginVersion") { + // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml). + // noinspection UseTomlInstead + implementation ("$gradle.ext.loginFlowBinaryPath:${libs.versions.wordPressLogin.get()}") { exclude group: 'com.github.bumptech.glide' exclude group: 'org.wordpress', module: 'utils' } diff --git a/build.gradle b/build.gradle index 768b5a75b2bd..63d6eac44369 100644 --- a/build.gradle +++ b/build.gradle @@ -29,12 +29,11 @@ ext { gutenbergMobileVersion = 'v1.121.0-alpha1' wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' - wordPressLoginVersion = '1.16.0' +// wordPressLoginVersion = '1.16.0' } measureBuilds { enable = findProperty('measureBuildsEnabled')?.toBoolean() ?: false - onBuildMetricsReadyListener { report -> SlowSlowTasksMetricsReporter.report(report) InternalA8cCiReporter.reportBlocking( report, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 93bfba75dc58..6441534c551f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -82,6 +82,7 @@ volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' wordPressLint = '2.1.0' +wordPressLogin = '1.16.0' wordPressPersistentEditText = '1.0.2' wordPressUtils = '3.14.0' zendesk = '5.1.2' From f680475837d349b68934d487b5ae0e5ca1a96e0b Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 21:45:13 +0530 Subject: [PATCH 109/117] Migrated `wordPressAztec` to Version Catalog --- build.gradle | 2 -- gradle/libs.versions.toml | 1 + libs/editor/build.gradle | 14 +++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 63d6eac44369..a477b84ddd7a 100644 --- a/build.gradle +++ b/build.gradle @@ -27,9 +27,7 @@ ext { // libs automatticTracksVersion = '5.1.0' gutenbergMobileVersion = 'v1.121.0-alpha1' - wordPressAztecVersion = 'v2.1.3' wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' -// wordPressLoginVersion = '1.16.0' } measureBuilds { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6441534c551f..0e65aac22f72 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -81,6 +81,7 @@ violationComments = '1.70.0' volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' +wordPressAztec = 'v2.1.3' wordPressLint = '2.1.0' wordPressLogin = '1.16.0' wordPressPersistentEditText = '1.0.2' diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 46c847601bde..41250bb2c70d 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -66,17 +66,21 @@ dependencies { exclude group: "com.android.volley" exclude group: 'org.wordpress', module: 'utils' version { - strictly wordPressAztecVersion + strictly libs.versions.wordPressAztec.get() } } - api ("$gradle.ext.aztecAndroidWordPressShortcodesPath:$wordPressAztecVersion") { + // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml). + // noinspection UseTomlInstead + api ("$gradle.ext.aztecAndroidWordPressShortcodesPath:${libs.versions.wordPressAztec.get()}") { version { - strictly wordPressAztecVersion + strictly libs.versions.wordPressAztec.get() } } - api ("$gradle.ext.aztecAndroidWordPressCommentsPath:$wordPressAztecVersion") { + // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml). + // noinspection UseTomlInstead + api ("$gradle.ext.aztecAndroidWordPressCommentsPath:${libs.versions.wordPressAztec.get()}") { version { - strictly wordPressAztecVersion + strictly libs.versions.wordPressAztec.get() } } From 0f4bc76398c53375f178940b8814cb661376a482 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 21:53:35 +0530 Subject: [PATCH 110/117] Migrated `automatticTracks` to version catalog --- WordPress/build.gradle | 9 +++++---- build.gradle | 2 +- gradle/libs.versions.toml | 3 +++ libs/analytics/build.gradle | 2 +- libs/editor/build.gradle | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 540459b76493..1f3329d95d2c 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -389,10 +389,11 @@ dependencies { // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml). // noinspection UseTomlInstead implementation "$gradle.ext.aboutAutomatticBinaryPath:${libs.versions.automatticAbout.get()}" - - implementation("$gradle.ext.tracksBinaryPath:$automatticTracksVersion") { + // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml). + // noinspection UseTomlInstead + implementation("$gradle.ext.tracksBinaryPath:${libs.versions.automatticTracks.get()}") { version { - strictly automatticTracksVersion + strictly libs.versions.automatticTracks.get() } } @@ -579,7 +580,7 @@ dependencies { // Cascade - Compose nested menu implementation libs.cascade.compose - implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" + implementation libs.automattic.tracks.crashlogging // - Flipper debugImplementation (libs.facebook.flipper) { diff --git a/build.gradle b/build.gradle index a477b84ddd7a..5b75c152429e 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ ext { ext { // libs - automatticTracksVersion = '5.1.0' +// automatticTracksVersion = '5.1.0' gutenbergMobileVersion = 'v1.121.0-alpha1' wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0e65aac22f72..281103fd3311 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,6 +33,7 @@ assertj = '3.23.1' automatticAbout = '1.4.0' automatticMeasureBuilds = '3.1.0' automatticRest = '1.0.8' +automatticTracks = '5.1.0' cascadeCompose = '2.3.0' chrisbanesPhotoview = '2.3.0' coilCompose = '2.4.0' @@ -158,6 +159,8 @@ androidx-work-testing = { group = "androidx.work", name = "work-testing", versio apache-commons-text = { group = "org.apache.commons", name = "commons-text", version.ref ="apacheCommonsText" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref ="assertj" } automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } +automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automatticTracks" } +automattic-tracks-android = { group = "com.automattic", name = "Automattic-Tracks-Android", version.ref = "automatticTracks" } cascade-compose = { group = "me.saket.cascade", name = "cascade-compose", version.ref ="cascadeCompose" } chrisbanes-photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoview" } coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref ="coilCompose" } diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle index 2837e940650d..71cf7513d206 100644 --- a/libs/analytics/build.gradle +++ b/libs/analytics/build.gradle @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion" + implementation libs.automattic.tracks.android implementation libs.wordpress.utils implementation libs.androidx.preference diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 41250bb2c70d..5d207a4288e5 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -110,7 +110,7 @@ dependencies { implementation libs.google.material implementation libs.volley implementation libs.google.gson - implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion" + implementation libs.automattic.tracks.crashlogging lintChecks libs.wordpress.lint } From 285b5972aac8beff16c7877bc1cff0e13195d251 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 21:59:33 +0530 Subject: [PATCH 111/117] redundant comment --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5b75c152429e..991d273ae018 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,6 @@ ext { ext { // libs -// automatticTracksVersion = '5.1.0' gutenbergMobileVersion = 'v1.121.0-alpha1' wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' } From 33ffa3b790fe5e728c0346b461d598d4f8f50fc1 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 22:03:09 +0530 Subject: [PATCH 112/117] Migrated `wordPressFluxC` to Version Catalog --- WordPress/build.gradle | 6 ++++-- build.gradle | 1 - gradle/libs.versions.toml | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 1f3329d95d2c..b2278dd7f715 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -365,9 +365,11 @@ dependencies { implementation (project(path:':libs:editor')) { exclude group: 'org.wordpress', module: 'utils' } - implementation("$gradle.ext.fluxCBinaryPath:$wordPressFluxCVersion") { + // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml). + // noinspection UseTomlInstead + implementation("$gradle.ext.fluxCBinaryPath:${libs.versions.wordPressFluxC.get()}") { version { - strictly wordPressFluxCVersion + strictly libs.versions.wordPressFluxC.get() } exclude group: "com.android.volley" exclude group: 'org.wordpress', module: 'utils' diff --git a/build.gradle b/build.gradle index 991d273ae018..c6838eca381d 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,6 @@ ext { ext { // libs gutenbergMobileVersion = 'v1.121.0-alpha1' - wordPressFluxCVersion = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' } measureBuilds { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 281103fd3311..832d3967dd52 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -83,6 +83,7 @@ volley = '1.2.1' wiremock = '2.26.3' wiremockHttpClient = '4.3.5.1' wordPressAztec = 'v2.1.3' +wordPressFluxC = 'trunk-c670e916346bdaa2379936dd8dbb6750766ca319' wordPressLint = '2.1.0' wordPressLogin = '1.16.0' wordPressPersistentEditText = '1.0.2' @@ -159,8 +160,8 @@ androidx-work-testing = { group = "androidx.work", name = "work-testing", versio apache-commons-text = { group = "org.apache.commons", name = "commons-text", version.ref ="apacheCommonsText" } assertj-core = { group = "org.assertj", name = "assertj-core", version.ref ="assertj" } automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } -automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automatticTracks" } automattic-tracks-android = { group = "com.automattic", name = "Automattic-Tracks-Android", version.ref = "automatticTracks" } +automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automatticTracks" } cascade-compose = { group = "me.saket.cascade", name = "cascade-compose", version.ref ="cascadeCompose" } chrisbanes-photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoview" } coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref ="coilCompose" } From 504be5c7473799070e70c7c824bd36f17a9c7d2b Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Wed, 10 Jul 2024 22:21:55 +0530 Subject: [PATCH 113/117] fixed lint issue --- WordPress/build.gradle | 4 ++-- libs/image-editor/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index b2278dd7f715..ca29d11e2ae8 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -517,7 +517,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-v4' exclude module: 'recyclerview-v7' } - androidTestImplementation(libs.androidx.test.espresso.accessibility){ + androidTestImplementation(libs.androidx.test.espresso.accessibility) { version { strictly libs.versions.androidxTestEspresso.get() } @@ -589,7 +589,7 @@ dependencies { exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm' } debugImplementation libs.facebook.soLoader - debugImplementation (libs.facebook.flipper.network.plugin){ + debugImplementation (libs.facebook.flipper.network.plugin) { exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm' } releaseImplementation libs.facebook.flipper.noop diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index 68100291a0dd..53de7fc7d98a 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -79,7 +79,7 @@ dependencies { }) androidTestImplementation libs.androidx.test.ext.junit - androidTestImplementation(libs.androidx.test.espresso.core){ + androidTestImplementation(libs.androidx.test.espresso.core) { { version { strictly libs.versions.androidxTestEspresso.get() From f32a663e70da29d2655bc23e2fa3252c2543e4ac Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Thu, 11 Jul 2024 17:51:35 +0530 Subject: [PATCH 114/117] Renamed `desugar jdk` --- WordPress/build.gradle | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index ca29d11e2ae8..2b927b4e88ab 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -540,7 +540,7 @@ dependencies { androidTestImplementation libs.dagger.hilt.android.testing kspAndroidTest libs.dagger.hilt.android.compiler // Enables Java 8+ API desugaring support - coreLibraryDesugaring libs.desugar.jdk.libs + coreLibraryDesugaring libs.android.desugar.jdk.libs lintChecks libs.wordpress.lint // Firebase diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 832d3967dd52..65410a477165 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -93,6 +93,7 @@ zendesk = '5.1.2' [libraries] android-appUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayAppUpdate" } android-appUpdate-ktx = { group = "com.google.android.play", name = "app-update-ktx", version.ref = "googlePlayAppUpdate" } +android-desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref ="androidDesugar" } android-installReferrer = { group = "com.android.installreferrer", name = "installreferrer", version.ref ="androidInstallReferrer" } androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "androidxActivity" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" } @@ -172,7 +173,6 @@ dagger-hilt-android = { group = "com.google.dagger", name = "hilt-android", vers dagger-hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "dagger" } dagger-hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "dagger" } dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" } -desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref ="androidDesugar" } detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" } facebook-flipper = { group = "com.facebook.flipper", name = "flipper", version.ref ="flipper" } facebook-flipper-network-plugin = { group = "com.facebook.flipper", name = "flipper-network-plugin", version.ref ="flipper" } From f8a40fee6f110e158fb5f8088843f0f61565a263 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Thu, 11 Jul 2024 20:09:17 +0530 Subject: [PATCH 115/117] hacky conflict fix --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index c6838eca381d..0e448da84e43 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,7 @@ ext { measureBuilds { enable = findProperty('measureBuildsEnabled')?.toBoolean() ?: false + onBuildMetricsReadyListener { report -> SlowSlowTasksMetricsReporter.report(report) InternalA8cCiReporter.reportBlocking( report, @@ -37,6 +38,7 @@ measureBuilds { findProperty('appsMetricsToken') ) } + } attachGradleScanId = System.getenv('CI')?.toBoolean() ?: false } From 5fdab7acff284dd55e4c8a10e7aac1d3150f7c81 Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Thu, 11 Jul 2024 20:43:16 +0530 Subject: [PATCH 116/117] Redundant : extra } --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0e448da84e43..1c0379167c67 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,6 @@ measureBuilds { findProperty('appsMetricsToken') ) } - } attachGradleScanId = System.getenv('CI')?.toBoolean() ?: false } From 1cd22bc773afa284481644f67a034240e6cc615c Mon Sep 17 00:00:00 2001 From: Neel Doshi Date: Thu, 11 Jul 2024 20:58:43 +0530 Subject: [PATCH 117/117] Migrated `gutenbergMobile` to Version Catalog --- build.gradle | 5 ----- gradle/libs.versions.toml | 1 + libs/editor/build.gradle | 4 +++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 1c0379167c67..d092da2b6049 100644 --- a/build.gradle +++ b/build.gradle @@ -23,11 +23,6 @@ ext { targetSdkVersion = 34 } -ext { - // libs - gutenbergMobileVersion = 'v1.121.0-alpha1' -} - measureBuilds { enable = findProperty('measureBuildsEnabled')?.toBoolean() ?: false onBuildMetricsReadyListener { report -> diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 65410a477165..9d441a5b75f5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -60,6 +60,7 @@ googlePlayReview = '2.0.1' googlePlayServicesAuth = '20.4.1' googleServices = '4.3.15' gravatar = '1.0.0' +gutenbergMobile = 'v1.121.0-alpha1' indexosMediaForMobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jsoup = '1.16.2' junit = '4.13.2' diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 5d207a4288e5..cd91a719220b 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -89,7 +89,9 @@ dependencies { // This dependency will be substituted if the `local-builds.gradle` file contains // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file. - implementation ("$rootProject.gradle.ext.gutenbergMobileBinaryPath:$rootProject.ext.gutenbergMobileVersion") { + // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml). + // noinspection UseTomlInstead + implementation ("$rootProject.gradle.ext.gutenbergMobileBinaryPath:${libs.versions.gutenbergMobile.get()}") { // We exclude React Native modules from older and newer versions. // This is needed to avoid Duplicate class errors when building using local Gutenberg Mobile path. exclude module: 'hermes-engine'