Skip to content

Commit b91b922

Browse files
committed
Update to 1.5.0-beta01
1 parent 187d70f commit b91b922

File tree

11 files changed

+833
-81
lines changed

11 files changed

+833
-81
lines changed

gradle/libs.versions.toml

Lines changed: 40 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,69 @@
11
[versions]
22
accompanist = "0.36.0"
3-
activityKtx = "1.10.1"
4-
android-googleid = "1.1.1"
5-
androidGradlePlugin = "8.10.0"
6-
androidx-activity-compose = "1.10.1"
3+
androidGradlePlugin = "8.8.1"
4+
androidx-activity-compose = "1.10.0"
75
androidx-appcompat = "1.7.0"
8-
androidx-compose-bom = "2025.05.00"
6+
androidx-compose-bom = "2025.02.00"
97
androidx-compose-ui-test = "1.7.0-alpha08"
10-
androidx-compose-ui-test-junit4-accessibility = "1.9.0-alpha02"
11-
androidx-constraintlayout = "2.2.1"
12-
androidx-constraintlayout-compose = "1.1.1"
13-
androidx-coordinator-layout = "1.3.0"
14-
androidx-corektx = "1.16.0"
15-
androidx-credentials = "1.5.0"
16-
androidx-credentials-play-services-auth = "1.5.0"
8+
androidx-constraintlayout = "2.2.0"
9+
androidx-constraintlayout-compose = "1.1.0"
10+
androidx-coordinator-layout = "1.2.0"
11+
androidx-corektx = "1.15.0"
1712
androidx-emoji2-views = "1.5.0"
1813
androidx-fragment-ktx = "1.8.6"
1914
androidx-glance-appwidget = "1.1.1"
20-
androidx-lifecycle-compose = "2.9.0"
21-
androidx-lifecycle-runtime-compose = "2.9.0"
22-
androidx-navigation = "2.9.0"
15+
androidx-lifecycle-compose = "2.8.7"
16+
androidx-lifecycle-runtime-compose = "2.8.7"
17+
androidx-navigation = "2.8.7"
2318
androidx-paging = "3.3.6"
24-
androidx-startup-runtime = "1.2.0"
2519
androidx-test = "1.6.1"
2620
androidx-test-espresso = "3.6.1"
27-
androidx-test-junit = "1.2.1"
28-
androidx-window = "1.5.0-alpha02"
29-
androidx-window-core = "1.5.0-alpha02"
30-
androidx-window-java = "1.5.0-alpha02"
31-
# @keep
32-
androidx-xr = "1.0.0-alpha03"
21+
androidx-window = "1.4.0-beta02"
3322
androidxHiltNavigationCompose = "1.2.0"
34-
appcompat = "1.7.0"
3523
coil = "2.7.0"
3624
# @keep
3725
compileSdk = "35"
38-
compose-latest = "1.8.1"
26+
compose-latest = "1.7.8"
3927
composeUiTooling = "1.4.1"
4028
coreSplashscreen = "1.0.1"
41-
coroutines = "1.10.2"
29+
coroutines = "1.10.1"
4230
glide = "1.0.0-beta01"
43-
google-maps = "19.2.0"
31+
google-maps = "19.0.0"
4432
gradle-versions = "0.52.0"
45-
guava = "33.4.8-jre"
46-
hilt = "2.56.2"
47-
horologist = "0.6.23"
33+
guava = "33.4.0-jre"
34+
hilt = "2.55"
35+
horologist = "0.7.10-alpha"
4836
junit = "4.13.2"
49-
kotlin = "2.1.20"
50-
kotlinCoroutinesOkhttp = "1.0"
51-
kotlinxCoroutinesGuava = "1.10.2"
52-
kotlinxSerializationJson = "1.8.1"
53-
ksp = "2.1.20-2.0.1"
54-
maps-compose = "6.6.0"
55-
material = "1.13.0-alpha13"
56-
material3-adaptive = "1.1.0"
57-
material3-adaptive-navigation-suite = "1.3.2"
58-
media3 = "1.6.1"
37+
kotlin = "2.1.10"
38+
kotlinxSerializationJson = "1.8.0"
39+
ksp = "2.1.10-1.0.30"
40+
maps-compose = "6.4.4"
41+
material = "1.13.0-alpha10"
42+
material3-adaptive = "1.0.0"
43+
material3-adaptive-navigation-suite = "1.3.1"
44+
media3 = "1.5.1"
5945
# @keep
6046
minSdk = "21"
61-
okHttp = "4.12.0"
6247
playServicesWearable = "19.0.0"
63-
protolayout = "1.2.1"
48+
protolayout = "1.3.0-beta02"
6449
recyclerview = "1.4.0"
6550
# @keep
66-
androidx-xr-arcore = "1.0.0-alpha04"
67-
androidx-xr-scenecore = "1.0.0-alpha04"
68-
androidx-xr-compose = "1.0.0-alpha04"
6951
targetSdk = "34"
70-
tiles = "1.4.1"
71-
version-catalog-update = "1.0.0"
52+
tiles = "1.5.0-beta01"
53+
version-catalog-update = "0.8.5"
7254
wear = "1.3.0"
73-
wearComposeFoundation = "1.4.1"
74-
wearComposeMaterial = "1.4.1"
55+
wearComposeFoundation = "1.5.0-beta01"
56+
wearComposeMaterial = "1.5.0-beta01"
57+
wearComposeMaterial3 = "1.5.0-beta01"
7558
wearToolingPreview = "1.0.0"
76-
webkit = "1.13.0"
7759

