Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Deps] Migrate to Version Catalogs #12765

Merged
merged 88 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from 83 commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
b909a09
Deps: Migrate androidx lifecycle to version catalogs on all modules
ParaskP7 Sep 27, 2024
7438271
Deps: Migrate androidx test uiautomator to version catalogs on all mods
ParaskP7 Oct 2, 2024
ca33cef
Deps: Migrate junit to version catalogs on all modules
ParaskP7 Oct 2, 2024
b62244b
Deps: Migrate androidx test ext to version catalogs on all modules
ParaskP7 Oct 2, 2024
7719a7d
Deps: Migrate androidx test main to version catalogs on all modules
ParaskP7 Oct 2, 2024
831ff5c
Deps: Migrate stripe terminal to version catalogs on cardreader
ParaskP7 Oct 2, 2024
ca0acb4
Deps: Migrate kotlinx coroutines to version catalogs on all modules
ParaskP7 Oct 2, 2024
43ac3f6
Deps: Migrate mockito kotlin to version catalogs on all modules
ParaskP7 Oct 2, 2024
f65ee21
Deps: Migrate mockito inline to version catalogs on all modules
ParaskP7 Oct 2, 2024
2255b40
Deps: Migrate assertj to version catalogs on all modules
ParaskP7 Oct 2, 2024
03bd875
Deps: Migrate android billingclient to version catalogs on iap
ParaskP7 Oct 2, 2024
98b1d70
Deps: Migrate androidx appcompat to version catalogs on all modules
ParaskP7 Oct 2, 2024
4c7fcd5
Deps: Migrate wordpress libaddressinput to version catalogs on wc
ParaskP7 Oct 2, 2024
ffd3209
Deps: Migrate google firebase to version catalogs on woocommerce
ParaskP7 Oct 2, 2024
9838d5d
Deps: Migrate google play services to version catalogs on all modules
ParaskP7 Oct 2, 2024
9df67a7
Deps: Migrate google mlkit to version catalogs on woocommerce
ParaskP7 Oct 2, 2024
d967e75
Deps: Migrate androidx core to version catalogs on all modules
ParaskP7 Oct 2, 2024
e7c4935
Deps: Migrate androidx constraintlayout to version catalogs on wc
ParaskP7 Oct 3, 2024
62cbe38
Deps: Migrate androidx recyclerview to version catalogs on woocommerce
ParaskP7 Oct 3, 2024
27a9195
Deps: Migrate google material to version catalogs on woocommerce
ParaskP7 Oct 3, 2024
2ddfadc
Deps: Migrate androidx transition to version catalogs on woocommerce
ParaskP7 Oct 3, 2024
2a8bd49
Deps: Migrate androidx cardview to version catalogs on woocommerce
ParaskP7 Oct 3, 2024
c77fff9
Deps: Migrate androidx browser to version catalogs on woocommerce
ParaskP7 Oct 3, 2024
42b9e11
Deps: Migrate androidx preference to version catalogs on all modules
ParaskP7 Oct 3, 2024
7f69b0c
Deps: Migrate androidx datastore to version catalogs on all modules
ParaskP7 Oct 3, 2024
2cb87df
Deps: Migrate androidx work to version catalogs on all modules
ParaskP7 Oct 3, 2024
7a2bf6e
Deps: Migrate wordpress utils to version catalogs on all modules
ParaskP7 Oct 3, 2024
c323595
Deps: Migrate automattic tracks to version catalogs on all modules
ParaskP7 Oct 3, 2024
fd72fd6
Deps: Migrate wordpress fluxc to version catalogs on all modules
ParaskP7 Oct 4, 2024
be402c0
Deps: Migrate wordpress login to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
8034f12
Deps: Migrate wordpress aztec to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
3270c2a
Deps: Migrate gravatar to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
043f001
Deps: Migrate facebook shimmer to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
cc32b51
Deps: Migrate photoview to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
794dc7d
Deps: Migrate automattic about to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
e810a1f
Deps: Migrate androidx hilt to version catalogs on all modules
ParaskP7 Oct 4, 2024
a0eb362
Deps: Migrate mpandroidchart to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
8893f9a
Deps: Migrate bumptech glide to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
74c7aa9
Deps: Migrate google play to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
627041c
Deps: Migrate google zxing to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
9a6e462
Deps: Migrate facebook flipper to version catalogs on all modules
ParaskP7 Oct 4, 2024
24964f4
Deps: Migrate facebook soloader to version catalogs on all modules
ParaskP7 Oct 4, 2024
f3479a3
Deps: Migrate squareup leakcanary to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
7fe947b
Deps: Migrate androidx arch core to version catalogs on all modules
ParaskP7 Oct 4, 2024
50cfbca
Deps: Migrate androidx test espresso to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
c9951d3
Deps: Migrate fastlane screengrab to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
3b4cff7
Deps: Migrate wiremock to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
bf0a576
Deps: Migrate jetty webapp to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
dd02fae
Deps: Migrate jackson databind to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
2d4f674
Deps: Migrate json path to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
1334fec
Deps: Migrate commons fileupload to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
be21407
Deps: Migrate apache http client android to version catalogs on wc
ParaskP7 Oct 4, 2024
9631da3
Deps: Migrate zendesk to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
5be0d0f
Deps: Migrate androidx fragment to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
13af208
Deps: Migrate androidx activity to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
a9cb94b
Deps: Migrate cashapp turbine to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
ed5addc
Deps: Migrate apache commons text to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
a4807cb
Deps: Migrate commons io to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
cc73979
Deps: Migrate tinder statemachine to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
8da5ec1
Deps: Migrate wordpress mediapicker to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
02b3d26
Cleanup: Remove local woocommerce shared path leftover
ParaskP7 Oct 4, 2024
9e129c0
Deps: Migrate androidx compose to version catalogs on all modules
ParaskP7 Oct 4, 2024
0ee51cc
Deps: Migrate coil to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
bb3a1f6
Deps: Migrate android desugar to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
fff1ef8
Deps: Migrate androidx camera to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
033983c
Deps: Migrate google guava to version catalogs on woocommerce
ParaskP7 Oct 4, 2024
cb1d91e
Deps: Migrate android security lint to version catalogs on all modules
ParaskP7 Oct 4, 2024
c276911
Deps: Migrate androidx wear to version catalogs on woocommerce wear
ParaskP7 Oct 4, 2024
4b31eef
Deps: Migrate google horologist to version catalogs on woocommerce wear
ParaskP7 Oct 4, 2024
eff7cde
Deps: Migrate google gson to version catalogs on woocommerce wear
ParaskP7 Oct 4, 2024
3080940
Cleanup: Remove unused dependency versions from root build gradle file
ParaskP7 Oct 4, 2024
03fee75
Deps: Migrate agp plugin to version catalogs
ParaskP7 Oct 4, 2024
64d3464
Deps: Migrate google services plugin to version catalogs
ParaskP7 Oct 4, 2024
62b500c
Deps: Migrate google dagger plugin to version catalogs
ParaskP7 Oct 4, 2024
64ebe6e
Deps: Migrate detekt plugin to version catalogs
ParaskP7 Oct 4, 2024
73e832f
Deps: Migrate kotlin plugin to version catalogs
ParaskP7 Oct 4, 2024
b89ee50
Deps: Migrate ksp plugin to version catalogs
ParaskP7 Oct 4, 2024
48db59b
Deps: Migrate automattic measure builds plugin to version catalogs
ParaskP7 Oct 4, 2024
5f790e8
Deps: Migrate androidx navigation plugin to version catalogs
ParaskP7 Oct 4, 2024
90579d4
Deps: Migrate sentry plugin to version catalogs
ParaskP7 Oct 4, 2024
715e0cb
Deps: Migrate google protobuf plugin to version catalogs
ParaskP7 Oct 4, 2024
845f909
Deps: Migrate dependency analysis plugin to version catalogs
ParaskP7 Oct 4, 2024
13a9d59
Deps: Migrate fladle plugin to version catalogs
ParaskP7 Oct 4, 2024
002f3cc
Merge branch 'trunk' of github.com:woocommerce/woocommerce-android in…
ParaskP7 Oct 14, 2024
4fd66b2
Deps: Update fluxc to 2.99.0
ParaskP7 Oct 14, 2024
c11e208
Deps: Add an explicit version to androidx wear tiles dependencies
ParaskP7 Oct 14, 2024
970ec5a
Refactor: Revert to previous simpler syntax of alias plugin apply false
ParaskP7 Oct 14, 2024
fe7308d
Merge branch 'trunk' of github.com:woocommerce/woocommerce-android in…
ParaskP7 Oct 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 65 additions & 65 deletions WooCommerce-Wear/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import io.sentry.android.gradle.extensions.InstrumentationFeature

plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.parcelize'
id 'com.google.dagger.hilt.android'
id 'com.google.devtools.ksp'
id 'io.sentry.android.gradle'
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.parcelize)
alias(libs.plugins.google.dagger.hilt)
alias(libs.plugins.ksp)
alias(libs.plugins.sentry)
}

repositories {
Expand Down Expand Up @@ -88,7 +88,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion composeCompilerVersion
kotlinCompilerExtensionVersion libs.versions.androidx.compose.compiler.get()
}
packaging {
resources {
Expand Down Expand Up @@ -127,95 +127,95 @@ android {
dependencies {
// Project
implementation project(":libs:commons")
implementation("${gradle.ext.fluxCBinaryPath}:$fluxCVersion") {
implementation("${gradle.ext.fluxCBinaryPath}:${libs.versions.wordpress.fluxc.get()}") {
exclude group: "com.android.support"
exclude group: "org.wordpress", module: "utils"
}
implementation("${gradle.ext.fluxCWooCommercePluginBinaryPath}:$fluxCVersion") {
implementation("${gradle.ext.fluxCWooCommercePluginBinaryPath}:${libs.versions.wordpress.fluxc.get()}") {
exclude group: "com.android.support"
exclude group: "org.wordpress", module: "utils"
}
implementation("org.wordpress:utils:$wordPressUtilsVersion") {
implementation(libs.wordpress.utils) {
exclude group: "com.mcxiaoke.volley"
exclude group: "com.android.support"
}
implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion"
implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion"
implementation(libs.automattic.tracks.android)
implementation(libs.automattic.tracks.crashlogging)

// WearOS
implementation "com.google.android.gms:play-services-wearable:$googlePlayWearableVersion"
implementation 'androidx.wear.tiles:tiles'
implementation 'androidx.wear.tiles:tiles-material'
implementation "com.google.android.horologist:horologist-compose-tools:$wearHorologistVersion"
implementation "com.google.android.horologist:horologist-tiles:$wearHorologistVersion"
implementation "com.google.android.horologist:horologist-compose-layout:$wearHorologistVersion"
implementation 'androidx.wear.watchface:watchface-complications-data-source-ktx:1.2.1'
implementation "androidx.wear.compose:compose-material:$wearComposeVersion"
implementation "androidx.wear.compose:compose-foundation:$wearComposeVersion"
implementation 'androidx.wear:wear-tooling-preview:1.0.0'
implementation(libs.google.play.services.wearable)
implementation(libs.androidx.wear.tiles.main)
implementation(libs.androidx.wear.tiles.material)
implementation(libs.google.horologist.compose.tools)
implementation(libs.google.horologist.tiles)
implementation(libs.google.horologist.compose.layout)
implementation(libs.androidx.wear.watchface.complications.data.source.ktx)
implementation(libs.androidx.wear.compose.material)
implementation(libs.androidx.wear.compose.foundation)
implementation(libs.androidx.wear.tooling.preview)

// Compose
implementation platform("androidx.compose:compose-bom:$composeBOMVersion")
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.ui:ui-tooling-preview'
implementation 'androidx.compose.material:material'
implementation 'androidx.compose.animation:animation'
implementation 'androidx.compose.ui:ui-tooling'
implementation 'androidx.compose.runtime:runtime-livedata'
implementation "androidx.compose.material:material-icons-extended"
implementation 'androidx.compose.ui:ui-text-google-fonts'
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.ui.main)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.material.main)
implementation(libs.androidx.compose.animation.main)
implementation(libs.androidx.compose.ui.tooling.main)
implementation(libs.androidx.compose.runtime.livedata)
implementation(libs.androidx.compose.material.icons.extended)
implementation(libs.androidx.compose.ui.text.google.fonts)

// Android Support
implementation "androidx.work:work-runtime-ktx:$workManagerVersion"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
implementation 'androidx.core:core-splashscreen:1.0.1'
implementation "androidx.navigation:navigation-compose:2.7.7"
implementation 'androidx.activity:activity-compose'
implementation "androidx.preference:preference-ktx:1.2.1"
implementation "androidx.datastore:datastore-preferences:1.1.0"
implementation "androidx.datastore:datastore:1.1.0"
implementation 'com.google.code.gson:gson:2.10.1'
implementation(libs.androidx.work.runtime.ktx)
implementation(libs.androidx.lifecycle.viewmodel.savedstate)
implementation(libs.androidx.lifecycle.livedata.ktx)
implementation(libs.androidx.core.splashscreen)
implementation(libs.androidx.navigation.compose)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.preference.ktx)
implementation(libs.androidx.datastore.preferences)
implementation(libs.androidx.datastore.main)
implementation(libs.google.gson)

// Coroutines
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion"
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.kotlinx.coroutines.play.services)
testImplementation(libs.kotlinx.coroutines.test)

// Dagger & Hilt
implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion"
implementation "androidx.hilt:hilt-navigation-fragment:$hiltJetpackVersion"
implementation "androidx.hilt:hilt-common:$hiltJetpackVersion"
implementation "androidx.hilt:hilt-work:$hiltJetpackVersion"
implementation "androidx.hilt:hilt-navigation-compose:1.2.0"
ksp "androidx.hilt:hilt-compiler:$hiltJetpackVersion"
ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"
implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion"
ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion"
implementation(libs.google.dagger.hilt.android.main)
implementation(libs.androidx.hilt.navigation.fragment)
implementation(libs.androidx.hilt.common)
implementation(libs.androidx.hilt.work)
implementation(libs.androidx.hilt.navigation.compose)
ksp(libs.androidx.hilt.compiler)
ksp(libs.google.dagger.hilt.compiler)
implementation(libs.google.dagger.android.support)
ksp(libs.google.dagger.android.processor)

// Testing
testImplementation "junit:junit:$jUnitVersion"
testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
testImplementation "org.mockito:mockito-inline:$mockitoVersion"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$gradle.ext.kotlinVersion"
testImplementation "org.assertj:assertj-core:$assertjVersion"
testImplementation("androidx.arch.core:core-testing:2.1.0", {
testImplementation(libs.junit)
testImplementation(libs.mockito.kotlin)
testImplementation(libs.mockito.inline)
testImplementation(libs.kotlin.test.junit)
testImplementation(libs.assertj.core)
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'
})
}

// Debug dependencies
debugImplementation "com.facebook.flipper:flipper:$flipperVersion"
debugImplementation "com.facebook.soloader:soloader:0.10.4"
debugImplementation("com.facebook.flipper:flipper-network-plugin:$flipperVersion") {
debugImplementation(libs.facebook.flipper.main)
debugImplementation(libs.facebook.soloader)
debugImplementation(libs.facebook.flipper.network.plugin) {
// Force Flipper to use the okhttp version defined in the fluxc module
// okhttp versions higher than 3.9.0 break handling for self-signed SSL sites
// See https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/919
exclude group: 'com.squareup.okhttp3'
}
lintChecks "com.android.security.lint:lint:$securityLintVersion"
lintChecks(libs.android.security.lint)
}

def checkGradlePropertiesFile() {
Expand Down
Loading
Loading