Update more projects to centralized golden setup
Test: None
Change-Id: I2592d4d5548f4d16278f567708c366e80f625ed2
diff --git a/camera/viewfinder/viewfinder-compose/build.gradle b/camera/viewfinder/viewfinder-compose/build.gradle
index d20e198..b28d873 100644
--- a/camera/viewfinder/viewfinder-compose/build.gradle
+++ b/camera/viewfinder/viewfinder-compose/build.gradle
@@ -51,9 +51,6 @@
android {
compileSdk = 35
namespace = "androidx.camera.viewfinder.compose"
-
- sourceSets.androidTest.assets.srcDirs +=
- project.rootDir.absolutePath + "/../../golden/camera/viewfinder/viewfinder-compose"
}
androidx {
@@ -62,4 +59,5 @@
inceptionYear = "2023"
description = "Standalone Composable Viewfinder for Camera"
legacyDisableKotlinStrictApiMode = true
+ addGoldenImageAssets()
}
diff --git a/tv/tv-material/build.gradle b/tv/tv-material/build.gradle
index a4d04af..3698f2f 100644
--- a/tv/tv-material/build.gradle
+++ b/tv/tv-material/build.gradle
@@ -63,8 +63,6 @@
android {
compileSdk = 35
namespace = "androidx.tv.material"
- sourceSets.androidTest.assets.srcDirs +=
- project.rootDir.absolutePath + "/../../golden/tv/compose/material3"
}
androidx {
@@ -76,4 +74,5 @@
legacyDisableKotlinStrictApiMode = true
metalavaK2UastEnabled = false
samples(project(":tv:tv-material-samples"))
+ addGoldenImageAssets()
}
diff --git a/wear/compose/compose-foundation/build.gradle b/wear/compose/compose-foundation/build.gradle
index a3c1ff9..104ffff 100644
--- a/wear/compose/compose-foundation/build.gradle
+++ b/wear/compose/compose-foundation/build.gradle
@@ -78,9 +78,6 @@
}
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
- sourceSets.androidTest.assets.srcDirs +=
- project.rootDir.absolutePath + "/../../golden/wear/compose/foundation"
-
buildTypes.configureEach {
consumerProguardFiles("proguard-rules.pro")
}
@@ -98,4 +95,5 @@
samples(project(":wear:compose:compose-foundation-samples"))
legacyDisableKotlinStrictApiMode = true
metalavaK2UastEnabled = false
+ addGoldenImageAssets()
}
diff --git a/wear/compose/compose-material-core/build.gradle b/wear/compose/compose-material-core/build.gradle
index bc7615d..849fbd2 100644
--- a/wear/compose/compose-material-core/build.gradle
+++ b/wear/compose/compose-material-core/build.gradle
@@ -48,8 +48,6 @@
androidTestImplementation(project(":compose:ui:ui-test"))
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
androidTestImplementation(project(":compose:test-utils"))
-
- androidTestImplementation(project(":test:screenshot:screenshot"))
androidTestImplementation(libs.testRunner)
androidTestImplementation(libs.truth)
@@ -66,8 +64,6 @@
}
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
- sourceSets.androidTest.assets.srcDirs +=
- project.rootDir.absolutePath + "/../../golden/wear/compose/materialcore"
buildTypes.configureEach {
consumerProguardFiles("proguard-rules.pro")
}
diff --git a/wear/compose/compose-material/build.gradle b/wear/compose/compose-material/build.gradle
index d09f201..4393637 100644
--- a/wear/compose/compose-material/build.gradle
+++ b/wear/compose/compose-material/build.gradle
@@ -68,15 +68,10 @@
}
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
- sourceSets.androidTest.assets.srcDirs +=
- project.rootDir.absolutePath + "/../../golden/wear/compose/material"
buildTypes.configureEach {
consumerProguardFiles("proguard-rules.pro")
}
namespace = "androidx.wear.compose.material"
- lint {
- baseline = file("lint-baseline.xml")
- }
}
androidx {
@@ -90,4 +85,5 @@
legacyDisableKotlinStrictApiMode = true
metalavaK2UastEnabled = false
samples(project(":wear:compose:compose-material-samples"))
+ addGoldenImageAssets()
}
diff --git a/wear/compose/compose-material3/build.gradle b/wear/compose/compose-material3/build.gradle
index efbb530a..923e7bf 100644
--- a/wear/compose/compose-material3/build.gradle
+++ b/wear/compose/compose-material3/build.gradle
@@ -76,15 +76,10 @@
}
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
- sourceSets.androidTest.assets.srcDirs +=
- project.rootDir.absolutePath + "/../../golden/wear/compose/material3"
buildTypes.configureEach {
consumerProguardFiles("proguard-rules.pro")
}
namespace = "androidx.wear.compose.material3"
- lint {
- baseline = file("lint-baseline.xml")
- }
}
androidx {
@@ -100,6 +95,7 @@
metalavaK2UastEnabled = false
samples(project(":wear:compose:compose-material3-samples"))
kotlinTarget = KotlinTarget.KOTLIN_1_9
+ addGoldenImageAssets()
}
tasks.withType(KotlinCompile).configureEach {
diff --git a/wear/protolayout/protolayout-material/build.gradle b/wear/protolayout/protolayout-material/build.gradle
index 464a703..da521c6 100644
--- a/wear/protolayout/protolayout-material/build.gradle
+++ b/wear/protolayout/protolayout-material/build.gradle
@@ -67,9 +67,6 @@
defaultConfig {
minSdk = 26
}
- sourceSets {
- androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/wear/wear-protolayout-material"
- }
namespace = "androidx.wear.protolayout.material"
}
@@ -78,4 +75,5 @@
type = LibraryType.PUBLISHED_LIBRARY
inceptionYear = "2023"
description = "Material components library for ProtoLayout."
+ addGoldenImageAssets()
}
diff --git a/wear/protolayout/protolayout-material3/build.gradle b/wear/protolayout/protolayout-material3/build.gradle
index e6c36ce..f10a7fb 100644
--- a/wear/protolayout/protolayout-material3/build.gradle
+++ b/wear/protolayout/protolayout-material3/build.gradle
@@ -71,10 +71,6 @@
defaultConfig {
minSdk = 26
}
-
- sourceSets {
- androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/wear/wear-protolayout-material3"
- }
namespace = "androidx.wear.protolayout.material3"
}
@@ -85,4 +81,5 @@
inceptionYear = "2024"
description = "Material3 components library for ProtoLayout."
samples(project(":wear:protolayout:protolayout-material3-samples"))
+ addGoldenImageAssets()
}
diff --git a/wear/tiles/tiles-material/build.gradle b/wear/tiles/tiles-material/build.gradle
index 707f6ed..c472f64 100644
--- a/wear/tiles/tiles-material/build.gradle
+++ b/wear/tiles/tiles-material/build.gradle
@@ -63,9 +63,6 @@
defaultConfig {
minSdk = 26
}
- sourceSets {
- androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/wear/wear-tiles-material"
- }
namespace = "androidx.wear.tiles.material"
}
@@ -75,4 +72,5 @@
inceptionYear = "2021"
description = "Material components library for Android Wear Tiles."
legacyDisableKotlinStrictApiMode = true
+ addGoldenImageAssets()
}
diff --git a/wear/tiles/tiles-renderer/build.gradle b/wear/tiles/tiles-renderer/build.gradle
index d50ba1d..14aedd7 100644
--- a/wear/tiles/tiles-renderer/build.gradle
+++ b/wear/tiles/tiles-renderer/build.gradle
@@ -81,9 +81,6 @@
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
- sourceSets {
- androidTest.assets.srcDirs += project.rootDir.absolutePath + "/../../golden/wear/wear-tiles-renderer"
- }
namespace = "androidx.wear.tiles.renderer"
}
@@ -108,5 +105,6 @@
description = "Android Wear Tiles Renderer components. These components can be used to parse " +
"and render an already constructed Wear Tile."
legacyDisableKotlinStrictApiMode = true
+ addGoldenImageAssets()
}
diff --git a/wear/watchface/watchface-client/build.gradle b/wear/watchface/watchface-client/build.gradle
index bfb0889..aefdc88 100644
--- a/wear/watchface/watchface-client/build.gradle
+++ b/wear/watchface/watchface-client/build.gradle
@@ -63,9 +63,6 @@
defaultConfig {
minSdk = 26
}
- sourceSets.androidTest.assets.srcDirs +=
- project.rootDir.absolutePath + "/../../golden/wear/wear-watchface-client"
-
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
namespace = "androidx.wear.watchface.client"
@@ -77,4 +74,5 @@
inceptionYear = "2020"
description = "Client library for controlling androidx watchfaces"
legacyDisableKotlinStrictApiMode = true
+ addGoldenImageAssets()
}
diff --git a/wear/watchface/watchface/build.gradle b/wear/watchface/watchface/build.gradle
index fdb7d3e..8efd472 100644
--- a/wear/watchface/watchface/build.gradle
+++ b/wear/watchface/watchface/build.gradle
@@ -69,10 +69,6 @@
defaultConfig {
minSdk = 26
}
-
- sourceSets.androidTest.assets.srcDirs +=
- project.rootDir.absolutePath + "/../../golden/wear/wear-watchface"
-
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
namespace = "androidx.wear.watchface"
@@ -85,4 +81,5 @@
description = "Android Wear Watchface"
legacyDisableKotlinStrictApiMode = true
samples(project(":wear:watchface:watchface-samples"))
+ addGoldenImageAssets()
}
