Clean up an assortment of build.gradle files
Test: None
Change-Id: I4cb91a15bb148717fbd14c9fb9e55b39841ac9a9
diff --git a/camera/camera-camera2-pipe-integration/build.gradle b/camera/camera-camera2-pipe-integration/build.gradle
index 5ba8cb5..a6cb023 100644
--- a/camera/camera-camera2-pipe-integration/build.gradle
+++ b/camera/camera-camera2-pipe-integration/build.gradle
@@ -48,7 +48,7 @@
dependencies {
implementation("androidx.core:core:1.3.2")
implementation("androidx.concurrent:concurrent-listenablefuture-callback:1.0.0-beta01")
- bundleInside(project(path: ":camera:camera-camera2-pipe"))
+ bundleInside(project(":camera:camera-camera2-pipe"))
// Classes and types that are needed at compile & runtime
api("androidx.annotation:annotation:1.1.0")
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle
index 88dd657..bddc6fd 100644
--- a/camera/camera-core/build.gradle
+++ b/camera/camera-core/build.gradle
@@ -34,7 +34,6 @@
implementation("androidx.concurrent:concurrent-futures:1.0.0")
implementation("androidx.lifecycle:lifecycle-common:2.1.0")
implementation(libs.autoValueAnnotations)
- androidTestImplementation project(path: ':camera:camera-camera2')
compileOnly(project(":external:libyuv"))
annotationProcessor(libs.autoValue)
@@ -52,6 +51,7 @@
})
testImplementation("androidx.exifinterface:exifinterface:1.3.2")
+ androidTestImplementation(project(":camera:camera-camera2"))
androidTestImplementation(libs.multidex)
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
diff --git a/camera/camera-video/build.gradle b/camera/camera-video/build.gradle
index ff70608..956ef75 100644
--- a/camera/camera-video/build.gradle
+++ b/camera/camera-video/build.gradle
@@ -34,8 +34,6 @@
annotationProcessor(libs.autoValue)
- // TODO(leohuang): We need this for assertThrows. Point back to the AndroidX shared version if
- // it is ever upgraded.
testImplementation(libs.junit)
testImplementation(libs.kotlinStdlib)
testImplementation(libs.testCore)
@@ -50,7 +48,7 @@
})
androidTestImplementation(libs.multidex)
- androidTestImplementation(project(path: ":camera:camera-camera2"))
+ androidTestImplementation(project(":camera:camera-camera2"))
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testRunner)
diff --git a/camera/integration-tests/diagnosetestapp/build.gradle b/camera/integration-tests/diagnosetestapp/build.gradle
index 638ee37..12494ab 100644
--- a/camera/integration-tests/diagnosetestapp/build.gradle
+++ b/camera/integration-tests/diagnosetestapp/build.gradle
@@ -58,7 +58,7 @@
implementation(libs.material)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
- testImplementation project(path: ':camera:camera-testing')
+ testImplementation(project(":camera:camera-testing"))
testImplementation("androidx.test:core:1.4.0")
testImplementation("junit:junit:4.12")
diff --git a/car/app/app-automotive/build.gradle b/car/app/app-automotive/build.gradle
index df11ac8..c91046f 100644
--- a/car/app/app-automotive/build.gradle
+++ b/car/app/app-automotive/build.gradle
@@ -34,7 +34,7 @@
// There is an implicit compile-only dep due to :annotation-experimental
// Build will complain without this manual declaration.
api(libs.kotlinStdlib)
- implementation "androidx.annotation:annotation-experimental:1.3.0"
+ implementation("androidx.annotation:annotation-experimental:1.3.0")
annotationProcessor(libs.nullaway)
annotationProcessor(libs.autoValue)
@@ -48,7 +48,7 @@
testImplementation(libs.robolectric)
testImplementation(libs.truth)
testImplementation("androidx.fragment:fragment-testing:1.2.3")
- testImplementation project(path: ':car:app:app-testing')
+ testImplementation(project(":car:app:app-testing"))
}
android {
diff --git a/car/app/app-projected/build.gradle b/car/app/app-projected/build.gradle
index e53a4cb..3bd57ae 100644
--- a/car/app/app-projected/build.gradle
+++ b/car/app/app-projected/build.gradle
@@ -34,7 +34,7 @@
testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
- testImplementation project(path: ':car:app:app-testing')
+ testImplementation(project(":car:app:app-testing"))
}
android {
diff --git a/car/app/app/build.gradle b/car/app/app/build.gradle
index ba71e90..520ae2e 100644
--- a/car/app/app/build.gradle
+++ b/car/app/app/build.gradle
@@ -59,8 +59,6 @@
annotationProcessor(libs.nullaway)
- // TODO(shiufai): We need this for assertThrows. Point back to the AndroidX shared version if
- // it is ever upgraded.
testImplementation(libs.junit)
testImplementation(libs.testCore)
testImplementation(libs.testRunner)
@@ -68,7 +66,7 @@
testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
- testImplementation project(path: ':car:app:app-testing')
+ testImplementation(project(":car:app:app-testing"))
}
project.ext {
diff --git a/metrics/integration-tests/build.gradle b/metrics/integration-tests/build.gradle
deleted file mode 100644
index e69de29..0000000
--- a/metrics/integration-tests/build.gradle
+++ /dev/null
diff --git a/metrics/integration-tests/janktest/build.gradle b/metrics/integration-tests/janktest/build.gradle
index 476a3ae..1ae5db3 100644
--- a/metrics/integration-tests/janktest/build.gradle
+++ b/metrics/integration-tests/janktest/build.gradle
@@ -29,12 +29,12 @@
dependencies {
implementation(libs.kotlinStdlib)
- implementation project(':recyclerview:recyclerview')
- implementation project(':navigation:navigation-fragment-ktx')
- implementation project(':navigation:navigation-ui-ktx')
- implementation project(':appcompat:appcompat')
- implementation project(path: ':metrics:metrics-performance')
- implementation 'com.google.android.material:material:1.2.1'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
- implementation 'androidx.multidex:multidex:2.0.1'
+ implementation(project(":recyclerview:recyclerview"))
+ implementation(project(":navigation:navigation-fragment-ktx"))
+ implementation(project(":navigation:navigation-ui-ktx"))
+ implementation(project(":appcompat:appcompat"))
+ implementation(project(":metrics:metrics-performance"))
+ implementation("com.google.android.material:material:1.2.1")
+ implementation("androidx.constraintlayout:constraintlayout:2.0.1")
+ implementation("androidx.multidex:multidex:2.0.1")
}
diff --git a/samples/SupportWearDemos/build.gradle b/samples/SupportWearDemos/build.gradle
index 303b57d..edb1d16 100644
--- a/samples/SupportWearDemos/build.gradle
+++ b/samples/SupportWearDemos/build.gradle
@@ -21,8 +21,8 @@
dependencies {
implementation(project(":wear:wear"))
- implementation(project(path: ":recyclerview:recyclerview"))
- implementation(project(path: ":appcompat:appcompat"))
+ implementation(project(":recyclerview:recyclerview"))
+ implementation(project(":appcompat:appcompat"))
}
android {
diff --git a/wear/tiles/tiles-testing/build.gradle b/wear/tiles/tiles-testing/build.gradle
index e0ff8e58..10f7078 100644
--- a/wear/tiles/tiles-testing/build.gradle
+++ b/wear/tiles/tiles-testing/build.gradle
@@ -29,10 +29,10 @@
api(libs.guavaListenableFuture)
api(project(":wear:tiles:tiles-renderer"))
- implementation "androidx.concurrent:concurrent-futures:1.1.0"
- implementation "androidx.concurrent:concurrent-futures-ktx:1.1.0"
- implementation "androidx.core:core:1.3.2"
- implementation "androidx.wear:wear:1.2.0"
+ implementation("androidx.concurrent:concurrent-futures:1.1.0")
+ implementation("androidx.concurrent:concurrent-futures-ktx:1.1.0")
+ implementation("androidx.core:core:1.3.2")
+ implementation("androidx.wear:wear:1.2.0")
implementation(project(":wear:tiles:tiles"))
implementation(libs.kotlinCoroutinesCore)
diff --git a/wear/tiles/tiles/build.gradle b/wear/tiles/tiles/build.gradle
index 8b13595..ed6fc32 100644
--- a/wear/tiles/tiles/build.gradle
+++ b/wear/tiles/tiles/build.gradle
@@ -30,7 +30,7 @@
implementation("androidx.annotation:annotation-experimental:1.3.0")
implementation("androidx.concurrent:concurrent-futures:1.1.0")
- implementation(project(path: ":wear:tiles:tiles-proto"))
+ implementation(project(":wear:tiles:tiles-proto"))
compileOnly(libs.kotlinStdlib) // For annotation-experimental