From 10be1aa88a743f90a63d62860d953088e4242d6f Mon Sep 17 00:00:00 2001 From: Sam Judd Date: Sat, 1 Jul 2023 11:55:08 -0700 Subject: [PATCH 1/3] WIP on version catalogs --- annotation/compiler/build.gradle | 8 +- annotation/compiler/test/build.gradle | 12 +-- annotation/ksp/build.gradle | 8 +- annotation/ksp/integrationtest/build.gradle | 8 +- annotation/ksp/test/build.gradle | 8 +- benchmark/build.gradle | 10 +-- build.gradle | 18 ++--- gradle.properties | 17 ----- instrumentation/build.gradle | 24 +++--- integration/avif/build.gradle | 2 +- integration/compose/build.gradle | 24 +++--- integration/concurrent/build.gradle | 12 +-- integration/cronet/build.gradle | 12 +-- integration/gifencoder/build.gradle | 14 ++-- integration/ktx/build.gradle | 24 +++--- integration/okhttp/build.gradle | 2 +- integration/okhttp3/build.gradle | 4 +- integration/okhttp4/build.gradle | 4 +- integration/recyclerview/build.gradle | 4 +- integration/sqljournaldiskcache/build.gradle | 16 ++-- integration/volley/build.gradle | 20 ++--- library/build.gradle | 32 ++++---- library/test/build.gradle | 20 ++--- mocks/build.gradle | 6 +- samples/contacturi/build.gradle | 2 +- samples/flickr/build.gradle | 6 +- samples/gallery/build.gradle | 16 ++-- samples/giphy/build.gradle | 4 +- samples/imgur/build.gradle | 8 +- samples/svg/build.gradle | 2 +- settings.gradle | 78 ++++++++++++++++++++ testutil/build.gradle | 6 +- third_party/disklrucache/build.gradle | 4 +- third_party/gif_decoder/build.gradle | 12 +-- 34 files changed, 254 insertions(+), 193 deletions(-) diff --git a/annotation/compiler/build.gradle b/annotation/compiler/build.gradle index 5d09e8e1aa..7329c93608 100644 --- a/annotation/compiler/build.gradle +++ b/annotation/compiler/build.gradle @@ -11,11 +11,11 @@ configurations { dependencies { jarjar "com.googlecode.jarjar:jarjar:1.3" - compileOnly "com.squareup:javapoet:${JAVAPOET_VERSION}" - compileOnly "com.google.auto.service:auto-service:${AUTO_SERVICE_VERSION}" - compileOnly "com.google.code.findbugs:jsr305:${JSR_305_VERSION}" + compileOnly libs.javapoet + compileOnly libs.autoservice + compileOnly libs.findbugs.jsr305 implementation project(':annotation') - annotationProcessor "com.google.auto.service:auto-service:${AUTO_SERVICE_VERSION}" + annotationProcessor libs.autoservice } javadoc { diff --git a/annotation/compiler/test/build.gradle b/annotation/compiler/test/build.gradle index 1c8294c6e5..8b52327a60 100644 --- a/annotation/compiler/test/build.gradle +++ b/annotation/compiler/test/build.gradle @@ -56,9 +56,9 @@ android { dependencies { testImplementation project(':glide') testImplementation project(':annotation:compiler') - testImplementation "junit:junit:${JUNIT_VERSION}" - testImplementation "com.squareup:javapoet:${JAVAPOET_VERSION}" - testImplementation "com.google.code.findbugs:jsr305:${JSR_305_VERSION}" + testImplementation libs.junit + testImplementation libs.javapoet + testImplementation libs.findbugs.jsr305 // Using 0.10 of compile-testing is required for Android Studio to function, but not for the // gradle build. Not yet clear why, but it looks like some kind of version conflict between // javapoet, guava and/or truth. @@ -68,13 +68,13 @@ dependencies { // confusing. exclude group: "com.google.auto.value", module: "auto-value" } - testImplementation "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}" - testImplementation "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}" + testImplementation libs.androidx.annotation + testImplementation libs.androidx.fragment // TODO: Find some way to include a similar dependency on java 9+ and re-enable these tests in gradle. // testImplementation files(Jvm.current().getJre().homeDir.getAbsolutePath()+'/lib/rt.jar') testAnnotationProcessor project(':annotation:compiler') - testAnnotationProcessor "com.google.auto.service:auto-service:${AUTO_SERVICE_VERSION}" + testAnnotationProcessor libs.autoservice } task regenerateTestResources { diff --git a/annotation/ksp/build.gradle b/annotation/ksp/build.gradle index b8a62747a8..febb5e62b4 100644 --- a/annotation/ksp/build.gradle +++ b/annotation/ksp/build.gradle @@ -4,11 +4,11 @@ plugins { } dependencies { - implementation("com.squareup:kotlinpoet:1.12.0") + implementation libs.kotlinpoet implementation project(":annotation") - implementation 'com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6' - ksp("dev.zacsweers.autoservice:auto-service-ksp:1.0.0") - implementation("com.google.auto.service:auto-service-annotations:1.0.1") + implementation libs.ksp + implementation libs.autoservice.annotations + ksp libs.ksp.autoservice } apply from: "${rootProject.projectDir}/scripts/upload.gradle" diff --git a/annotation/ksp/integrationtest/build.gradle b/annotation/ksp/integrationtest/build.gradle index 610e2716ac..23f3dc2925 100644 --- a/annotation/ksp/integrationtest/build.gradle +++ b/annotation/ksp/integrationtest/build.gradle @@ -25,14 +25,14 @@ android { } dependencies { - implementation "junit:junit:$JUNIT_VERSION" + implementation libs.junit testImplementation project(":annotation:ksp:test") testImplementation project(":annotation:ksp") testImplementation project(":annotation") testImplementation project(":glide") testImplementation project(":integration:okhttp3") - testImplementation "com.github.tschuchortdev:kotlin-compile-testing-ksp:${KOTLIN_COMPILE_TESTING_VERSION}" - testImplementation "com.google.truth:truth:${TRUTH_VERSION}" - testImplementation "org.jetbrains.kotlin:kotlin-test:${JETBRAINS_KOTLIN_TEST_VERSION}" + testImplementation libs.ksp.compiletesting + testImplementation libs.truth + testImplementation libs.kotlin.test testImplementation project(path: ':annotation:ksp:test') } \ No newline at end of file diff --git a/annotation/ksp/test/build.gradle b/annotation/ksp/test/build.gradle index 64f7287156..a6cbbbce32 100644 --- a/annotation/ksp/test/build.gradle +++ b/annotation/ksp/test/build.gradle @@ -14,12 +14,12 @@ android { } dependencies { - implementation "junit:junit:$JUNIT_VERSION" + implementation libs.junit implementation project(":annotation:ksp") - implementation "com.github.tschuchortdev:kotlin-compile-testing-ksp:${KOTLIN_COMPILE_TESTING_VERSION}" - implementation "com.google.truth:truth:${TRUTH_VERSION}" + implementation libs.ksp.compiletesting + implementation libs.truth testImplementation project(":annotation:ksp") testImplementation project(":annotation") testImplementation project(":glide") - testImplementation "org.jetbrains.kotlin:kotlin-test:${JETBRAINS_KOTLIN_TEST_VERSION}" + testImplementation libs.kotlin.test } \ No newline at end of file diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 0eedc157d2..e6a2698cc0 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -32,12 +32,12 @@ android { } dependencies { - androidTestImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}" - androidTestImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}" - androidTestImplementation "junit:junit:{$JUNIT_VERSION}" + androidTestImplementation libs.androidx.test.runner + androidTestImplementation libs.androidx.junit + androidTestImplementation libs.junit androidTestImplementation project(':library') androidTestImplementation project(':testutil') - androidTestImplementation "androidx.benchmark:benchmark-junit4:${ANDROID_X_BENCHMARK_VERSION}" - androidTestImplementation "com.google.guava:guava:${GUAVA_VERSION}" + androidTestImplementation libs.androidx.benchmark.junit + androidTestImplementation libs.guava } \ No newline at end of file diff --git a/build.gradle b/build.gradle index b80b4b3768..380a6860b3 100644 --- a/build.gradle +++ b/build.gradle @@ -9,17 +9,17 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:$ANDROID_GRADLE_VERSION" + classpath libs.android.gradle if (!hasProperty('DISABLE_ERROR_PRONE')) { - classpath "net.ltgt.gradle:gradle-errorprone-plugin:$ERROR_PRONE_PLUGIN_VERSION" + classpath libs.errorprone.gradle } - classpath 'com.guardsquare:proguard-gradle:7.1.0' - classpath "se.bjurr.violations:violations-gradle-plugin:$VIOLATIONS_PLUGIN_VERSION" - classpath "androidx.benchmark:benchmark-gradle-plugin:$ANDROID_X_BENCHMARK_VERSION" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$JETBRAINS_KOTLIN_VERSION" - classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$KSP_GRADLE_PLUGIN_VERSION" - classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$JETBRAINS_KOTLINX_BINARY_COMPATIBILITY_VALIDATOR_VERSION" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:$JETBRAINS_DOKKA_VERSION" + classpath libs.proguard.gradle + classpath libs.violations + classpath libs.androidx.benchmark.gradle + classpath libs.kotlin.gradle + classpath libs.ksp.gradle + classpath libs.kotlinx.binarycompat.gradle + classpath libs.dokka.gradle } } diff --git a/gradle.properties b/gradle.properties index 7915f6fc9c..5e564f523c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -57,9 +57,6 @@ ANDROID_X_ANNOTATION_VERSION=1.3.0 ANDROID_X_APPCOMPAT_VERSION=1.3.1 ANDROID_X_BENCHMARK_VERSION=1.1.0 ANDROID_X_CARDVIEW_VERSION=1.0.0 -ANDROID_X_COMPOSE_VERSION=1.3.2 -ANDROID_X_COMPOSE_FOUNDATION_VERSION=1.3.1 -ANDROID_X_COMPOSE_MATERIAL_VERSION=1.3.1 ANDROID_X_CONCURRENT_FUTURES_VERSION=1.1.0 ANDROID_X_CORE_VERSION=1.6.0 ANDROID_X_EXIF_INTERFACE_VERSION=1.3.3 @@ -68,24 +65,13 @@ ANDROID_X_EXIF_INTERFACE_VERSION=1.3.3 ANDROID_X_FRAGMENT_VERSION=1.3.6 ANDROID_X_RECYCLERVIEW_VERSION=1.2.1 ANDROID_X_TEST_CORE_VERSION=1.4.0 -ANDROID_X_TEST_ESPRESSO_VERSION=3.4.0 -ANDROID_X_TEST_JUNIT_VERSION=1.1.3 ANDROID_X_TEST_RULES_VERSION=1.4.0 -ANDROID_X_TEST_RUNNER_VERSION=1.4.0 -ANDROID_X_TEST_CORE_KTX_VERSION=1.4.0 -ANDROID_X_TEST_JUNIT_KTX_VERSION=1.1.3 ANDROID_X_TRACING_VERSION=1.0.0 ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION=1.1.0 -ANDROID_X_CORE_KTX_VERSION=1.8.0 -ANDROID_X_LIFECYCLE_KTX_VERSION=2.4.1 ANDROID_SUPPORT_MULTIDEX_VERSION=1.0.3 # org.jetbrains versions -JETBRAINS_KOTLINX_COROUTINES_VERSION=1.6.4 -JETBRAINS_KOTLINX_COROUTINES_TEST_VERSION=1.6.4 -JETBRAINS_KOTLIN_VERSION=1.7.0 -JETBRAINS_KOTLIN_TEST_VERSION=1.7.0 JETBRAINS_KOTLINX_BINARY_COMPATIBILITY_VALIDATOR_VERSION=0.11.0 JETBRAINS_DOKKA_VERSION=1.7.10 @@ -101,7 +87,6 @@ GUAVA_TESTLIB_VERSION=18.0 GUAVA_VERSION=28.1-android JAVAPOET_VERSION=1.9.0 JSR_305_VERSION=3.0.2 -JUNIT_VERSION=4.13.2 KSP_GRADLE_PLUGIN_VERSION=1.7.0-1.0.6 MOCKITO_ANDROID_VERSION=5.3.1 MOCKITO_VERSION=5.3.1 @@ -109,7 +94,5 @@ MOCKWEBSERVER_VERSION=3.0.0-RC1 OK_HTTP_VERSION=3.10.0 OK_HTTP_4_VERSION=4.10.0 PMD_VERSION=6.0.0 -ROBOLECTRIC_VERSION=4.8.1 -TRUTH_VERSION=1.1.3 VIOLATIONS_PLUGIN_VERSION=1.8 VOLLEY_VERSION=1.2.0 diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle index b3fdc67172..c290c6bc13 100644 --- a/instrumentation/build.gradle +++ b/instrumentation/build.gradle @@ -8,25 +8,25 @@ apply plugin: 'com.android.application' dependencies { annotationProcessor project(":annotation:compiler") implementation project(":library") - implementation "com.android.support:multidex:$ANDROID_SUPPORT_MULTIDEX_VERSION" - implementation "androidx.appcompat:appcompat:$ANDROID_X_APPCOMPAT_VERSION" + implementation libs.android.support.multidex + implementation libs.androidx.appcompat androidTestImplementation project(':library') androidTestImplementation project(':mocks') androidTestImplementation project(':testutil') - androidTestImplementation "org.mockito:mockito-android:$MOCKITO_ANDROID_VERSION" - androidTestImplementation "androidx.test.ext:junit:$ANDROID_X_TEST_JUNIT_VERSION" - androidTestImplementation "androidx.test:rules:$ANDROID_X_TEST_RULES_VERSION" - androidTestImplementation "androidx.test:core:$ANDROID_X_TEST_CORE_VERSION" - androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:$ANDROID_X_TEST_ESPRESSO_VERSION" - androidTestImplementation "androidx.test.espresso:espresso-core:$ANDROID_X_TEST_ESPRESSO_VERSION" - androidTestImplementation "com.google.truth:truth:$TRUTH_VERSION" - androidTestImplementation "junit:junit:$JUNIT_VERSION" - androidTestImplementation "androidx.exifinterface:exifinterface:$ANDROID_X_EXIF_INTERFACE_VERSION" + androidTestImplementation libs.mockito.android + androidTestImplementation libs.androidx.junit + androidTestImplementation libs.androidx.test.rules + androidTestImplementation libs.androidx.test.core + androidTestImplementation libs.androidx.espresso.idling + androidTestImplementation libs.androidx.espresso + androidTestImplementation libs.truth + androidTestImplementation libs.junit + androidTestImplementation libs.androidx.exifinterface // Not totally clear why this is required, but it seems to be missing when tests are run on // 4.1.2 and 4.2.0 emulators. - androidTestImplementation "com.google.code.findbugs:jsr305:$JSR_305_VERSION" + androidTestImplementation libs.findbugs.jsr305 } android { diff --git a/integration/avif/build.gradle b/integration/avif/build.gradle index 35c09a65bd..e9218666cb 100644 --- a/integration/avif/build.gradle +++ b/integration/avif/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.library' dependencies { implementation project(':library') implementation 'org.aomedia.avif.android:avif:0.11.1.3c786d2' - implementation "com.google.guava:guava:${GUAVA_VERSION}" + implementation libs.guava annotationProcessor project(':annotation:compiler') } diff --git a/integration/compose/build.gradle b/integration/compose/build.gradle index 89480bfd7f..8f32dd384e 100644 --- a/integration/compose/build.gradle +++ b/integration/compose/build.gradle @@ -50,19 +50,19 @@ dependencies { implementation(project(':integration:recyclerview')) { transitive = false } - implementation "androidx.compose.foundation:foundation:$ANDROID_X_COMPOSE_FOUNDATION_VERSION" - implementation "androidx.compose.ui:ui:$ANDROID_X_COMPOSE_VERSION" - implementation "com.google.accompanist:accompanist-drawablepainter:$ACCOMPANIEST_VERSION" - implementation "androidx.core:core-ktx:$ANDROID_X_CORE_KTX_VERSION" - debugImplementation "androidx.compose.ui:ui-test-manifest:$ANDROID_X_COMPOSE_VERSION" - androidTestImplementation "junit:junit:$JUNIT_VERSION" - androidTestImplementation "androidx.compose.ui:ui-test-junit4:$ANDROID_X_COMPOSE_VERSION" - androidTestImplementation "androidx.test.espresso:espresso-core:$ANDROID_X_TEST_ESPRESSO_VERSION" - androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:$ANDROID_X_TEST_ESPRESSO_VERSION" - androidTestImplementation "androidx.test.ext:junit:$ANDROID_X_TEST_JUNIT_VERSION" - androidTestImplementation "androidx.compose.material:material:$ANDROID_X_COMPOSE_MATERIAL_VERSION" + implementation libs.compose.foundation + implementation libs.compose.ui + implementation libs.drawablepainter + implementation libs.androidx.core.ktx + debugImplementation libs.compose.ui.testmanifest + androidTestImplementation libs.junit + androidTestImplementation libs.compose.ui.testjunit4 + androidTestImplementation libs.androidx.espresso + androidTestImplementation libs.androidx.espresso.idling + androidTestImplementation libs.androidx.junit + androidTestImplementation libs.compose.material + androidTestImplementation libs.truth androidTestImplementation project(':testutil') - androidTestImplementation "com.google.truth:truth:${TRUTH_VERSION}" } apply from: "${rootProject.projectDir}/scripts/upload.gradle" diff --git a/integration/concurrent/build.gradle b/integration/concurrent/build.gradle index fbcf2118ca..384e6c8499 100644 --- a/integration/concurrent/build.gradle +++ b/integration/concurrent/build.gradle @@ -2,15 +2,15 @@ apply plugin: 'com.android.library' dependencies { implementation project(':library') - implementation "com.google.guava:guava:${GUAVA_VERSION}" - implementation "androidx.concurrent:concurrent-futures:${ANDROID_X_CONCURRENT_FUTURES_VERSION}" + implementation libs.guava + implementation libs.androidx.futures testImplementation project(':mocks') testImplementation project(':testutil') - testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}" - testImplementation "com.google.truth:truth:${TRUTH_VERSION}" - testImplementation "junit:junit:${JUNIT_VERSION}" - testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" + testImplementation libs.androidx.test.core + testImplementation libs.truth + testImplementation libs.junit + testImplementation libs.robolectric } android { diff --git a/integration/cronet/build.gradle b/integration/cronet/build.gradle index 77431dd2f1..52a87352f7 100644 --- a/integration/cronet/build.gradle +++ b/integration/cronet/build.gradle @@ -3,16 +3,16 @@ apply plugin: 'com.android.library' dependencies { implementation project(':library') implementation 'com.google.android.gms:play-services-cronet:17.0.0' - implementation "com.google.guava:guava:${GUAVA_VERSION}" + implementation libs.guava implementation project(':annotation') annotationProcessor project(':annotation:compiler') - api "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}" + api libs.androidx.annotation - testImplementation "com.google.truth:truth:${TRUTH_VERSION}" - testImplementation "junit:junit:${JUNIT_VERSION}" - testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" - testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}" + testImplementation libs.truth + testImplementation libs.junit + testImplementation libs.robolectric + testImplementation libs.mockito } android { diff --git a/integration/gifencoder/build.gradle b/integration/gifencoder/build.gradle index ca9543beea..833d7c2804 100644 --- a/integration/gifencoder/build.gradle +++ b/integration/gifencoder/build.gradle @@ -4,13 +4,13 @@ dependencies { implementation project(':library') testImplementation project(":testutil") - testImplementation "com.google.truth:truth:${TRUTH_VERSION}" - testImplementation "junit:junit:${JUNIT_VERSION}" - testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}" - testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" - testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}" - testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}" - testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}" + testImplementation libs.truth + testImplementation libs.junit + testImplementation libs.mockito + testImplementation libs.robolectric + testImplementation libs.androidx.test.core + testImplementation libs.androidx.junit + testImplementation libs.androidx.test.runner } android { diff --git a/integration/ktx/build.gradle b/integration/ktx/build.gradle index aa0ee75015..6bb3ee9b97 100644 --- a/integration/ktx/build.gradle +++ b/integration/ktx/build.gradle @@ -40,18 +40,18 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { dependencies { api project(":library") - implementation "androidx.core:core-ktx:$ANDROID_X_CORE_KTX_VERSION" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$JETBRAINS_KOTLINX_COROUTINES_VERSION" - testImplementation "androidx.test:core-ktx:$ANDROID_X_TEST_CORE_KTX_VERSION" - testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$JETBRAINS_KOTLIN_VERSION" - testImplementation "androidx.test.ext:junit-ktx:$ANDROID_X_TEST_JUNIT_KTX_VERSION" - testImplementation "androidx.test.ext:junit:$ANDROID_X_TEST_JUNIT_VERSION" - testImplementation "org.robolectric:robolectric:$ROBOLECTRIC_VERSION" - testImplementation "androidx.test:runner:$ANDROID_X_TEST_RUNNER_VERSION" - testImplementation "junit:junit:$JUNIT_VERSION" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$JETBRAINS_KOTLINX_COROUTINES_TEST_VERSION" - testImplementation "com.google.truth:truth:$TRUTH_VERSION" - androidTestImplementation "androidx.test.ext:junit:$ANDROID_X_TEST_JUNIT_VERSION" + implementation libs.androidx.core.ktx + implementation libs.kotlinx.coroutines.core + testImplementation libs.androidx.test.ktx + testImplementation libs.kotlin.junit + testImplementation libs.androidx.test.ktx.junit + testImplementation libs.androidx.junit + testImplementation libs.robolectric + testImplementation libs.androidx.test.runner + testImplementation libs.junit + testImplementation libs.kotlinx.coroutines.test + testImplementation libs.truth + androidTestImplementation libs.androidx.junit } apply from: "${rootProject.projectDir}/scripts/upload.gradle" diff --git a/integration/okhttp/build.gradle b/integration/okhttp/build.gradle index 2ad9df11fa..bc71651c29 100644 --- a/integration/okhttp/build.gradle +++ b/integration/okhttp/build.gradle @@ -5,7 +5,7 @@ dependencies { annotationProcessor project(':annotation:compiler') api "com.squareup.okhttp:okhttp:2.7.5" - api "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}" + api libs.androidx.annotation } android { diff --git a/integration/okhttp3/build.gradle b/integration/okhttp3/build.gradle index 8d69f27b2b..00e5ab4902 100644 --- a/integration/okhttp3/build.gradle +++ b/integration/okhttp3/build.gradle @@ -4,8 +4,8 @@ dependencies { implementation project(':library') annotationProcessor project(':annotation:compiler') - api "com.squareup.okhttp3:okhttp:${OK_HTTP_VERSION}" - api "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}" + api "com.squareup.okhttp3:okhttp:3.10.0" + api libs.androidx.annotation } android { diff --git a/integration/okhttp4/build.gradle b/integration/okhttp4/build.gradle index 3ead9875b0..0987b9f72e 100644 --- a/integration/okhttp4/build.gradle +++ b/integration/okhttp4/build.gradle @@ -4,8 +4,8 @@ dependencies { implementation project(':library') annotationProcessor project(':annotation:compiler') - api "com.squareup.okhttp3:okhttp:${OK_HTTP_4_VERSION}" - api "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}" + api "com.squareup.okhttp3:okhttp:4.10.0" + api libs.androidx.annotation } android { diff --git a/integration/recyclerview/build.gradle b/integration/recyclerview/build.gradle index 3bb4ac4f25..c469281db7 100644 --- a/integration/recyclerview/build.gradle +++ b/integration/recyclerview/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'com.android.library' dependencies { implementation project(':library') - compileOnly "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}" - compileOnly "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}" + compileOnly libs.androidx.recyclerview + compileOnly libs.androidx.fragment } android { diff --git a/integration/sqljournaldiskcache/build.gradle b/integration/sqljournaldiskcache/build.gradle index 224f825dcf..c6d7850ccf 100644 --- a/integration/sqljournaldiskcache/build.gradle +++ b/integration/sqljournaldiskcache/build.gradle @@ -23,14 +23,14 @@ dependencies { implementation project(':library') implementation "com.google.errorprone:error_prone_annotations:$ERROR_PRONE_VERSION" - testImplementation "com.google.guava:guava-testlib:${GUAVA_TESTLIB_VERSION}" - testImplementation "com.google.truth:truth:${TRUTH_VERSION}" - testImplementation "junit:junit:${JUNIT_VERSION}" - testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}" - testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" - testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}" - testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}" - testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}" + testImplementation libs.guava.testlib + testImplementation libs.truth + testImplementation libs.junit + testImplementation libs.mockito + testImplementation libs.robolectric + testImplementation libs.androidx.test.core + testImplementation libs.androidx.junit + testImplementation libs.androidx.test.runner } apply from: "${rootProject.projectDir}/scripts/upload.gradle" diff --git a/integration/volley/build.gradle b/integration/volley/build.gradle index d0a9c3febb..82eeff93f9 100644 --- a/integration/volley/build.gradle +++ b/integration/volley/build.gradle @@ -2,19 +2,19 @@ apply plugin: 'com.android.library' dependencies { implementation project(':library') - api "com.android.volley:volley:${VOLLEY_VERSION}" - api "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}" + api libs.volley + api libs.androidx.annotation annotationProcessor project(':annotation:compiler') testImplementation project(":testutil") - testImplementation "com.google.truth:truth:${TRUTH_VERSION}" - testImplementation "junit:junit:${JUNIT_VERSION}" - testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}" - testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" - testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}" - testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}" - testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}" - testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}" + testImplementation libs.truth + testImplementation libs.junit + testImplementation libs.mockito + testImplementation libs.robolectric + testImplementation libs.mockwebserver + testImplementation libs.androidx.test.core + testImplementation libs.androidx.junit + testImplementation libs.androidx.test.runner } android { diff --git a/library/build.gradle b/library/build.gradle index b3625fcd89..918d6821d3 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -12,27 +12,27 @@ dependencies { api project(':third_party:gif_decoder') api project(':third_party:disklrucache') api project(':annotation') - api "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}" - api "androidx.vectordrawable:vectordrawable-animated:${ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION}" - api "androidx.exifinterface:exifinterface:${ANDROID_X_EXIF_INTERFACE_VERSION}" - api "androidx.tracing:tracing:${ANDROID_X_TRACING_VERSION}" - compileOnly "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}" + api libs.androidx.fragment + api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' + api libs.androidx.exifinterface + api libs.androidx.tracing + compileOnly libs.androidx.appcompat if (project.plugins.hasPlugin('net.ltgt.errorprone')) { - errorprone "com.google.errorprone:error_prone_core:${ERROR_PRONE_VERSION}" + errorprone libs.errorprone.core } - testImplementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}" + testImplementation libs.androidx.appcompat testImplementation project(':testutil') - testImplementation "com.google.guava:guava-testlib:${GUAVA_TESTLIB_VERSION}" - testImplementation "com.google.truth:truth:${TRUTH_VERSION}" - testImplementation "junit:junit:${JUNIT_VERSION}" - testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}" - testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" - testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}" - testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}" - testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}" - testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}" + testImplementation libs.guava.testlib + testImplementation libs.truth + testImplementation libs.junit + testImplementation libs.mockito + testImplementation libs.robolectric + testImplementation libs.mockwebserver + testImplementation libs.androidx.test.core + testImplementation libs.androidx.junit + testImplementation libs.androidx.test.runner } if (project.plugins.hasPlugin('net.ltgt.errorprone')) { diff --git a/library/test/build.gradle b/library/test/build.gradle index ec4ea82854..900ec18582 100644 --- a/library/test/build.gradle +++ b/library/test/build.gradle @@ -1,19 +1,19 @@ apply plugin: 'com.android.library' dependencies { - testImplementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}" + testImplementation libs.androidx.appcompat testImplementation project(':library') testImplementation project(':mocks') testImplementation project(':testutil') - testImplementation "com.google.guava:guava-testlib:${GUAVA_TESTLIB_VERSION}" - testImplementation "com.google.truth:truth:${TRUTH_VERSION}" - testImplementation "junit:junit:${JUNIT_VERSION}" - testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}" - testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" - testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}" - testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}" - testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}" - testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}" + testImplementation libs.guava.testlib + testImplementation libs.truth + testImplementation libs.junit + testImplementation libs.mockito + testImplementation libs.robolectric + testImplementation libs.mockwebserver + testImplementation libs.androidx.test.core + testImplementation libs.androidx.junit + testImplementation libs.androidx.test.runner } tasks.withType(JavaCompile) { diff --git a/mocks/build.gradle b/mocks/build.gradle index 329b5581f5..62bb9fc14b 100644 --- a/mocks/build.gradle +++ b/mocks/build.gradle @@ -2,9 +2,9 @@ apply plugin: 'com.android.library' dependencies { implementation project(':library') - implementation "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}" - implementation "com.google.guava:guava:${GUAVA_VERSION}" - implementation "org.mockito:mockito-core:${MOCKITO_VERSION}" + implementation libs.androidx.annotation + implementation libs.guava + implementation libs.mockito } android { diff --git a/samples/contacturi/build.gradle b/samples/contacturi/build.gradle index b76fb33b58..53b8920d46 100644 --- a/samples/contacturi/build.gradle +++ b/samples/contacturi/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' dependencies { implementation project(':library') - implementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}" + implementation libs.androidx.appcompat annotationProcessor project(':annotation:compiler') } diff --git a/samples/flickr/build.gradle b/samples/flickr/build.gradle index ad61f941d7..30331291d7 100644 --- a/samples/flickr/build.gradle +++ b/samples/flickr/build.gradle @@ -7,9 +7,9 @@ dependencies { } annotationProcessor project(':annotation:compiler') - implementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}" - implementation "com.android.volley:volley:${VOLLEY_VERSION}" - implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}" + implementation libs.androidx.appcompat + implementation libs.volley + implementation libs.androidx.recyclerview } android { diff --git a/samples/gallery/build.gradle b/samples/gallery/build.gradle index 875578ead9..5dad1a5536 100644 --- a/samples/gallery/build.gradle +++ b/samples/gallery/build.gradle @@ -10,14 +10,14 @@ dependencies { transitive = false } - implementation "androidx.recyclerview:recyclerview:$ANDROID_X_RECYCLERVIEW_VERSION" - implementation "androidx.fragment:fragment-ktx:$ANDROID_X_FRAGMENT_VERSION" - implementation "androidx.core:core-ktx:$ANDROID_X_CORE_KTX_VERSION" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$JETBRAINS_KOTLINX_COROUTINES_VERSION" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$JETBRAINS_KOTLINX_COROUTINES_VERSION" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$JETBRAINS_KOTLIN_VERSION" - implementation "androidx.compose.foundation:foundation:$ANDROID_X_COMPOSE_FOUNDATION_VERSION" - implementation "androidx.compose.ui:ui:$ANDROID_X_COMPOSE_VERSION" + implementation libs.androidx.recyclerview + implementation libs.androidx.fragment.ktx + implementation libs.androidx.core.ktx + implementation libs.kotlinx.coroutines.core + implementation libs.kotlinx.coroutines.android + implementation libs.kotlin.jdk7 + implementation libs.compose.foundation + implementation libs.compose.ui ksp project(':annotation:ksp') } diff --git a/samples/giphy/build.gradle b/samples/giphy/build.gradle index 0f6f3b3e14..f9191e204f 100644 --- a/samples/giphy/build.gradle +++ b/samples/giphy/build.gradle @@ -6,8 +6,8 @@ dependencies { transitive = false } implementation 'com.google.code.gson:gson:2.8.2' - implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}" - implementation "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}" + implementation libs.androidx.recyclerview + implementation libs.androidx.fragment annotationProcessor project(':annotation:compiler') } diff --git a/samples/imgur/build.gradle b/samples/imgur/build.gradle index 2f678528ef..7ca91495cc 100644 --- a/samples/imgur/build.gradle +++ b/samples/imgur/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation project(':library') annotationProcessor project(':annotation:compiler') - implementation "com.google.dagger:dagger:${DAGGER_VERSION}" + implementation dagger.dagger annotationProcessor "com.google.dagger:dagger-compiler:${DAGGER_VERSION}" implementation "com.google.dagger:dagger-android:${DAGGER_VERSION}" implementation ("com.google.dagger:dagger-android-support:${DAGGER_VERSION}") { @@ -44,13 +44,13 @@ dependencies { implementation 'io.reactivex:rxandroid:1.2.1' implementation 'io.reactivex:rxjava:1.3.4' - implementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}" + implementation libs.androidx.appcompat implementation "androidx.cardview:cardview:${ANDROID_X_CARDVIEW_VERSION}" - implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}" + implementation libs.androidx.recyclerview // Fixes a compilation warning related to dagger, see // https://github.com/google/guava/issues/2721. - compileOnly "com.google.errorprone:error_prone_annotations:${ERROR_PRONE_VERSION}" + compileOnly libs.errorprone.annotations } task run(type: Exec, dependsOn: 'installDebug') { diff --git a/samples/svg/build.gradle b/samples/svg/build.gradle index 0bf05d57c7..e1a26c5e1e 100644 --- a/samples/svg/build.gradle +++ b/samples/svg/build.gradle @@ -4,7 +4,7 @@ dependencies { implementation project(':library') annotationProcessor project(':annotation:compiler') implementation 'com.caverock:androidsvg:1.2.1' - implementation "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}" + implementation libs.androidx.fragment } android { diff --git a/settings.gradle b/settings.gradle index c4fe9a6083..478054299a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -39,3 +39,81 @@ include ':testutil' include ':mocks' rootProject.name = 'glide-parent' + +dependencyResolutionManagement { + versionCatalogs { + libs { + version('dagger', '2.15') + version('androidx.benchmark', '1.1.0') + version('androidx.espresso', '3.4.0') + version('androidx.fragment', '1.3.6') + version('compose', '1.3.2') + version('compose.foundation', '1.3.1') + version('errorprone', '2.18.0') + version('jetbrains.kotlin', '1.7.0') + version('kotlinx.coroutines', '1.6.4') + version('mockito', '5.3.1') + + library('autoservice', 'com.google.auto.service:auto-service:1.0-rc3') + library('autoservice.annotations', 'com.google.auto.service:auto-service-annotations:1.0.1') + library('android.gradle', 'com.android.tools.build:gradle:7.3.0') + library('proguard.gradle', 'com.guardsquare:proguard-gradle:7.1.0') + library('android.support.multidex', "com.android.support:multidex:1.0.3") + library('androidx.annotation', 'androidx.annotation:annotation:1.3.0') + library('androidx.appcompat', 'androidx.appcompat:appcompat:1.3.1') + library('androidx.benchmark.gradle', 'androidx.benchmark', 'benchmark-gradle-plugin').versionRef('androidx.benchmark') + library('androidx.benchmark.junit', 'androidx.benchmark', 'benchmark-junit4').versionRef('androidx.benchmark') + library('androidx.core.ktx', 'androidx.core:core-ktx:1.8.0') + library('androidx.espresso', 'androidx.test.espresso', 'espresso-core').versionRef('androidx.espresso') + library('androidx.espresso.idling', 'androidx.test.espresso.idling', 'idling-concurrent').versionRef('androidx.espresso') + library('androidx.exifinterface', 'androidx.exifinterface:exifinterface:1.3.3') + library('androidx.fragment', 'androidx.fragment', 'fragment').versionRef('androidx.fragment') + library('androidx.fragment.ktx', 'androidx.fragment-ktx', 'fragment').versionRef('androidx.fragment') + library('androidx.futures', 'androidx.concurrent:concurrent-futures:1.1.0') + library('androidx.junit', 'androidx.test.ext:junit:1.1.3') + library('androidx.recyclerview','androidx.recyclerview:recyclerview:1.2.1') + library('androidx.test.core', 'androidx.test:core:1.4.0') + library('androidx.test.ktx', 'androidx.test:core-ktx:1.4.0') + library('androidx.test.ktx.junit', 'androidx.test.ext:junit-ktx:1.1.3') + library('androidx.test.rules', 'androidx.test:rules:1.4.0') + library('androidx.test.runner', 'androidx.test:runner:1.4.0') + library('androidx.tracing', 'androidx.tracing:tracing:1.0.0') + library('compose.foundation', 'androidx.compose.foundation', 'foundation').versionRef('compose.foundation') + library('compose.material', 'androidx.compose.material:material:1.3.1') + library('compose.ui', 'androidx.compose.ui', 'ui').versionRef('compose') + library('compose.ui.testmanifest', 'androidx.compose.ui', 'ui-test-manifest').versionRef('compose') + library('compose.ui.testjunit4', 'androidx.compose.ui', 'ui-test-junit4').versionRef('compose') + library('dagger', 'com.google.dagger', 'dagger').versionRef('dagger') + library('dokka.gradle', 'org.jetbrains.dokka:dokka-gradle-plugin:1.7.10') + library('drawablepainter', 'com.google.accompanist:accompanist-drawablepainter:0.25.1') + library('errorprone.annotations', 'com.google.errorprone', 'error_prone_annotations').versionRef('errorprone') + library('errorprone.core', 'com.google.errorprone', 'error_prone_core').versionRef('errorprone') + library('errorprone.gradle', 'net.ltgt.gradle:gradle-errorprone-plugin:2.0.2') + library('findbugs.jsr305', 'com.google.code.findbugs:jsr305:3.0.2') + library('guava', 'com.google.guava:guava:28.1-android') + library('guava.testlib', 'com.google.guava:guava-testlib:18.0') + library('javapoet', 'com.squareup:javapoet:1.9.0') + library('junit', 'junit:junit:4.13.2') + library('kotlin.junit', 'org.jetbrains.kotlin', 'kotlin-test-junit').versionRef('jetbrains.kotlin') + library('kotlin.jdk7', 'org.jetbrains.kotlin', 'kotlin-stdlib-jdk7').versionRef('jetbrains.kotlin') + library('kotlin.gradle', 'org.jetbrains.kotlin', 'kotlin-gradle-plugin').versionRef('jetbrains.kotlin') + library('kotlin.test', 'org.jetbrains.kotlin:kotlin-test:1.7.0') + library('kotlinpoet', 'com.squareup:kotlinpoet:1.12.0') + library('kotlinx.binarycompat.gradle', 'org.jetbrains.kotlinx:binary-compatibility-validator:0.11.0') + library('kotlinx.coroutines.android', 'org.jetbrains.kotlinx', 'kotlinx-coroutines-android').versionRef('kotlinx.coroutines') + library('kotlinx.coroutines.core', 'org.jetbrains.kotlinx', 'kotlinx-coroutines-core').versionRef('kotlinx.coroutines') + library('kotlinx.coroutines.test', 'org.jetbrains.kotlinx', 'kotlinx-coroutines-test').versionRef('kotlinx.coroutines') + library('ksp', 'com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6') + library('ksp.autoservice', 'dev.zacsweers.autoservice:auto-service-ksp:1.0.0') + library('ksp.compiletesting', 'com.github.tschuchortdev:kotlin-compile-testing-ksp:1.4.9') + library('ksp.gradle', 'com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.7.0-1.0.6') + library('mockito', 'org.mockito', 'mockito-core').versionRef('mockito') + library('mockito-android', 'org.mockito', 'mockito-android').versionRef('mockito') + library('mockwebserver', 'com.squareup.okhttp3:mockwebserver:3.0.0-RC1') + library('robolectric', 'org.robolectric:robolectric:4.8.1') + library('truth', 'com.google.truth:truth:1.1.3') + library('violations', 'se.bjurr.violations:violations-gradle-plugin:1.8') + library('volley', 'com.android.volley:volley:1.2.0') + } + } +} diff --git a/testutil/build.gradle b/testutil/build.gradle index e570898dc1..568b4b1509 100644 --- a/testutil/build.gradle +++ b/testutil/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' dependencies { - implementation "com.google.truth:truth:${TRUTH_VERSION}" + implementation libs.truth implementation project(":library") - api "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}" + api libs.androidx.annotation api "androidx.core:core:${ANDROID_X_CORE_VERSION}" - api "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}" + api libs.androidx.test.core } android { diff --git a/third_party/disklrucache/build.gradle b/third_party/disklrucache/build.gradle index 923f99b3f9..624dc38bbb 100644 --- a/third_party/disklrucache/build.gradle +++ b/third_party/disklrucache/build.gradle @@ -6,8 +6,8 @@ checkstyle { } dependencies { - testImplementation "junit:junit:${JUNIT_VERSION}" - testImplementation "com.google.truth:truth:${TRUTH_VERSION}" + testImplementation libs.junit + testImplementation libs.truth } android { diff --git a/third_party/gif_decoder/build.gradle b/third_party/gif_decoder/build.gradle index fc783c776a..2232cb21a2 100644 --- a/third_party/gif_decoder/build.gradle +++ b/third_party/gif_decoder/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.library' dependencies { - implementation "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}" + implementation libs.androidx.annotation testImplementation project(':testutil') - testImplementation "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}" - testImplementation "com.google.truth:truth:${TRUTH_VERSION}" - testImplementation "junit:junit:${JUNIT_VERSION}" - testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}" - testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" + testImplementation libs.androidx.annotation + testImplementation libs.truth + testImplementation libs.junit + testImplementation libs.mockito + testImplementation libs.robolectric } android { From 26de72ba10d3cbe0e3ab1ff7f9de96b251bccf3b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Jul 2023 21:47:00 +0000 Subject: [PATCH 2/3] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000..39a2b6e9a5 --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ] +} From 1541f5cfa933a897233b59451fa9dff276e20240 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Jul 2023 22:06:18 +0000 Subject: [PATCH 3/3] Update androidx.benchmark to v1.1.1 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 478054299a..eec48a0bff 100644 --- a/settings.gradle +++ b/settings.gradle @@ -44,7 +44,7 @@ dependencyResolutionManagement { versionCatalogs { libs { version('dagger', '2.15') - version('androidx.benchmark', '1.1.0') + version('androidx.benchmark', '1.1.1') version('androidx.espresso', '3.4.0') version('androidx.fragment', '1.3.6') version('compose', '1.3.2')