Skip to content

Commit edf2aba

Browse files
authored
Update Wear Compose (#1624)
* Update Wear Compose * Update screenshots
1 parent 2953f6e commit edf2aba

File tree

109 files changed

+242
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+242
-231
lines changed

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ decompose = "3.4.0-alpha03"
2424
doistx-normalize = "1.2.0"
2525
essenty = "2.5.0"
2626
googleid = "1.1.1"
27-
horologist = "0.7.10-alpha"
27+
horologist = "0.7.14-beta"
2828
io-coil-kt = "2.7.0"
2929
io-coil3-kt = "3.2.0"
3030
kermit = "2.0.6"
@@ -46,7 +46,7 @@ room = "2.7.2"
4646
tiles-tooling-preview = "1.5.0"
4747
wear = "1.3.0"
4848
wear-watchface = "1.3.0-alpha07"
49-
wear-compose = "1.5.0-alpha12"
49+
wear-compose = "1.5.0-beta05"
5050
wearPhoneInteractions = "1.1.0"
5151
work-runtime-ktx = "2.10.2"
5252
spring = "3.5.3"
@@ -127,7 +127,7 @@ decompose-extensions-compose-experimental = { module = "com.arkivanov.decompose:
127127
doistx-normalize = { module = "com.doist.x:normalize", version.ref = "doistx-normalize" }
128128
essenty-lifecycle = { module = "com.arkivanov.essenty:lifecycle", version.ref = "essenty" }
129129
essenty-backhandler = { module = "com.arkivanov.essenty:back-handler", version.ref = "essenty" }
130-
desugar = "com.android.tools:desugar_jdk_libs:2.1.3"
130+
desugar = "com.android.tools:desugar_jdk_libs:2.1.5"
131131
firebase-admin = { module = "com.google.firebase:firebase-admin", version = "9.4.3" }
132132
firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
133133
firebase-auth = { module = "com.google.firebase:firebase-auth" }
@@ -195,7 +195,7 @@ plugin-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serializat
195195
plugin-kotlin-spring = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" }
196196
plugin-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
197197
plugin-spring-boot = { module = "org.springframework.boot:spring-boot-gradle-plugin", version = "3.4.4" }
198-
plugin-wire = { module = "com.squareup.wire:wire-gradle-plugin", version = "5.3.1" }
198+
plugin-wire = { module = "com.squareup.wire:wire-gradle-plugin", version = "5.3.3" }
199199
plugin-compose-multiplatform = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "compose-multiplatform" }
200200
roborazzi-gradle-plugin = { module = "io.github.takahirom.roborazzi:roborazzi-gradle-plugin", version.ref = "roborazzi" }
201201
scrimage-core = "com.sksamuel.scrimage:scrimage-core:4.3.2"
@@ -213,7 +213,7 @@ test-espressocore = "androidx.test.espresso:espresso-core:3.6.1"
213213
test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
214214
wear-complications-data = { module = "androidx.wear.watchface:watchface-complications-data-source-ktx", version.ref = "wear-watchface"}
215215
wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wear-compose"}
216-
wear-compose-material3 = "androidx.wear.compose:compose-material3:1.0.0-alpha35"
216+
wear-compose-material3 = { module = "androidx.wear.compose:compose-material3", version.ref = "wear-compose"}
217217
xoxo = "net.mbonnin.xoxo:xoxo:0.4.0"
218218
kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
219219
tink = "com.google.crypto.tink:tink:1.17.0"

wearApp/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ android {
8787
}
8888
}
8989

90-
kotlinOptions {
91-
freeCompilerArgs += "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi"
92-
freeCompilerArgs += "-opt-in=androidx.wear.compose.material.ExperimentalWearMaterialApi"
93-
}
94-
9590
buildTypes {
9691
getByName("release") {
9792
isShrinkResources = true
@@ -240,7 +235,6 @@ dependencies {
240235
testImplementation(libs.koin.test.junit4)
241236
testImplementation(libs.androidx.work.testing)
242237
testImplementation(libs.androidx.complications.rendering)
243-
testImplementation(libs.horologist.compose.tools)
244238
testImplementation(libs.horologist.roboscreenshots)
245239
testImplementation(libs.horologist.images.coil)
246240
testImplementation(libs.roborazzi)
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions
Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)