Merge "Bump some dependencies to allow pruning old prebuilts" into androidx-main
diff --git a/camera/integration-tests/avsynctestapp/build.gradle b/camera/integration-tests/avsynctestapp/build.gradle
index 0f4683f..3fa42bc 100644
--- a/camera/integration-tests/avsynctestapp/build.gradle
+++ b/camera/integration-tests/avsynctestapp/build.gradle
@@ -47,7 +47,7 @@
implementation(project(":camera:camera-video"))
// Compose
- def compose_version = "1.1.1"
+ def compose_version = "1.4.0"
implementation("androidx.activity:activity-compose:1.5.0-alpha03")
implementation("androidx.compose.material:material:$compose_version")
implementation("androidx.compose.ui:ui:$compose_version")
diff --git a/camera/integration-tests/uiwidgetstestapp/build.gradle b/camera/integration-tests/uiwidgetstestapp/build.gradle
index 8b4532c..dfa51fa 100644
--- a/camera/integration-tests/uiwidgetstestapp/build.gradle
+++ b/camera/integration-tests/uiwidgetstestapp/build.gradle
@@ -89,13 +89,13 @@
// Compose
implementation 'androidx.activity:activity-compose:1.4.0'
- implementation 'androidx.compose.material:material:1.1.1'
- implementation 'androidx.compose.animation:animation:1.1.1'
- implementation 'androidx.compose.runtime:runtime:1.1.1'
- implementation 'androidx.compose.ui:ui-tooling:1.1.1'
+ implementation 'androidx.compose.material:material:1.4.0'
+ implementation 'androidx.compose.animation:animation:1.4.0'
+ implementation 'androidx.compose.runtime:runtime:1.4.0'
+ implementation 'androidx.compose.ui:ui-tooling:1.4.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1'
implementation 'androidx.navigation:navigation-compose:2.4.2'
- implementation 'androidx.compose.material:material-icons-extended:1.1.1'
+ implementation 'androidx.compose.material:material-icons-extended:1.4.0'
androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.1.1'
// Testing framework
diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle
index e20e292..6903dea 100644
--- a/camera/integration-tests/viewtestapp/build.gradle
+++ b/camera/integration-tests/viewtestapp/build.gradle
@@ -83,9 +83,9 @@
// Compose UI
implementation(project(":compose:runtime:runtime"))
- implementation("androidx.compose.ui:ui:1.0.5")
- implementation("androidx.compose.material:material:1.0.5")
- implementation("androidx.compose.ui:ui-tooling:1.0.5")
+ implementation("androidx.compose.ui:ui:1.4.0")
+ implementation("androidx.compose.material:material:1.4.0")
+ implementation("androidx.compose.ui:ui-tooling:1.4.0")
implementation("androidx.activity:activity-compose:1.3.1")
// Testing framework
diff --git a/compose/material3/material3/samples/build.gradle b/compose/material3/material3/samples/build.gradle
index 76cd811..075b5f4 100644
--- a/compose/material3/material3/samples/build.gradle
+++ b/compose/material3/material3/samples/build.gradle
@@ -35,7 +35,7 @@
implementation(project(":compose:foundation:foundation"))
implementation(project(":compose:foundation:foundation-layout"))
implementation("androidx.compose.material:material:1.2.1")
- implementation("androidx.compose.material:material-icons-extended:1.2.1")
+ implementation("androidx.compose.material:material-icons-extended:1.4.0")
implementation(project(":compose:material3:material3"))
implementation("androidx.compose.runtime:runtime:1.2.1")
implementation("androidx.compose.ui:ui:1.2.1")
diff --git a/glance/glance-appwidget/integration-tests/demos/build.gradle b/glance/glance-appwidget/integration-tests/demos/build.gradle
index e372ce9..c38f05a 100644
--- a/glance/glance-appwidget/integration-tests/demos/build.gradle
+++ b/glance/glance-appwidget/integration-tests/demos/build.gradle
@@ -31,11 +31,10 @@
implementation(project(":glance:glance-material3"))
implementation("androidx.activity:activity:1.4.0")
implementation("androidx.activity:activity-compose:1.4.0")
- implementation("androidx.compose.material:material:1.1.0-beta02")
implementation("androidx.compose.ui:ui:1.1.0-beta02")
implementation("androidx.compose.foundation:foundation:1.1.0-beta02")
implementation("androidx.compose.foundation:foundation-layout:1.1.0-beta02")
- implementation("androidx.compose.material:material:1.1.0-beta02")
+ implementation("androidx.compose.material:material:1.4.0")
implementation("androidx.datastore:datastore-preferences-core:1.0.0")
implementation("androidx.datastore:datastore-preferences:1.0.0")
implementation "androidx.compose.material3:material3:1.0.0"
diff --git a/glance/glance-template/integration-tests/template-demos/build.gradle b/glance/glance-template/integration-tests/template-demos/build.gradle
index e4f4972..1ae4ff0 100644
--- a/glance/glance-template/integration-tests/template-demos/build.gradle
+++ b/glance/glance-template/integration-tests/template-demos/build.gradle
@@ -32,14 +32,14 @@
implementation(project(":glance:glance-material3"))
implementation("androidx.activity:activity:1.4.0")
implementation("androidx.activity:activity-compose:1.4.0")
- implementation("androidx.compose.material:material:1.1.0-beta02")
+ implementation("androidx.compose.material:material:1.4.0")
implementation("androidx.compose.ui:ui:1.1.0-beta02")
implementation("androidx.compose.foundation:foundation:1.1.0-beta02")
implementation("androidx.compose.foundation:foundation-layout:1.1.0-beta02")
implementation("androidx.compose.material:material:1.1.0-beta02")
implementation("androidx.datastore:datastore-preferences-core:1.0.0")
implementation("androidx.datastore:datastore-preferences:1.0.0")
- implementation "androidx.compose.material3:material3:1.0.0"
+ implementation("androidx.compose.material3:material3:1.0.0")
}
android {
diff --git a/graphics/integration-tests/testapp-compose/build.gradle b/graphics/integration-tests/testapp-compose/build.gradle
index 840935f..5e3f520 100644
--- a/graphics/integration-tests/testapp-compose/build.gradle
+++ b/graphics/integration-tests/testapp-compose/build.gradle
@@ -32,7 +32,7 @@
implementation("androidx.appcompat:appcompat:1.5.1")
implementation("androidx.compose.foundation:foundation:1.3.1")
implementation("androidx.compose.foundation:foundation-layout:1.3.1")
- implementation("androidx.compose.material:material:1.3.1")
+ implementation("androidx.compose.material:material:1.4.0")
implementation("androidx.compose.runtime:runtime:1.3.3")
implementation("androidx.compose.ui:ui:1.3.3")
implementation("androidx.core:core-ktx:1.9.0")
