Skip to content

Commit 1cba249

Browse files
authored
Merge pull request #1636 from yschimke/bump_horologist_version
Update Horologist to v0.8.0-alpha and Wear Compose to v1.5.0-beta06
2 parents a29d2e6 + bb5722e commit 1cba249

File tree

3 files changed

+5
-17
lines changed

3 files changed

+5
-17
lines changed

build-logic/src/main/kotlin/Dependencies.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ object AndroidSdk {
88

99
object WearSdk {
1010
const val min = 26
11-
const val compile = 35
12-
const val target = 34
11+
const val compile = 36
12+
const val target = 35
1313
}
1414

1515
object AutomotiveSdk {

gradle/libs.versions.toml

Lines changed: 2 additions & 2 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.14-beta"
27+
horologist = "0.8.0-alpha"
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-beta05"
49+
wear-compose = "1.5.0-beta06"
5050
wearPhoneInteractions = "1.1.0"
5151
work-runtime-ktx = "2.10.2"
5252
spring = "3.5.3"

wearApp/src/main/java/dev/johnoreilly/confetti/wear/tile/TileSync.kt

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,6 @@ class TileSync(
2323
registry.dataClient
2424
.putDataItem(PutDataRequest.create("/tile_tracking_enabled")).await()
2525

26-
val myTilesList = listOf(
27-
CurrentSessionsTileService::class.java.name,
28-
)
29-
30-
val activeTiles = TileService.getActiveTilesAsync(context, executor).await()
31-
32-
for (tileName in myTilesList) {
33-
if (activeTiles.any { it.componentName.className == tileName }) {
34-
wearAppHelper.markTileAsInstalled(tileName)
35-
} else {
36-
wearAppHelper.markTileAsRemoved(tileName)
37-
}
38-
}
26+
wearAppHelper.updateInstalledTiles()
3927
}
4028
}

0 commit comments

Comments
 (0)