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.

Sign up for GitHub

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

Jump to bottom

Update androidx.benchmark to v1.1.1 #3

Closed
wants to merge 4 commits into from
Closed

Update androidx.benchmark to v1.1.1 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10be1aa
WIP on version catalogs
sjudd Jul 1, 2023
26de72b
Add renovate.json
renovate[bot] Jul 1, 2023
bae2490
Merge pull request #2 from sjudd/renovate/configure
sjudd Jul 1, 2023
1541f5c
Update androidx.benchmark to v1.1.1
renovate[bot] Jul 1, 2023
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
8 changes: 4 additions & 4 deletions annotation/compiler/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions annotation/compiler/test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions annotation/ksp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 4 additions & 4 deletions annotation/ksp/integrationtest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
8 changes: 4 additions & 4 deletions annotation/ksp/test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
10 changes: 5 additions & 5 deletions benchmark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
18 changes: 9 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
17 changes: 0 additions & 17 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -101,15 +87,12 @@ 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
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
24 changes: 12 additions & 12 deletions instrumentation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion integration/avif/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Expand Down
24 changes: 12 additions & 12 deletions integration/compose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
12 changes: 6 additions & 6 deletions integration/concurrent/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions integration/cronet/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions integration/gifencoder/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
24 changes: 12 additions & 12 deletions integration/ktx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion integration/okhttp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions integration/okhttp3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading
Loading