Skip to content

Commit

Permalink
Migrated Dependency to Version Catlog
Browse files Browse the repository at this point in the history
  • Loading branch information
neeldoshii committed Jul 3, 2024
1 parent d0c2719 commit 549f679
Show file tree
Hide file tree
Showing 9 changed files with 384 additions and 227 deletions.
231 changes: 117 additions & 114 deletions WordPress/build.gradle

Large diffs are not rendered by default.

74 changes: 3 additions & 71 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,95 +22,27 @@ ext {
ext {
// libs
automatticAboutVersion = '1.4.0'
automatticRestVersion = '1.0.8'
automatticTracksVersion = '5.1.0'
gutenbergMobileVersion = 'v1.120.1'
wordPressAztecVersion = 'v2.1.3'
wordPressFluxCVersion = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178'
wordPressLoginVersion = '1.16.0'
wordPressPersistentEditTextVersion = '1.0.2'
wordPressUtilsVersion = '3.14.0'
indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'
gravatarVersion = '1.0.0'

// debug
flipperVersion = '0.245.0'
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'
Expand Down
220 changes: 220 additions & 0 deletions gradle/libs.versions.toml

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions libs/analytics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
25 changes: 12 additions & 13 deletions libs/editor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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"
Expand Down
42 changes: 23 additions & 19 deletions libs/image-editor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,40 +45,44 @@ 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'
exclude group: 'androidx.constraintlayout', module: 'constraintlayout'
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
Expand Down
4 changes: 2 additions & 2 deletions libs/mocks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions libs/networking/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions libs/processors/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

0 comments on commit 549f679

Please sign in to comment.