[go: nahoru, domu]

Link sample projects from projects using these samples.

This makes AffectedModuleDetector realize that there is a bidirectional
dependency between projects and their sample projects

Bug: 197667397
Test: None
Change-Id: Ia62da6340d0e4331887c39d6e5bc1a78c9a57d55
diff --git a/activity/activity-compose/build.gradle b/activity/activity-compose/build.gradle
index 8c43fd0..f2553e3 100644
--- a/activity/activity-compose/build.gradle
+++ b/activity/activity-compose/build.gradle
@@ -45,6 +45,8 @@
 
     lintChecks(projectOrArtifact(":activity:activity-compose-lint"))
     lintPublish(projectOrArtifact(":activity:activity-compose-lint"))
+
+    samples(projectOrArtifact(":activity:activity-compose:activity-compose-samples"))
 }
 
 androidx {
diff --git a/biometric/biometric-ktx/build.gradle b/biometric/biometric-ktx/build.gradle
index b71d2f3..e4d54d3 100755
--- a/biometric/biometric-ktx/build.gradle
+++ b/biometric/biometric-ktx/build.gradle
@@ -27,6 +27,8 @@
     api(libs.kotlinStdlib)
     api(libs.kotlinCoroutinesCore)
     api(project(":biometric:biometric"))
+
+    samples(project(":biometric:biometric-ktx-samples"))
 }
 
 androidx {
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
index 4e47d01..12d1092 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
@@ -115,6 +115,8 @@
         project.configureExternalDependencyLicenseCheck()
         project.configureProjectStructureValidation(extension)
         project.configureProjectVersionValidation(extension)
+
+        project.configurations.create("samples")
     }
 
     /**
diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle
index d6a01a7..30a3cfe 100644
--- a/compose/animation/animation-core/build.gradle
+++ b/compose/animation/animation-core/build.gradle
@@ -61,6 +61,8 @@
         androidTestImplementation(project(":compose:test-utils"))
 
         lintPublish project(":compose:animation:animation-core-lint")
+
+        samples(project(":compose:animation:animation-core:animation-core-samples"))
     }
 }
 
diff --git a/compose/animation/animation-graphics/build.gradle b/compose/animation/animation-graphics/build.gradle
index b102bdf..38bd9d9 100644
--- a/compose/animation/animation-graphics/build.gradle
+++ b/compose/animation/animation-graphics/build.gradle
@@ -29,7 +29,6 @@
 
 dependencies {
     kotlinPlugin(project(":compose:compiler:compiler"))
-
     if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
         /*
          * When updating dependencies, make sure to make the an an analogous update in the
@@ -58,6 +57,8 @@
         androidTestImplementation(libs.testRunner)
         androidTestImplementation(libs.junit)
         androidTestImplementation(libs.truth)
+
+        samples(project(":compose:animation:animation-graphics:animation-graphics-samples"))
     }
 }
 
diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle
index b204e6e..395cbfd 100644
--- a/compose/animation/animation/build.gradle
+++ b/compose/animation/animation/build.gradle
@@ -58,6 +58,8 @@
         androidTestImplementation(libs.junit)
 
         lintPublish project(":compose:animation:animation-lint")
+
+        samples(project(":compose:animation:animation:animation-samples"))
     }
 }
 
diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle
index 4ba21f3..e276a55 100644
--- a/compose/foundation/foundation-layout/build.gradle
+++ b/compose/foundation/foundation-layout/build.gradle
@@ -55,6 +55,8 @@
         androidTestImplementation(libs.testRunner)
         androidTestImplementation(libs.junit)
         androidTestImplementation(libs.truth)
+
+        samples(project(":compose:foundation:foundation-layout:foundation-layout-samples"))
     }
 }
 
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index d6e0cc0..8ae8c9c 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -70,6 +70,8 @@
         androidTestImplementation(libs.dexmakerMockito)
         androidTestImplementation(libs.mockitoCore)
         androidTestImplementation(libs.mockitoKotlin)
+
+        samples(project(":compose:foundation:foundation:foundation-samples"))
     }
 }
 
diff --git a/compose/material/material-icons-core/build.gradle b/compose/material/material-icons-core/build.gradle
index 73f45d3..f846ef2 100644
--- a/compose/material/material-icons-core/build.gradle
+++ b/compose/material/material-icons-core/build.gradle
@@ -39,6 +39,8 @@
         api("androidx.compose.ui:ui:1.0.0")
         implementation(project(":compose:runtime:runtime"))
         implementation(libs.kotlinStdlib)
+
+        samples(project(":compose:material:material-icons-core:material-icons-core-samples"))
     }
 }
 
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index 50bda39..6c3d250 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -65,6 +65,8 @@
         androidTestImplementation(libs.testUiautomator)
 
         lintPublish project(":compose:material:material-lint")
+
+        samples(project(":compose:material:material:material-samples"))
     }
 }
 
diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle
index 0ae4cea..2742f61 100644
--- a/compose/runtime/runtime-livedata/build.gradle
+++ b/compose/runtime/runtime-livedata/build.gradle
@@ -39,6 +39,8 @@
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.junit)
     androidTestImplementation(libs.truth)
+
+    samples(projectOrArtifact(":compose:runtime:runtime-livedata:runtime-livedata-samples"))
 }
 
 androidx {
diff --git a/compose/runtime/runtime-rxjava2/build.gradle b/compose/runtime/runtime-rxjava2/build.gradle
index 0b781ff..98b9cf0 100644
--- a/compose/runtime/runtime-rxjava2/build.gradle
+++ b/compose/runtime/runtime-rxjava2/build.gradle
@@ -38,6 +38,8 @@
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.junit)
     androidTestImplementation(libs.truth)
+
+    samples(projectOrArtifact(":compose:runtime:runtime-rxjava2:runtime-rxjava2-samples"))
 }
 
 androidx {
diff --git a/compose/runtime/runtime-rxjava3/build.gradle b/compose/runtime/runtime-rxjava3/build.gradle
index f63fc46..21ed40a 100644
--- a/compose/runtime/runtime-rxjava3/build.gradle
+++ b/compose/runtime/runtime-rxjava3/build.gradle
@@ -38,6 +38,8 @@
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.junit)
     androidTestImplementation(libs.truth)
+
+    samples(projectOrArtifact(":compose:runtime:runtime-rxjava3:runtime-rxjava3-samples"))
 }
 
 androidx {
diff --git a/compose/runtime/runtime-saveable/build.gradle b/compose/runtime/runtime-saveable/build.gradle
index b88b9e0..54d6c7e 100644
--- a/compose/runtime/runtime-saveable/build.gradle
+++ b/compose/runtime/runtime-saveable/build.gradle
@@ -59,6 +59,8 @@
         androidTestImplementation(libs.mockitoCore)
 
         lintPublish(project(":compose:runtime:runtime-saveable-lint"))
+
+        samples(projectOrArtifact(":compose:runtime:runtime-saveable:runtime-saveable-samples"))
     }
 }
 
diff --git a/compose/runtime/runtime/build.gradle b/compose/runtime/runtime/build.gradle
index 4a85e73..f3fa175 100644
--- a/compose/runtime/runtime/build.gradle
+++ b/compose/runtime/runtime/build.gradle
@@ -56,6 +56,8 @@
 
         lintChecks(projectOrArtifact(":compose:runtime:runtime-lint"))
         lintPublish(projectOrArtifact(":compose:runtime:runtime-lint"))
+
+        samples(projectOrArtifact(":compose:runtime:runtime:runtime-samples"))
     }
 }
 
diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle
index 43f2863..a2690fc 100644
--- a/compose/ui/ui-graphics/build.gradle
+++ b/compose/ui/ui-graphics/build.gradle
@@ -56,6 +56,8 @@
         androidTestImplementation(libs.truth)
 
         lintPublish(project(":compose:ui:ui-graphics-lint"))
+
+        samples(projectOrArtifact(":compose:ui:ui-graphics:ui-graphics-samples"))
     }
 }
 
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle
index eabae59..1084407 100644
--- a/compose/ui/ui-text/build.gradle
+++ b/compose/ui/ui-text/build.gradle
@@ -66,6 +66,8 @@
         androidTestImplementation(libs.mockitoCore)
         androidTestImplementation(libs.truth)
         androidTestImplementation(libs.mockitoKotlin)
+
+        samples(projectOrArtifact(":compose:ui:ui-text:ui-text-samples"))
     }
 
     android {
diff --git a/compose/ui/ui-unit/build.gradle b/compose/ui/ui-unit/build.gradle
index 8024090..41baa46 100644
--- a/compose/ui/ui-unit/build.gradle
+++ b/compose/ui/ui-unit/build.gradle
@@ -50,6 +50,8 @@
         androidTestImplementation(libs.espressoCore)
         androidTestImplementation(libs.truth)
         androidTestImplementation(libs.kotlinTest)
+
+        samples(projectOrArtifact(":compose:ui:ui-unit:ui-unit-samples"))
     }
 }
 
diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle
index ce847ed..4895329 100644
--- a/compose/ui/ui-viewbinding/build.gradle
+++ b/compose/ui/ui-viewbinding/build.gradle
@@ -40,6 +40,8 @@
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.junit)
     androidTestImplementation(libs.truth)
+
+    samples(project(":compose:ui:ui-viewbinding:ui-viewbinding-samples"))
 }
 
 androidx {
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index 8879f12..5956521 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -102,6 +102,8 @@
 
         lintChecks(project(":compose:ui:ui-lint"))
         lintPublish(project(":compose:ui:ui-lint"))
+
+        samples(project(":compose:ui:ui:ui-samples"))
     }
 }
 
diff --git a/core/core-splashscreen/build.gradle b/core/core-splashscreen/build.gradle
index d4aeb10..d325d3b 100644
--- a/core/core-splashscreen/build.gradle
+++ b/core/core-splashscreen/build.gradle
@@ -43,6 +43,8 @@
     androidTestImplementation(libs.truth)
     androidTestImplementation(project(":appcompat:appcompat"))
     androidTestImplementation(project(":test:screenshot:screenshot"))
+
+    samples(project(":core:core-splashscreen:core-splashscreen-samples"))
 }
 
 androidx {
diff --git a/hilt/hilt-navigation-compose/build.gradle b/hilt/hilt-navigation-compose/build.gradle
index 6f571ee..b408b03 100644
--- a/hilt/hilt-navigation-compose/build.gradle
+++ b/hilt/hilt-navigation-compose/build.gradle
@@ -54,6 +54,8 @@
     kaptAndroidTest(libs.hiltCompiler)
     androidTestImplementation projectOrArtifact(":compose:material:material")
     androidTestImplementation projectOrArtifact(":compose:test-utils")
+
+    samples(projectOrArtifact(":hilt:hilt-navigation-compose-samples"))
 }
 
 hilt {
diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle
index 30a05a0..1285491 100644
--- a/lifecycle/lifecycle-viewmodel-compose/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle
@@ -44,6 +44,8 @@
     androidTestImplementation "androidx.fragment:fragment:1.3.0"
     androidTestImplementation "androidx.appcompat:appcompat:1.3.0"
     androidTestImplementation projectOrArtifact(":activity:activity-compose")
+
+    samples(projectOrArtifact(":lifecycle:lifecycle-viewmodel-compose:lifecycle-viewmodel-compose-samples"))
 }
 
 androidx {
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index 7f9c207..1ba3140 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -51,6 +51,8 @@
 
     lintChecks(projectOrArtifact(":navigation:navigation-compose-lint"))
     lintPublish(projectOrArtifact(":navigation:navigation-compose-lint"))
+
+    samples(projectOrArtifact(":navigation:navigation-compose:navigation-compose-samples"))
 }
 
 androidx {
diff --git a/paging/paging-common/build.gradle b/paging/paging-common/build.gradle
index ae0f19b..3249b5d 100644
--- a/paging/paging-common/build.gradle
+++ b/paging/paging-common/build.gradle
@@ -40,6 +40,8 @@
     testImplementation(libs.kotlinTest)
     testImplementation(libs.kotlinCoroutinesTest)
     testImplementation(libs.truth)
+
+    samples(project(":paging:paging-samples"))
 }
 
 androidx {
diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle
index 0bc5db8..8d4c4db 100644
--- a/paging/paging-compose/build.gradle
+++ b/paging/paging-compose/build.gradle
@@ -41,6 +41,8 @@
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.junit)
     androidTestImplementation(libs.truth)
+
+    samples(projectOrArtifact(":paging:paging-compose:paging-compose-samples"))
 }
 
 androidx {
diff --git a/paging/paging-guava/build.gradle b/paging/paging-guava/build.gradle
index 0b21de1..faee59a 100644
--- a/paging/paging-guava/build.gradle
+++ b/paging/paging-guava/build.gradle
@@ -35,6 +35,8 @@
     testImplementation(libs.junit)
     testImplementation(libs.kotlinTest)
     testImplementation(libs.kotlinCoroutinesTest)
+
+    samples(project(":paging:paging-samples"))
 }
 
 androidx {
diff --git a/paging/paging-runtime/build.gradle b/paging/paging-runtime/build.gradle
index 32d8093..88add9b 100644
--- a/paging/paging-runtime/build.gradle
+++ b/paging/paging-runtime/build.gradle
@@ -56,6 +56,8 @@
     androidTestImplementation(libs.kotlinCoroutinesTest)
     androidTestImplementation(libs.junit)
     androidTestImplementation(libs.multidex)
+
+    samples(project(":paging:paging-samples"))
 }
 
 androidx {
diff --git a/paging/paging-rxjava2/build.gradle b/paging/paging-rxjava2/build.gradle
index 459bc18..22b5a44 100644
--- a/paging/paging-rxjava2/build.gradle
+++ b/paging/paging-rxjava2/build.gradle
@@ -43,6 +43,8 @@
     androidTestImplementation(libs.testCore)
     androidTestImplementation(libs.testRunner)
     androidTestImplementation("androidx.arch.core:core-testing:2.1.0")
+
+    samples(project(":paging:paging-samples"))
 }
 
 androidx {
diff --git a/settings.gradle b/settings.gradle
index d38b9a6..515e915 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -368,7 +368,7 @@
 includeProject(":compose:runtime:runtime-saveable:runtime-saveable-samples", "compose/runtime/runtime-saveable/samples", [BuildType.COMPOSE])
 includeProject(":compose:runtime:runtime:benchmark", "compose/runtime/runtime/compose-runtime-benchmark", [BuildType.COMPOSE])
 includeProject(":compose:runtime:runtime:integration-tests", "compose/runtime/runtime/integration-tests", [BuildType.COMPOSE])
-includeProject(":compose:runtime:runtime:runtime-samples", "compose/runtime/runtime/samples", [BuildType.COMPOSE])
+includeProject(":compose:runtime:runtime:runtime-samples", "compose/runtime/runtime/samples", [BuildType.MAIN, BuildType.COMPOSE])
 includeProject(":compose:test-utils", "compose/test-utils", [BuildType.COMPOSE])
 includeProject(":compose:ui", "compose/ui", [BuildType.COMPOSE])
 includeProject(":compose:ui:ui", "compose/ui/ui", [BuildType.COMPOSE])
@@ -493,8 +493,8 @@
 includeProject(":lifecycle:integration-tests:incrementality", "lifecycle/integration-tests/incrementality", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":lifecycle:integration-tests:lifecycle-testapp", "lifecycle/integration-tests/testapp", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":lifecycle:integration-tests:lifecycle-testapp-kotlin", "lifecycle/integration-tests/kotlintestapp", [BuildType.MAIN, BuildType.FLAN])
-includeProject(":lifecycle:lifecycle-common", "lifecycle/lifecycle-common", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR])
-includeProject(":lifecycle:lifecycle-common-java8", "lifecycle/lifecycle-common-java8", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR])
+includeProject(":lifecycle:lifecycle-common", "lifecycle/lifecycle-common", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR, BuildType.COMPOSE])
+includeProject(":lifecycle:lifecycle-common-java8", "lifecycle/lifecycle-common-java8", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR, BuildType.COMPOSE])
 includeProject(":lifecycle:lifecycle-compiler", "lifecycle/lifecycle-compiler", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":lifecycle:lifecycle-extensions", "lifecycle/lifecycle-extensions", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":lifecycle:lifecycle-livedata", "lifecycle/lifecycle-livedata", [BuildType.MAIN, BuildType.FLAN])
@@ -506,10 +506,10 @@
 includeProject(":lifecycle:lifecycle-process", "lifecycle/lifecycle-process", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":lifecycle:lifecycle-reactivestreams", "lifecycle/lifecycle-reactivestreams", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":lifecycle:lifecycle-reactivestreams-ktx", "lifecycle/lifecycle-reactivestreams-ktx", [BuildType.MAIN, BuildType.FLAN])
-includeProject(":lifecycle:lifecycle-runtime", "lifecycle/lifecycle-runtime", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR])
-includeProject(":lifecycle:lifecycle-runtime-ktx", "lifecycle/lifecycle-runtime-ktx", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR])
-includeProject(":lifecycle:lifecycle-runtime-ktx-lint", "lifecycle/lifecycle-runtime-ktx-lint", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR])
-includeProject(":lifecycle:lifecycle-runtime-testing", "lifecycle/lifecycle-runtime-testing", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR])
+includeProject(":lifecycle:lifecycle-runtime", "lifecycle/lifecycle-runtime", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR, BuildType.COMPOSE])
+includeProject(":lifecycle:lifecycle-runtime-ktx", "lifecycle/lifecycle-runtime-ktx", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR, BuildType.COMPOSE])
+includeProject(":lifecycle:lifecycle-runtime-ktx-lint", "lifecycle/lifecycle-runtime-ktx-lint", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR, BuildType.COMPOSE])
+includeProject(":lifecycle:lifecycle-runtime-testing", "lifecycle/lifecycle-runtime-testing", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR, BuildType.COMPOSE])
 includeProject(":lifecycle:lifecycle-service", "lifecycle/lifecycle-service", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":lifecycle:lifecycle-viewmodel", "lifecycle/lifecycle-viewmodel", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR])
 includeProject(":lifecycle:lifecycle-viewmodel-compose", "lifecycle/lifecycle-viewmodel-compose", [BuildType.COMPOSE])
@@ -558,17 +558,17 @@
 includeProject(":navigation:navigation-ui-ktx", "navigation/navigation-ui-ktx", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":paging:integration-tests:testapp", "paging/integration-tests/testapp", [BuildType.MAIN])
 includeProject(":paging:paging-common", "paging/paging-common", [BuildType.MAIN, BuildType.COMPOSE])
-includeProject(":paging:paging-common-ktx", "paging/paging-common-ktx", [BuildType.MAIN])
+includeProject(":paging:paging-common-ktx", "paging/paging-common-ktx", [BuildType.MAIN, BuildType.COMPOSE])
 includeProject(":paging:paging-compose", "paging/paging-compose", [BuildType.COMPOSE])
 includeProject(":paging:paging-compose:paging-compose-samples", "paging/paging-compose/samples", [BuildType.COMPOSE])
 includeProject(":paging:paging-compose:integration-tests:paging-demos", "paging/paging-compose/integration-tests/paging-demos", [BuildType.COMPOSE])
-includeProject(":paging:paging-guava", "paging/paging-guava", [BuildType.MAIN])
-includeProject(":paging:paging-runtime", "paging/paging-runtime", [BuildType.MAIN])
+includeProject(":paging:paging-guava", "paging/paging-guava", [BuildType.MAIN, BuildType.COMPOSE])
+includeProject(":paging:paging-runtime", "paging/paging-runtime", [BuildType.MAIN, BuildType.COMPOSE])
 includeProject(":paging:paging-runtime-ktx", "paging/paging-runtime-ktx", [BuildType.MAIN])
-includeProject(":paging:paging-rxjava2", "paging/paging-rxjava2", [BuildType.MAIN])
+includeProject(":paging:paging-rxjava2", "paging/paging-rxjava2", [BuildType.MAIN, BuildType.COMPOSE])
 includeProject(":paging:paging-rxjava2-ktx", "paging/paging-rxjava2-ktx", [BuildType.MAIN])
 includeProject(":paging:paging-rxjava3", "paging/paging-rxjava3", [BuildType.MAIN])
-includeProject(":paging:paging-samples", "paging/samples", [BuildType.MAIN])
+includeProject(":paging:paging-samples", "paging/samples", [BuildType.MAIN, BuildType.COMPOSE])
 includeProject(":palette:palette", "palette/palette", [BuildType.MAIN])
 includeProject(":palette:palette-ktx", "palette/palette-ktx", [BuildType.MAIN])
 includeProject(":percentlayout:percentlayout", "percentlayout/percentlayout", [BuildType.MAIN])
@@ -706,7 +706,7 @@
 includeProject(":window:window-java", "window/window-java", [BuildType.MAIN])
 includeProject(":window:window-rxjava2", "window/window-rxjava2", [BuildType.MAIN])
 includeProject(":window:window-rxjava3", "window/window-rxjava3", [BuildType.MAIN])
-includeProject(":window:window-samples", "window/window-samples", [BuildType.MAIN])
+includeProject(":window:window-samples", "window/window-samples", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":window:window-sidecar", "window/window-sidecar", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":window:window-testing", "window/window-testing", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":work:integration-tests:testapp", "work/integration-tests/testapp", [BuildType.MAIN])
diff --git a/wear/compose/compose-foundation/build.gradle b/wear/compose/compose-foundation/build.gradle
index 7ac1f15..e2f55f9 100644
--- a/wear/compose/compose-foundation/build.gradle
+++ b/wear/compose/compose-foundation/build.gradle
@@ -47,6 +47,8 @@
         androidTestImplementation project(path: ':compose:ui:ui-test-junit4')
         androidTestImplementation project(path: ':compose:test-utils')
         androidTestImplementation(libs.testRunner)
+
+        samples(project(":wear:compose:compose-foundation-samples"))
     }
 }
 
diff --git a/wear/compose/compose-material/build.gradle b/wear/compose/compose-material/build.gradle
index 2c6e2ba..c8eda41 100644
--- a/wear/compose/compose-material/build.gradle
+++ b/wear/compose/compose-material/build.gradle
@@ -48,6 +48,8 @@
         androidTestImplementation project(":test:screenshot:screenshot")
         androidTestImplementation(libs.testRunner)
         androidTestImplementation(libs.truth)
+
+        samples(project(":wear:compose:compose-material-samples"))
     }
 }
 
diff --git a/wear/watchface/watchface-complications-data-source/build.gradle b/wear/watchface/watchface-complications-data-source/build.gradle
index a8a91a5..c7ef280 100644
--- a/wear/watchface/watchface-complications-data-source/build.gradle
+++ b/wear/watchface/watchface-complications-data-source/build.gradle
@@ -38,6 +38,8 @@
     testImplementation(libs.mockitoCore)
     testImplementation(libs.truth)
     testImplementation("junit:junit:4.13")
+
+    samples(project(":wear:watchface:watchface-complications-data-source-samples"))
 }
 
 android {
diff --git a/wear/watchface/watchface-editor/build.gradle b/wear/watchface/watchface-editor/build.gradle
index 64ef142..a5ba515 100644
--- a/wear/watchface/watchface-editor/build.gradle
+++ b/wear/watchface/watchface-editor/build.gradle
@@ -47,6 +47,8 @@
     androidTestImplementation(libs.kotlinCoroutinesTest)
     androidTestImplementation(libs.kotlinTest)
     androidTestImplementation(libs.truth)
+
+    samples(project(":wear:watchface:watchface-samples"))
 }
 
 android {
diff --git a/wear/watchface/watchface/build.gradle b/wear/watchface/watchface/build.gradle
index 8fb3261..49f809b 100644
--- a/wear/watchface/watchface/build.gradle
+++ b/wear/watchface/watchface/build.gradle
@@ -54,6 +54,8 @@
     testImplementation(libs.robolectric)
     testImplementation(libs.truth)
     testImplementation(libs.kotlinTest)
+
+    samples(project(":wear:watchface:watchface-samples"))
 }
 
 android {
diff --git a/wear/wear-input/build.gradle b/wear/wear-input/build.gradle
index aa5dc2e..47cd1be 100644
--- a/wear/wear-input/build.gradle
+++ b/wear/wear-input/build.gradle
@@ -38,6 +38,8 @@
 
     compileOnly(fileTree(dir: "../wear_stubs", include: ["com.google.android.wearable-stubs.jar"]))
     compileOnly(project(":annotation:annotation-sampled"))
+
+    samples(project(":wear:wear-input-samples"))
 }
 
 android {
diff --git a/window/window/build.gradle b/window/window/build.gradle
index 77bdc9b..29e3b06 100644
--- a/window/window/build.gradle
+++ b/window/window/build.gradle
@@ -74,6 +74,8 @@
     androidTestImplementation(libs.truth)
     androidTestImplementation(compileOnly(project(":window:window-extensions")))
     androidTestImplementation(compileOnly(project(":window:window-sidecar")))
+
+    samples(project(":window:window-samples"))
 }
 
 androidx {