Skip to content

Commit

Permalink
Clean up prebuilt dependency declarations
Browse files Browse the repository at this point in the history
Use parenthesis and double quotes for prebuilt dependencies in
build.gradle

Test: ./gradlew bOS --dry-run
Change-Id: I5eca03350d4e18cbce98a04d71308569791491d4
  • Loading branch information
liutikas committed Dec 10, 2024
1 parent b75e414 commit ced7f81
Show file tree
Hide file tree
Showing 34 changed files with 78 additions and 81 deletions.
12 changes: 6 additions & 6 deletions appsearch/appsearch-debug-view/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ dependencies {
implementation project(":appsearch:appsearch")
implementation project(":appsearch:appsearch-local-storage")
implementation project(":appsearch:appsearch-platform-storage")
implementation('androidx.concurrent:concurrent-futures:1.0.0')
implementation('androidx.constraintlayout:constraintlayout:2.2.0-beta01')
implementation('androidx.core:core:1.5.0')
implementation('androidx.fragment:fragment:1.3.0')
implementation('androidx.legacy:legacy-support-v4:1.0.0')
implementation("androidx.concurrent:concurrent-futures:1.0.0")
implementation("androidx.constraintlayout:constraintlayout:2.2.0-beta01")
implementation("androidx.core:core:1.5.0")
implementation("androidx.fragment:fragment:1.3.0")
implementation("androidx.legacy:legacy-support-v4:1.0.0")
implementation("androidx.lifecycle:lifecycle-livedata:2.0.0")
implementation('com.google.android.material:material:1.0.0')
implementation("com.google.android.material:material:1.0.0")
implementation(libs.guavaAndroid)
}

