Add explicit dependencies where needed
AGP has changed constraints behavior to not automatically
switch prebuilts dependencies to project dependencies
Bug: 270381735
Test: ./frameworks/support/busytown/androidx-studio-integration.sh now
passes
Change-Id: I73dd6048e0c9cfbc131722df8ce50ab485656383
diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle
index f4188d4..9ff943c 100644
--- a/compose/material3/material3/build.gradle
+++ b/compose/material3/material3/build.gradle
@@ -38,7 +38,7 @@
implementation(libs.kotlinStdlibCommon)
implementation("androidx.activity:activity-compose:1.5.0")
implementation("androidx.compose.animation:animation-core:1.3.1")
- implementation("androidx.compose.foundation:foundation-layout:1.3.1")
+ implementation(project(":compose:foundation:foundation-layout"))
implementation("androidx.compose.ui:ui-util:1.3.1")
api(project(":compose:foundation:foundation"))
api("androidx.compose.material:material-icons-core:1.3.1")
diff --git a/compose/material3/material3/samples/build.gradle b/compose/material3/material3/samples/build.gradle
index b2a7273..a8c9d7b 100644
--- a/compose/material3/material3/samples/build.gradle
+++ b/compose/material3/material3/samples/build.gradle
@@ -33,7 +33,7 @@
implementation("androidx.activity:activity-compose:1.5.0")
implementation("androidx.compose.animation:animation:1.2.1")
implementation("androidx.compose.foundation:foundation:1.2.1")
- implementation("androidx.compose.foundation:foundation-layout:1.2.1")
+ implementation(project(":compose:foundation:foundation-layout"))
implementation("androidx.compose.material:material:1.2.1")
implementation(project(":compose:material3:material3"))
implementation("androidx.compose.runtime:runtime:1.2.1")
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
index 664b125..9f12663 100644
--- a/room/integration-tests/kotlintestapp/build.gradle
+++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -92,6 +92,7 @@
kaptAndroidTestWithKapt(
project(path: ":room:room-compiler", configuration: "shadowAndImplementation")
)
+ androidTestImplementation(projectOrArtifact(":arch:core:core-runtime"))
androidTestImplementation(projectOrArtifact(":lifecycle:lifecycle-livedata-ktx"))
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
diff --git a/tv/tv-foundation/build.gradle b/tv/tv-foundation/build.gradle
index 874bc54..b37b380 100644
--- a/tv/tv-foundation/build.gradle
+++ b/tv/tv-foundation/build.gradle
@@ -40,7 +40,7 @@
api("androidx.compose.animation:animation:$composeVersion")
api("androidx.compose.runtime:runtime:$composeVersion")
- api("androidx.compose.foundation:foundation:$composeVersion")
+ api(project(":compose:foundation:foundation"))
api("androidx.compose.foundation:foundation-layout:$composeVersion")
api("androidx.compose.ui:ui-graphics:$composeVersion")
api("androidx.compose.ui:ui-text:$composeVersion")