7860
[libraries]
79-
accompanist-adaptive = "com.google.accompanist:accompanist-adaptive:0.37.3"
80-
accompanist-permissions = "com.google.accompanist:accompanist-permissions:0.37.3"
61+
accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
62+
accompanist-permissions = "com.google.accompanist:accompanist-permissions:0.37.0"
8163
accompanist-theme-adapter-appcompat = { module = "com.google.accompanist:accompanist-themeadapter-appcompat", version.ref = "accompanist" }
8264
accompanist-theme-adapter-material = { module = "com.google.accompanist:accompanist-themeadapter-material", version.ref = "accompanist" }
8365
accompanist-theme-adapter-material3 = { module = "com.google.accompanist:accompanist-themeadapter-material3", version.ref = "accompanist" }
84-
android-identity-googleid = { module = "com.google.android.libraries.identity.googleid:googleid", version.ref = "android-googleid" }
8566
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
86-
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
8767
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
8868
androidx-compose-animation-graphics = { module = "androidx.compose.animation:animation-graphics", version.ref = "compose-latest" }
8969
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
@@ -102,9 +82,8 @@ androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime
10282
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-latest" }
10383
androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" }
10484
androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
105-
androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test", version.ref = "compose-latest" }
106-
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose-latest" }
107-
androidx-compose-ui-test-junit4-accessibility = { module = "androidx.compose.ui:ui-test-junit4-accessibility", version.ref = "androidx-compose-ui-test-junit4-accessibility" }
85+
androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test" }
86+
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
10887
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
10988
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
11089
androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
@@ -115,8 +94,6 @@ androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constr
11594
androidx-coordinator-layout = { module = "androidx.coordinatorlayout:coordinatorlayout", version.ref = "androidx-coordinator-layout" }
11695
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" }
11796
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
118-
androidx-credentials = { module = "androidx.credentials:credentials", version.ref = "androidx-credentials" }
119-
androidx-credentials-play-services-auth = { module = "androidx.credentials:credentials-play-services-auth", version.ref = "androidx-credentials-play-services-auth" }
12097
androidx-emoji2-views = { module = "androidx.emoji2:emoji2-views", version.ref = "androidx-emoji2-views" }
12198
androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment-ktx" }
12299
androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance-appwidget" }
@@ -135,11 +112,10 @@ androidx-paging-compose = { module = "androidx.paging:paging-compose", version.r
135112
androidx-protolayout = { module = "androidx.wear.protolayout:protolayout", version.ref = "protolayout" }
136113
androidx-protolayout-expression = { module = "androidx.wear.protolayout:protolayout-expression", version.ref = "protolayout" }
137114
androidx-protolayout-material = { module = "androidx.wear.protolayout:protolayout-material", version.ref = "protolayout" }
115+
androidx-protolayout-material3 = { module = "androidx.wear.protolayout:protolayout-material3", version.ref = "protolayout" }
138116
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
139-
androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "androidx-startup-runtime" }
140117
androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
141118
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
142-
androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
143119
androidx-test-runner = "androidx.test:runner:1.6.2"
144120
androidx-tiles = { module = "androidx.wear.tiles:tiles", version.ref = "tiles" }
145121
androidx-tiles-renderer = { module = "androidx.wear.tiles:tiles-renderer", version.ref = "tiles" }
@@ -148,18 +124,11 @@ androidx-tiles-tooling = { module = "androidx.wear.tiles:tiles-tooling", version
148124
androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tiles" }
149125
androidx-wear = { module = "androidx.wear:wear", version.ref = "wear" }
150126
androidx-wear-tooling-preview = { module = "androidx.wear:wear-tooling-preview", version.ref = "wearToolingPreview" }
151-
androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" }
152-
androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" }
153-
androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window-core" }
154-
androidx-window-java = { module = "androidx.window:window-java", version.ref = "androidx-window-java" }
155-
androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.10.1"
156-
androidx-xr-arcore = { module = "androidx.xr.arcore:arcore", version.ref = "androidx-xr-arcore" }
157-
androidx-xr-compose = { module = "androidx.xr.compose:compose", version.ref = "androidx-xr-compose" }
158-
androidx-xr-scenecore = { module = "androidx.xr.scenecore:scenecore", version.ref = "androidx-xr-scenecore" }
159-
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
127+
androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window" }
128+
androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.10.0"
160129
coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
161130
compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "wearComposeFoundation" }
162-
compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
131+
wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
163132
compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "composeUiTooling" }
164133
glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glide" }
165134
google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
@@ -171,14 +140,12 @@ hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.re
171140
horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
172141
horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" }
173142
junit = { module = "junit:junit", version.ref = "junit" }
174-
kotlin-coroutines-okhttp = { module = "ru.gildor.coroutines:kotlin-coroutines-okhttp", version.ref = "kotlinCoroutinesOkhttp" }
175143
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
176144
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
177-
kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "kotlinxCoroutinesGuava" }
178145
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
179146
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
180-
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okHttp" }
181147
play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "playServicesWearable" }
148+
wear-compose-material3 = { module = "androidx.wear.compose:compose-material3", version.ref = "wearComposeMaterial3" }
182149

