Skip to content

Commit

Permalink
Align Gradle & Bazel dep versions.
Browse files Browse the repository at this point in the history
This removes unnecessary deps from Gradle builds, and updates Gradle dep
versions to match those used in Bazel (per versions.bzl and
maven_install.json).
  • Loading branch information
BenHenning committed Jul 23, 2024
1 parent 143f096 commit 3b0c282
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 35 deletions.
5 changes: 1 addition & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ dependencies {
"androidx.compose.ui:ui-tooling:$androidx_compose_ui_ui_tooling",
"androidx.constraintlayout:constraintlayout:$androidx_constraintlayout_constraintlayout",
"androidx.core:core-ktx:$androidx_core_core_ktx",
"androidx.legacy:legacy-support-v4:$androidx_legacy_legacy_support_v4",
"androidx.lifecycle:lifecycle-extensions:$androidx_lifecycle_lifecycle_extensions",
"androidx.lifecycle:lifecycle-runtime-ktx:$androidx_lifecycle_lifecycle_runtime_ktx",
"androidx.navigation:navigation-fragment:$androidx_navigation_navigation_fragment",
Expand All @@ -187,14 +186,13 @@ dependencies {
"com.google.firebase:firebase-appcheck:$com_google_firebase_firebase_appcheck",
"com.google.firebase:firebase-appcheck-debug:$com_google_firebase_firebase_appcheck_debug",
"com.google.firebase:firebase-appcheck-playintegrity:$com_google_firebase_firebase_appcheck_playintegrity",
"com.google.firebase:firebase-core:$com_google_firebase_firebase_core",
"com.google.firebase:firebase-crashlytics:$com_google_firebase_firebase_crashlytics",
"com.google.firebase:firebase-firestore-ktx:$com_google_firebase_firebase_firestore_ktx",
"com.google.firebase:firebase-auth-ktx:$com_google_firebase_firebase_auth_ktx",
"com.google.guava:guava:$com_google_guava_guava",
"com.google.protobuf:protobuf-javalite:$com_google_protobuf_protobuf_javalite",
"nl.dionsegijn:konfetti:$nl_dionsegijn_konfetti",
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$org_jetbrains_kotlin_kotlin_stdlib_jdk7",
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$org_jetbrains_kotlin_kotlin_stdlib_jdk8",
"org.jetbrains.kotlinx:kotlinx-coroutines-core:$org_jetbrains_kotlinx_kotlinx_coroutines_core",
"org.jetbrains.kotlinx:kotlinx-coroutines-android:$org_jetbrains_kotlinx_kotlinx_coroutines_android",
"org.mockito:mockito-core:$org_mockito_mockito_core",
Expand Down Expand Up @@ -237,7 +235,6 @@ dependencies {
"androidx.work:work-testing:$androidx_work_work_testing",
"com.google.truth.extensions:truth-liteproto-extension:$com_google_truth_extensions_truth_liteproto_extension",
"org.jetbrains.kotlinx:kotlinx-coroutines-test:$org_jetbrains_kotlinx_kotlinx_coroutines_test",
"org.mockito:mockito-android:$org_mockito_mockito_android",
"org.robolectric:annotations:$org_robolectric_annotations",
)
// Adding the testing module directly causes duplicates of the below groups so we need to
Expand Down
53 changes: 25 additions & 28 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ buildscript {
ext.compose_version = "1.1.1"

// Dependency versions.
ext.androidx_annotation_annotation = "1.1.0"
ext.androidx_appcompat_appcompat = "1.1.0"
ext.androidx_annotation_annotation = "1.2.0"
ext.androidx_appcompat_appcompat = "1.3.1"
ext.androidx_compose_foundation_foundation_layout = compose_version
ext.androidx_compose_foundation_foundation = compose_version
ext.androidx_compose_material_material = compose_version
Expand All @@ -19,29 +19,28 @@ buildscript {
ext.androidx_compose_ui_ui_test_junit4 = compose_version
ext.androidx_compose_ui_ui_tooling = compose_version
ext.androidx_compose_ui_ui = compose_version
ext.androidx_constraintlayout_constraintlayout = "1.1.3"
ext.androidx_core_core_ktx = "1.0.2"
ext.androidx_exifinterface_exifinterface = "1.0.0-rc01"
ext.androidx_fragment_fragment = "1.2.0_rc01"
ext.androidx_legacy_legacy_support_v4 = "1.0.0"
ext.androidx_lifecycle_lifecycle_extensions = "2.0.0"
ext.androidx_lifecycle_lifecycle_livedata_ktx = "2.2.0-alpha03"
ext.androidx_lifecycle_lifecycle_runtime_ktx = "2.2.0-alpha03"
ext.androidx_constraintlayout_constraintlayout = "2.0.1"
ext.androidx_core_core_ktx = "1.1.0"
ext.androidx_exifinterface_exifinterface = "1.0.0"
ext.androidx_fragment_fragment = "1.3.6"
ext.androidx_lifecycle_lifecycle_extensions = "2.2.0"
ext.androidx_lifecycle_lifecycle_livedata_ktx = "2.2.0"
ext.androidx_lifecycle_lifecycle_runtime_ktx = "2.3.1"
ext.androidx_multidex_multidex = "2.0.1"
ext.androidx_navigation_navigation_fragment_ktx = "2.0.0"
ext.androidx_navigation_navigation_fragment = "2.0.0"
ext.androidx_navigation_navigation_ui_ktx = "2.0.0"
ext.androidx_navigation_navigation_ui = "2.0.0"
ext.androidx_recyclerview_recyclerview = "1.0.0"
ext.androidx_recyclerview_recyclerview = "1.1.0"
ext.androidx_test_espresso_espresso_accessibility = "3.1.0"
ext.androidx_test_espresso_espresso_contrib = "3.1.0"
ext.androidx_test_espresso_espresso_core = "3.2.0"
ext.androidx_test_espresso_espresso_core = "3.3.0"
ext.androidx_test_espresso_espresso_intents = "3.1.0"
ext.androidx_test_ext_junit = "1.1.1"
ext.androidx_test_ext_junit = "1.1.2"
ext.androidx_test_ext_truth = "1.4.0"
ext.androidx_test_core = "1.2.0"
ext.androidx_test_core = "1.4.0"
ext.androidx_test_orchestrator = "1.2.0"
ext.androidx_test_runner = "1.2.0"
ext.androidx_test_runner = "1.3.0"
ext.androidx_work_work_runtime_ktx = "2.4.0"
ext.androidx_work_work_testing = "2.4.0"
ext.com_github_bumptech_glide_compiler = "4.11.0"
Expand All @@ -62,34 +61,32 @@ buildscript {
ext.com_google_firebase_firebase_appcheck_playintegrity = "16.0.0"
ext.com_google_firebase_firebase_appcheck = "16.0.0"
ext.com_google_firebase_firebase_auth_ktx = "19.3.1"
ext.com_google_firebase_firebase_core = "17.5.0"
ext.com_google_firebase_firebase_crashlytics = "17.0.0"
ext.com_google_firebase_firebase_crashlytics = "17.1.1"
ext.com_google_firebase_firebase_firestore_ktx = "24.2.1"
ext.com_google_guava_guava = "28.1_android"
ext.com_google_protobuf_protobuf_javalite = "3.17.3"
ext.com_google_guava_guava = "31.0.1-android"
ext.com_google_protobuf_protobuf_javalite = "3.19.2"
ext.com_google_truth_extensions_truth_liteproto_extension = "1.1.3"
ext.com_google_truth_truth = "1.1.3"
ext.com_squareup_moshi_moshi_kotlin_codegen = "1.13.0"
ext.com_squareup_moshi_moshi_kotlin = "1.13.0"
ext.com_squareup_okhttp3_mockwebserver = "4.7.2"
ext.com_squareup_okhttp3_okhttp = "4.7.2"
ext.com_squareup_retrofit2_converter_moshi = "2.7.2"
ext.com_squareup_retrofit2_retrofit_mock = "2.7.2"
ext.com_squareup_retrofit2_retrofit = "2.7.2"
ext.com_squareup_retrofit2_converter_moshi = "2.5.0"
ext.com_squareup_retrofit2_retrofit_mock = "2.5.0"
ext.com_squareup_retrofit2_retrofit = "2.9.0"
ext.jakarta_xml_bind_jakarta_xml_bind_api = "2.3.2"
ext.javax_annotation_javax_annotation_api = "1.3.2"
ext.junit_junit = "4.12"
ext.junit_junit = "4.13.2"
ext.nl_dionsegijn_konfetti = "1.2.5"
ext.org_glassfish_jaxb_jaxb_runtime = "2.3.2"
ext.org_jetbrains_kotlin_kotlin_reflect = kotlin_version
ext.org_jetbrains_kotlin_kotlin_stdlib_jdk7 = kotlin_version
ext.org_jetbrains_kotlin_kotlin_stdlib = kotlin_version
ext.org_jetbrains_kotlin_kotlin_test_junit = kotlin_version
ext.org_jetbrains_kotlin_kotlin_reflect = "1.6.0"
ext.org_jetbrains_kotlin_kotlin_stdlib_jdk8 = "1.6.21"
ext.org_jetbrains_kotlin_kotlin_stdlib = "1.6.21"
ext.org_jetbrains_kotlin_kotlin_test_junit = "1.3.72"
ext.org_jetbrains_kotlinx_kotlinx_coroutines_android = "1.6.4"
ext.org_jetbrains_kotlinx_kotlinx_coroutines_core = "1.6.4"
ext.org_jetbrains_kotlinx_kotlinx_coroutines_guava = "1.6.4"
ext.org_jetbrains_kotlinx_kotlinx_coroutines_test = "1.6.4"
ext.org_mockito_mockito_android = "2.7.22"
ext.org_mockito_mockito_core = "3.9.0"
ext.org_robolectric_annotations = "4.5"
ext.org_robolectric_robolectric = "4.5"
Expand Down
2 changes: 1 addition & 1 deletion domain/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ dependencies {
"com.google.firebase:firebase-auth-ktx:$com_google_firebase_firebase_auth_ktx",
"com.google.guava:guava:$com_google_guava_guava",
"com.google.protobuf:protobuf-javalite:$com_google_protobuf_protobuf_javalite",
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$org_jetbrains_kotlin_kotlin_stdlib_jdk7",
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$org_jetbrains_kotlin_kotlin_stdlib_jdk8",
"org.jetbrains.kotlinx:kotlinx-coroutines-guava:$org_jetbrains_kotlinx_kotlinx_coroutines_guava"
)
compileOnly(
Expand Down
3 changes: 1 addition & 2 deletions utility/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,11 @@ dependencies {
"com.github.bumptech.glide:glide:$com_github_bumptech_glide_glide",
"com.google.dagger:dagger:$com_google_dagger_dagger",
"com.google.firebase:firebase-analytics-ktx:$com_google_firebase_firebase_analytics_ktx",
"com.google.firebase:firebase-core:$com_google_firebase_firebase_core",
"com.google.firebase:firebase-crashlytics:$com_google_firebase_firebase_crashlytics",
"com.google.firebase:firebase-firestore-ktx:$com_google_firebase_firebase_firestore_ktx",
"com.google.firebase:firebase-auth-ktx:$com_google_firebase_firebase_auth_ktx",
"com.google.protobuf:protobuf-javalite:$com_google_protobuf_protobuf_javalite",
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$org_jetbrains_kotlin_kotlin_stdlib_jdk7",
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$org_jetbrains_kotlin_kotlin_stdlib_jdk8",
"org.jetbrains.kotlinx:kotlinx-coroutines-core:$org_jetbrains_kotlinx_kotlinx_coroutines_core",
)
compileOnly(
Expand Down

0 comments on commit 3b0c282

Please sign in to comment.