diff --git a/datalayer/watch/src/main/AndroidManifest.xml b/datalayer/watch/src/main/AndroidManifest.xml index 56b82dceeb..e8edd3d79c 100644 --- a/datalayer/watch/src/main/AndroidManifest.xml +++ b/datalayer/watch/src/main/AndroidManifest.xml @@ -26,7 +26,8 @@ androidx.wear.watchface.complications.datasource, androidx.wear.watchface.complications.datasource.ktx, androidx.wear.protolayout.expression, - androidx.wear.protolayout.expression.pipeline" + androidx.wear.protolayout.expression.pipeline, + androidx.wear.protolayout.materialcore" /> diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 333a9eb0b1..6b30d14cae 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ accompanist = "0.34.0" androidx-benchmark = "1.2.3" androidx-complications-data = "1.2.1" androidx-constraintlayout-compose = "1.0.1" -androidx-compose-material = "1.6.0" +androidx-compose-material = "1.6.1" androidx-concurrent = "1.1.0" androidx-datastore = "1.0.0" androidx-health-services = "1.0.0-rc01" @@ -18,22 +18,22 @@ androidx-wear-watchface = "1.2.1" androidxActivity = "1.8.2" androidxCore = "1.12.0" androidxLifecycle = "2.7.0" -androidxNavigation = "2.7.6" +androidxNavigation = "2.7.7" androidxPhoneInteractions = "1.1.0-alpha04" androidxRemoteInteractions = "1.1.0-alpha02" androidxStartup = "1.1.1" androidxTracing = "1.2.0" androidxWear = "1.3.0" androidxWork = "2.9.0" -androidxprotolayout = "1.0.0" -androidxtiles = "1.2.0" +androidxprotolayout = "1.1.0" +androidxtiles = "1.3.0" annotation = "1.0.1" app-cash-turbine = "1.0.0" com-squareup-okhttp3 = "4.12.0" com-squareup-retrofit2 = "2.9.0" -compose = "1.6.0" +compose = "1.6.1" compose-compiler = "1.5.6" -compose-material3 = "1.2.0-rc01" +compose-material3 = "1.2.0" composesnapshot = "-" dependencyAnalysis = "1.28.0" dokka = "1.9.10" @@ -48,7 +48,7 @@ ksp = "1.9.21-1.0.16" ktlint = "0.50.0" metalava = "0.3.5" moshi = "1.15.1" -okio = "3.7.0" +okio = "3.8.0" org-robolectric = "4.11.1" playServicesAuth = "20.7.0" protobuf = "3.25.2" @@ -141,7 +141,7 @@ coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "io-coil-kt" } com-squareup-okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "com-squareup-okhttp3" } com-squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3" } com-squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "com-squareup-okhttp3" } -compose-bom = "androidx.compose:compose-bom:2024.01.00" +compose-bom = "androidx.compose:compose-bom:2024.02.00" compose-foundation-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose-material" } compose-foundation-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose-material" } compose-material-iconscore = { module = "androidx.compose.material:material-icons-core", version.ref = "androidx-compose-material" } diff --git a/media/ui/src/main/AndroidManifest.xml b/media/ui/src/main/AndroidManifest.xml index 11eb53c088..f6e859b5c8 100644 --- a/media/ui/src/main/AndroidManifest.xml +++ b/media/ui/src/main/AndroidManifest.xml @@ -31,6 +31,7 @@ androidx.wear.watchface.complications.datasource.ktx, androidx.wear.watchface.complications.rendering, androidx.wear.protolayout.expression, - androidx.wear.protolayout.expression.pipeline" + androidx.wear.protolayout.expression.pipeline, + androidx.wear.protolayout.materialcore" /> diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_largeRound.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_largeRound.png index 6aa5fa1690..fe3bd00be7 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_largeRound.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_largeRound.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cd92b0acd26488a896d14f5cf86e336d3aff12eb36f7347c49454d4fb409990 -size 28826 +oid sha256:385c237703a2a5813069072c9d916e76ca03048810e3b8862bac884c0540739d +size 28848 diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_smallRound.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_smallRound.png index 25cfd13c8a..a2074e4d24 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_smallRound.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_smallRound.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d891f82b15a0a07765eaf37a120e8d980bbb93b7a5645817021aa218e4afe25 -size 23302 +oid sha256:7fcc9280f26fc01758d59409e690a5e9de34ff9642ecdf64731cbaca11db2fc9 +size 23409 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[0]_mobvoiticwatchpro5.png index 5a49b571b5..de2ecc029e 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[0]_mobvoiticwatchpro5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[0]_mobvoiticwatchpro5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2da1e8df56a98fef78e29fd33ec0992f02324aa7c5092ec0a0515bf2a21f0d8 -size 28645 +oid sha256:d5d4aab491d4b5413d8b382586801ecc04e1fe29a64fefcd05d99e2499012067 +size 28727 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[1]_samsunggalaxywatch5.png index 29f1de21c2..cd7639c15d 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[1]_samsunggalaxywatch5.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[1]_samsunggalaxywatch5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:672a457188ab3b1979d28ff55feb1cc75bd688c23cddfd34cde7586c922669b3 -size 26519 +oid sha256:55e7da0b46c40c0a72975f99547c15f92a19fa654f567ea8806480dfb6686952 +size 26643 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[2]_samsunggalaxywatch6large.png index 8619fd8bda..c8d63c1cc8 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[2]_samsunggalaxywatch6large.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[2]_samsunggalaxywatch6large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a398b3878f844a02d341e21ab565023b2c375637238a0727430a624c37e6b45 -size 30403 +oid sha256:2570d22dfce92690e8ca890e371e9dee82e201d1ec86c605a7b791889746cc30 +size 30434 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[3]_googlepixelwatch.png index 5c449e1132..41f1289a01 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[3]_googlepixelwatch.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[3]_googlepixelwatch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:101de3a05c5e2c81f69b878708700bcc5e2dfb165f469b3011364f0f53e0f331 -size 26127 +oid sha256:ab64d1912f8753dbd14b34aecd748a81f129f72e287aeedf19f96f13f04cb56b +size 26214 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[4]_genericsmallround.png index 5c449e1132..41f1289a01 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[4]_genericsmallround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[4]_genericsmallround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:101de3a05c5e2c81f69b878708700bcc5e2dfb165f469b3011364f0f53e0f331 -size 26127 +oid sha256:ab64d1912f8753dbd14b34aecd748a81f129f72e287aeedf19f96f13f04cb56b +size 26214 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[5]_genericlargeround.png index 090bdc4045..0a6cfe3951 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[5]_genericlargeround.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[5]_genericlargeround.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16a028420f07fb920ee994d93d4acf9a6277ca768ea3d01d157a2c47fa09249f -size 28321 +oid sha256:51f1942ad3e7a2d20319941d720c1de2eab8d64adb8f0e88e67cedb59f4f8c99 +size 28433 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[6]_smalldevicebigfonts.png index 009323284f..022b14ed2d 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[6]_smalldevicebigfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[6]_smalldevicebigfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7898fcd374c51af77ac3e8a4d3333c2a2d23c9cdd3ecc72fd8095a14205e17a6 -size 27696 +oid sha256:f7971666eb0e866655e46459ef7defa60b8945f343bb772effbb6ab67174660d +size 27684 diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[7]_largedevicesmallfonts.png index 988e22d96a..b562a47d9f 100644 --- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[7]_largedevicesmallfonts.png +++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[7]_largedevicesmallfonts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86e5ad60578e8e86a88a949b8523c044e1b0250b23a2b6e57e596cec9b823aef -size 28137 +oid sha256:8682ee6e3c2534a50b1e525637489605e8df928ca07d5a8ee84faced1d3f970d +size 28334 diff --git a/tiles/src/main/AndroidManifest.xml b/tiles/src/main/AndroidManifest.xml index 2d1ce3e898..ab58df9c51 100644 --- a/tiles/src/main/AndroidManifest.xml +++ b/tiles/src/main/AndroidManifest.xml @@ -34,5 +34,6 @@ androidx.wear.watchface.complications.datasource.ktx, androidx.wear.protolayout.expression, androidx.wear.protolayout.expression.pipeline, - androidx.wear.protolayout.renderer" /> + androidx.wear.protolayout.renderer, + androidx.wear.protolayout.materialcore" />