Expand Down
10 changes: 5 additions & 5 deletions appsearch/appsearch-debug-view/samples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ android {
dependencies {
annotationProcessor project(":appsearch:appsearch-compiler")

api('androidx.annotation:annotation:1.1.0')
api("androidx.annotation:annotation:1.1.0")

implementation project(":appsearch:appsearch")
implementation project(":appsearch:appsearch-local-storage")
implementation project(":appsearch:appsearch-debug-view")
implementation('androidx.appcompat:appcompat:1.2.0')
implementation('androidx.concurrent:concurrent-futures:1.0.0')
implementation('com.google.android.material:material:1.0.0')
implementation('com.google.code.gson:gson:2.6.2')
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("androidx.concurrent:concurrent-futures:1.0.0")
implementation("com.google.android.material:material:1.0.0")
implementation("com.google.code.gson:gson:2.6.2")
implementation(libs.constraintLayout)
implementation(libs.guavaAndroid)
}
4 changes: 2 additions & 2 deletions appsearch/appsearch-platform-storage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ dependencies {

implementation(project(":appsearch:appsearch"))
implementation("androidx.collection:collection:1.4.2")
implementation('androidx.concurrent:concurrent-futures:1.0.0')
implementation('androidx.core:core:1.0.0')
implementation("androidx.concurrent:concurrent-futures:1.0.0")
implementation("androidx.core:core:1.0.0")

androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testRules)
Expand Down
2 changes: 1 addition & 1 deletion appsearch/appsearch-test-util/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

dependencies {
api(libs.jspecify)
api('androidx.annotation:annotation:1.1.0')
api("androidx.annotation:annotation:1.1.0")

implementation(project(":appsearch:appsearch"))
implementation(project(":appsearch:appsearch-local-storage"))
Expand Down
4 changes: 2 additions & 2 deletions appsearch/appsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ android {

dependencies {
api(libs.jspecify)
api('androidx.annotation:annotation:1.1.0')
api("androidx.annotation:annotation:1.1.0")
api(libs.guavaListenableFuture)
api(libs.autoServiceAnnotations)

implementation("androidx.collection:collection:1.4.2")
implementation('androidx.concurrent:concurrent-futures:1.0.0')
implementation("androidx.concurrent:concurrent-futures:1.0.0")
implementation("androidx.core:core:1.9.0")

annotationProcessor project(":appsearch:appsearch-compiler")
Expand Down
2 changes: 1 addition & 1 deletion appsearch/compiler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ androidx.configureAarAsJarForConfiguration("testImplementation")

dependencies {
api(libs.jspecify)
api('androidx.annotation:annotation:1.1.0')
api("androidx.annotation:annotation:1.1.0")
api(libs.jsr250)
implementation(libs.autoCommon)
implementation(libs.autoService)
Expand Down
2 changes: 1 addition & 1 deletion camera/camera-mlkit-vision/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
api(project(":camera:camera-core"))
api(project(":camera:camera-view"))
api("androidx.annotation:annotation:1.8.1")
api('com.google.mlkit:vision-interfaces:16.0.0') {
api("com.google.mlkit:vision-interfaces:16.0.0") {
version {
prefer '16.0.0'
}
Expand Down
2 changes: 1 addition & 1 deletion camera/integration-tests/viewtestapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies {
implementation(project(":camera:camera-effects"))
implementation(project(":camera:media3:media3-effect"))
implementation(libs.guavaAndroid)
implementation('com.google.mlkit:barcode-scanning:17.0.2')
implementation("com.google.mlkit:barcode-scanning:17.0.2")
implementation("androidx.exifinterface:exifinterface:1.3.2")
implementation(libs.mlkitBarcode)
// old version of common-java8 conflicts with newer version, because both have
Expand Down
6 changes: 3 additions & 3 deletions car/app/app-samples/navigation/common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ android {
dependencies {
implementation(project(":car:app:app"))

implementation 'androidx.core:core:1.7.0'
implementation("androidx.core:core:1.7.0")
implementation project(":annotation:annotation-experimental")
implementation 'androidx.lifecycle:lifecycle-livedata:2.3.1'
implementation 'androidx.activity:activity:1.2.3'
implementation("androidx.lifecycle:lifecycle-livedata:2.3.1")
implementation("androidx.activity:activity:1.2.3")
}

androidx {
Expand Down
2 changes: 1 addition & 1 deletion car/app/app-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {

implementation "androidx.lifecycle:lifecycle-runtime:2.2.0"
implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
implementation 'androidx.annotation:annotation:1.1.0'
implementation("androidx.annotation:annotation:1.1.0")
implementation(libs.robolectric)
implementation("androidx.annotation:annotation-experimental:1.4.1")
api(libs.kotlinStdlib)
Expand Down
4 changes: 2 additions & 2 deletions compose/integration-tests/macrobenchmark-target/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ android {
}

dependencies {
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.viewpager2:viewpager2:1.0.0")

implementation(libs.kotlinStdlib)
implementation(libs.material)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ android {
}

dependencies {
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation("androidx.recyclerview:recyclerview:1.2.1")

implementation(libs.kotlinStdlib)
implementation(project(":activity:activity-compose"))
Expand Down
8 changes: 4 additions & 4 deletions core/core-telecom/integration-tests/testapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ dependencies {
implementation("androidx.annotation:annotation:1.9.0")
implementation("androidx.core:core:1.9.0")
implementation(project(":core:core-telecom"))
implementation('androidx.appcompat:appcompat:1.6.1')
implementation('androidx.navigation:navigation-fragment-ktx:2.5.3')
implementation('androidx.navigation:navigation-ui-ktx:2.5.3')
implementation('androidx.recyclerview:recyclerview:1.2.1')
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.navigation:navigation-fragment-ktx:2.5.3")
implementation("androidx.navigation:navigation-ui-ktx:2.5.3")
implementation("androidx.recyclerview:recyclerview:1.2.1")
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testRunner)
}
Expand Down
2 changes: 1 addition & 1 deletion core/uwb/uwb-rxjava3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies {
androidTestImplementation(libs.testRules)
androidTestImplementation(libs.truth)
androidTestImplementation(libs.espressoCore)
androidTestImplementation('com.google.android.gms:play-services-base:18.0.1')
androidTestImplementation("com.google.android.gms:play-services-base:18.0.1")
androidTestImplementation('com.google.android.gms:play-services-nearby:19.2.0', {
exclude group: "androidx.core"
})
Expand Down
2 changes: 1 addition & 1 deletion core/uwb/uwb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies {
api("androidx.core:core-ktx:1.2.0")
api(libs.kotlinCoroutinesAndroid)
implementation(libs.guavaAndroid)
implementation('com.google.android.gms:play-services-base:18.0.1')
implementation("com.google.android.gms:play-services-base:18.0.1")
implementation(libs.kotlinCoroutinesPlayServices)
implementation('com.google.android.gms:play-services-nearby:19.2.0', {
exclude group: "androidx.core"
Expand Down
8 changes: 4 additions & 4 deletions datastore/datastore-compose-samples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ dependencies {

implementation(libs.protobufLite)
implementation(libs.kotlinStdlib)
implementation('androidx.core:core-ktx:1.7.0')
implementation('androidx.lifecycle:lifecycle-runtime-ktx:2.3.1')
implementation('androidx.activity:activity-compose:1.3.1')
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1")
implementation("androidx.activity:activity-compose:1.3.1")
implementation(project(":compose:ui:ui"))
implementation(project(":compose:ui:ui-tooling-preview"))
implementation(project(":compose:material:material"))
testImplementation('junit:junit:4.13.2')
testImplementation("junit:junit:4.13.2")
debugImplementation(project(":compose:ui:ui-tooling"))
debugImplementation(project(":compose:ui:ui-test-manifest"))

Expand Down
6 changes: 3 additions & 3 deletions glance/glance-appwidget/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies {
api("androidx.compose.ui:ui-unit:1.1.1")
api("androidx.collection:collection-ktx:1.4.3")

implementation('androidx.core:core-ktx:1.7.0')
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.datastore:datastore:1.0.0")
implementation("androidx.datastore:datastore-core:1.0.0")
implementation("androidx.datastore:datastore-preferences-core:1.0.0")
Expand All @@ -60,7 +60,7 @@ dependencies {
testImplementation(libs.testRunner)
testImplementation(libs.truth)
testImplementation(libs.kotlinReflect)
testImplementation('androidx.core:core-ktx:1.7.0')
testImplementation("androidx.core:core-ktx:1.7.0")
testImplementation("androidx.datastore:datastore-core:1.0.0")
testImplementation("androidx.datastore:datastore-preferences-core:1.0.0")
testImplementation("androidx.datastore:datastore-preferences:1.0.0")
Expand All @@ -69,7 +69,7 @@ dependencies {
androidTestImplementation(project(":glance:glance-material3"))
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
androidTestImplementation("androidx.room:room-runtime:2.4.3")
androidTestImplementation('androidx.core:core-ktx:1.7.0')
androidTestImplementation("androidx.core:core-ktx:1.7.0")
androidTestImplementation("androidx.work:work-testing:2.7.1")
androidTestImplementation(libs.espressoCore)
androidTestImplementation(libs.espressoIdlingResource)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ android.buildTypes { release {} }
androidComponents { beforeVariants(selector().all()) { enabled = buildType == 'release' } }

dependencies {
implementation 'androidx.compose.ui:ui-unit:1.2.1'
implementation("androidx.compose.ui:ui-unit:1.2.1")
implementation(project(":benchmark:benchmark-macro"))
implementation(project(":benchmark:benchmark-common"))
implementation(project(":benchmark:benchmark-macro-junit4"))
implementation('androidx.core:core-ktx:1.7.0')
implementation("androidx.core:core-ktx:1.7.0")
implementation(project(":glance:glance"))
implementation(project(":glance:glance-appwidget"))
implementation(project(":internal-testutils-macrobenchmark"))
Expand Down
2 changes: 1 addition & 1 deletion glance/glance-material/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
api("androidx.annotation:annotation:1.8.1")
api("androidx.compose.runtime:runtime:1.1.1")
api(project(":glance:glance"))
implementation 'androidx.compose.material:material:1.3.0'
implementation("androidx.compose.material:material:1.3.0")
}

android {
Expand Down
4 changes: 2 additions & 2 deletions glance/glance/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ dependencies {
testImplementation("androidx.work:work-testing:2.7.1")
testImplementation("com.google.android.material:material:1.6.0")

androidTestImplementation('androidx.test:monitor:1.5.0')
androidTestImplementation('androidx.core:core-ktx:1.7.0')
androidTestImplementation("androidx.test:monitor:1.5.0")
androidTestImplementation("androidx.core:core-ktx:1.7.0")
androidTestImplementation("androidx.room:room-runtime:2.4.3")
androidTestImplementation("androidx.work:work-testing:2.7.1")
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
Expand Down
13 changes: 5 additions & 8 deletions graphics/filters/filters/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,14 @@ plugins {
}

dependencies {
def media3Version = '1.0.0'

api(libs.kotlinStdlib)

// Add dependencies here
implementation("androidx.annotation:annotation:1.8.1")
implementation('androidx.media3:media3-effect:' + media3Version)
implementation('androidx.media3:media3-common:' + media3Version)
implementation('androidx.media3:media3-ui:' + media3Version)
implementation('androidx.media3:media3-exoplayer:' + media3Version)
implementation('androidx.media3:media3-transformer:' + media3Version)
implementation("androidx.media3:media3-effect:1.0.0")
implementation("androidx.media3:media3-common:1.0.0")
implementation("androidx.media3:media3-ui:1.0.0")
implementation("androidx.media3:media3-exoplayer:1.0.0")
implementation("androidx.media3:media3-transformer:1.0.0")

// Force upgrade since 1.2.0 is not compatible with latest lint.
implementation("androidx.annotation:annotation-experimental:1.4.1")
Expand Down
2 changes: 1 addition & 1 deletion graphics/graphics-path/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ plugins {
dependencies {
api(libs.kotlinStdlib)

implementation('androidx.core:core:1.12.0')
implementation("androidx.core:core:1.12.0")

androidTestImplementation("androidx.annotation:annotation:1.8.1")
androidTestImplementation("androidx.core:core-ktx:1.12.0")
Expand Down
2 changes: 1 addition & 1 deletion javascriptengine/javascriptengine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
api("androidx.core:core:1.1.0")
api(libs.guavaAndroid)

androidTestImplementation 'junit:junit:4.12'
androidTestImplementation(libs.junit)
annotationProcessor(libs.nullaway)
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
Expand Down
4 changes: 2 additions & 2 deletions metrics/integration-tests/janktest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ dependencies {
implementation project(":navigation:navigation-ui-ktx")
implementation("androidx.appcompat:appcompat:1.1.0")
implementation project(":metrics:metrics-performance")
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
implementation("com.google.android.material:material:1.2.1")
implementation("androidx.constraintlayout:constraintlayout:2.0.1")
}
8 changes: 4 additions & 4 deletions metrics/metrics-performance/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ plugins {

dependencies {
api(libs.kotlinStdlib)
implementation('androidx.core:core:1.5.0')
implementation("androidx.core:core:1.5.0")
implementation("androidx.collection:collection:1.4.2")

annotationProcessor(libs.nullaway)
Expand All @@ -50,9 +50,9 @@ dependencies {
androidTestImplementation(project(":internal-testutils-espresso"))
androidTestImplementation(project(":internal-testutils-runtime"))
androidTestImplementation(project(":internal-testutils-common"))
androidTestImplementation('androidx.core:core-ktx:1.3.2')
androidTestImplementation('androidx.constraintlayout:constraintlayout:2.0.1')
androidTestImplementation('com.google.android.material:material:1.2.1')
androidTestImplementation("androidx.core:core-ktx:1.3.2")
androidTestImplementation("androidx.constraintlayout:constraintlayout:2.0.1")
androidTestImplementation("com.google.android.material:material:1.2.1")
}

android {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
implementation(project(":privacysandbox:sdkruntime:integration-tests:testaidl"))
implementation(project(":privacysandbox:sdkruntime:integration-tests:testsdk-asb"))

implementation 'androidx.appcompat:appcompat:1.6.0'
implementation("androidx.appcompat:appcompat:1.6.0")
implementation(project(":privacysandbox:sdkruntime:sdkruntime-client"))

androidTestImplementation(project(":internal-testutils-runtime"))
Expand Down
4 changes: 2 additions & 2 deletions privacysandbox/tools/integration-tests/testapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ android {
libs.kotlinCoroutinesCore.get(),
// TODO: We'd like to use HEAD ui libraries here but we need to wait until we have an
// AGP version containing ag/28945616 (should be in AGP 8.7.0-alpha09).
project.dependencies.create('androidx.privacysandbox.ui:ui-core:1.0.0-alpha09'),
project.dependencies.create('androidx.privacysandbox.ui:ui-client:1.0.0-alpha09')
project.dependencies.create("androidx.privacysandbox.ui:ui-core:1.0.0-alpha09"),
project.dependencies.create("androidx.privacysandbox.ui:ui-client:1.0.0-alpha09")
]

privacySandbox {
Expand Down
2 changes: 1 addition & 1 deletion privacysandbox/tools/tools/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ plugins {

dependencies {
api(libs.kotlinStdlib)
implementation 'androidx.annotation:annotation:1.3.0'
implementation("androidx.annotation:annotation:1.3.0")
}

androidx {
Expand Down
2 changes: 1 addition & 1 deletion privacysandbox/ui/ui-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
implementation project(":privacysandbox:ui:ui-client")
implementation project(":privacysandbox:ui:ui-provider")
implementation(libs.kotlinStdlib)
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation("androidx.recyclerview:recyclerview:1.3.2")

androidTestImplementation(project(":internal-testutils-runtime"))
androidTestImplementation(libs.junit)
Expand Down
2 changes: 1 addition & 1 deletion room/room-paging-rxjava2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ plugins {

dependencies {
api(libs.kotlinStdlib)
api('androidx.paging:paging-rxjava2:3.1.1')
api("androidx.paging:paging-rxjava2:3.1.1")
implementation(project(":room:room-paging"))
implementation(project(":room:room-rxjava2"))

Expand Down
12 changes: 6 additions & 6 deletions samples/AndroidXDemos/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ dependencies {
implementation(libs.material)
implementation(libs.androidx.annotation)
implementation("androidx.collection:collection:1.4.2")
implementation('androidx.loader:loader:1.0.0')
implementation('androidx.cursoradapter:cursoradapter:1.0.0')
implementation('androidx.lifecycle:lifecycle-viewmodel:2.6.2')
implementation('androidx.fragment:fragment:1.5.4')
implementation('androidx.coordinatorlayout:coordinatorlayout:1.1.0')
implementation('androidx.viewpager:viewpager:1.0.0')
implementation("androidx.loader:loader:1.0.0")
implementation("androidx.cursoradapter:cursoradapter:1.0.0")
implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.2")
implementation("androidx.fragment:fragment:1.5.4")
implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
implementation("androidx.viewpager:viewpager:1.0.0")
}

android {
Expand Down
Loading

0 comments on commit ced7f81

Please sign in to comment.