183150
[plugins]
184151
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

wear/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ dependencies {
5959
implementation(libs.androidx.wear)
6060
implementation(libs.androidx.protolayout)
6161
implementation(libs.androidx.protolayout.material)
62+
implementation(libs.androidx.protolayout.material3)
6263
implementation(libs.androidx.protolayout.expression)
6364
debugImplementation(libs.androidx.tiles.renderer)
6465
testImplementation(libs.androidx.tiles.testing)
@@ -69,7 +70,8 @@ dependencies {
6970
implementation(platform(libs.androidx.compose.bom))
7071
implementation(libs.androidx.compose.ui)
7172
implementation(libs.androidx.compose.ui.tooling.preview)
72-
implementation(libs.compose.material)
73+
implementation(libs.wear.compose.material)
74+
implementation(libs.wear.compose.material3)
7375
implementation(libs.compose.foundation)
7476
implementation(libs.androidx.activity.compose)
7577
implementation(libs.androidx.core.splashscreen)

wear/src/main/AndroidManifest.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
android:value="true" />
2525

2626
<activity
27-
android:name=".snippets.MainActivity"
27+
android:name=".snippets.m3.MainActivity"
2828
android:exported="true"
2929
android:taskAffinity=""
3030
android:theme="@android:style/Theme.DeviceDefault">
@@ -52,6 +52,23 @@
5252
</service>
5353
<!-- [END android_wear_tile_manifest] -->
5454

55+
<!-- [START android_wear_m3_tile_manifest] -->
56+
<service
57+
android:name=".snippets.m3.tile.MyTileService"
58+
android:label="@string/tile_label"
59+
android:description="@string/tile_description"
60+
android:icon="@mipmap/ic_launcher"
61+
android:exported="true"
62+
android:permission="com.google.android.wearable.permission.BIND_TILE_PROVIDER">
63+
<intent-filter>
64+
<action android:name="androidx.wear.tiles.action.BIND_TILE_PROVIDER" />
65+
</intent-filter>
66+
67+
<meta-data android:name="androidx.wear.tiles.PREVIEW"
68+
android:resource="@drawable/tile_preview" />
69+
</service>
70+
<!-- [END android_wear_m3_tile_manifest] -->
71+
5572
</application>
5673

5774
</manifest>
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* Copyright 2021 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.example.wear.snippets.m3
18+
19+
import android.os.Bundle
20+
import androidx.activity.ComponentActivity
21+
import androidx.activity.compose.setContent
22+
import androidx.compose.runtime.Composable
23+
import com.example.wear.snippets.m3.list.ComposeList
24+
25+
class MainActivity : ComponentActivity() {
26+
override fun onCreate(savedInstanceState: Bundle?) {
27+
super.onCreate(savedInstanceState)
28+
29+
setContent {
30+
WearApp()
31+
}
32+
}
33+
}
34+
35+
@Composable
36+
fun WearApp() {
37+
// insert here the snippet you want to test
38+
ComposeList()
39+
}

0 commit comments

Comments
 (0)