From 7c350f12d8da3f37f824d1255a2c7eb76ee01ee6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:20:24 +0000 Subject: [PATCH 1/2] Update all dependencies --- health-connect/HealthConnectSample/app/build.gradle | 2 +- health-connect/HealthConnectSample/build.gradle | 2 +- health-platform-v1/HealthPlatformSample/app/build.gradle | 2 +- health-platform-v1/HealthPlatformSample/build.gradle | 2 +- health-services/ExerciseSample/app/build.gradle | 4 ++-- .../ExerciseSampleCompose/gradle/libs.versions.toml | 8 ++++---- .../MeasureDataCompose/gradle/libs.versions.toml | 2 +- .../PassiveDataCompose/gradle/libs.versions.toml | 2 +- .../PassiveGoalsCompose/gradle/libs.versions.toml | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/health-connect/HealthConnectSample/app/build.gradle b/health-connect/HealthConnectSample/app/build.gradle index d7bdee51..469c3a55 100644 --- a/health-connect/HealthConnectSample/app/build.gradle +++ b/health-connect/HealthConnectSample/app/build.gradle @@ -65,7 +65,7 @@ android { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.01.00') + def composeBom = platform('androidx.compose:compose-bom:2024.02.00') implementation(composeBom) // For Health Connect diff --git a/health-connect/HealthConnectSample/build.gradle b/health-connect/HealthConnectSample/build.gradle index ba93eda0..df922256 100644 --- a/health-connect/HealthConnectSample/build.gradle +++ b/health-connect/HealthConnectSample/build.gradle @@ -19,7 +19,7 @@ buildscript { ext { activity_compose_version = '1.8.2' hilt_navigation_compose_version = '1.0.0' - navigation_compose_version = '2.7.6' + navigation_compose_version = '2.7.7' concurrent_futures_version = '1.1.0' health_connect_version = '1.1.0-alpha07' diff --git a/health-platform-v1/HealthPlatformSample/app/build.gradle b/health-platform-v1/HealthPlatformSample/app/build.gradle index 37ddeb40..a1009d34 100644 --- a/health-platform-v1/HealthPlatformSample/app/build.gradle +++ b/health-platform-v1/HealthPlatformSample/app/build.gradle @@ -70,7 +70,7 @@ android { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.01.00') + def composeBom = platform('androidx.compose:compose-bom:2024.02.00') implementation(composeBom) // For Health Platform diff --git a/health-platform-v1/HealthPlatformSample/build.gradle b/health-platform-v1/HealthPlatformSample/build.gradle index 3c4f181d..8656249c 100644 --- a/health-platform-v1/HealthPlatformSample/build.gradle +++ b/health-platform-v1/HealthPlatformSample/build.gradle @@ -19,7 +19,7 @@ buildscript { ext { activity_compose_version = '1.8.2' hilt_navigation_compose_version = '1.1.0' - navigation_compose_version = '2.7.6' + navigation_compose_version = '2.7.7' concurrent_futures_version = '1.1.0' health_platform_version = '1.0.0-alpha01' diff --git a/health-services/ExerciseSample/app/build.gradle b/health-services/ExerciseSample/app/build.gradle index 03b5f49f..0fffa332 100644 --- a/health-services/ExerciseSample/app/build.gradle +++ b/health-services/ExerciseSample/app/build.gradle @@ -81,8 +81,8 @@ dependencies { implementation 'com.google.android.material:material:1.11.0' // Navigation - implementation "androidx.navigation:navigation-fragment-ktx:2.7.6" - implementation "androidx.navigation:navigation-ui-ktx:2.7.6" + implementation "androidx.navigation:navigation-fragment-ktx:2.7.7" + implementation "androidx.navigation:navigation-ui-ktx:2.7.7" // Ongoing Activity. implementation "androidx.wear:wear-ongoing:1.0.0" diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml index 5cbe4035..0da4cb83 100644 --- a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml +++ b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml @@ -1,20 +1,20 @@ [versions] android-gradle-plugin = "8.2.2" androidx-activity = "1.8.2" -androidx-compose = "1.6.0" +androidx-compose = "1.6.1" androidx-lifecycle = "2.7.0" androidx-wear-compose = "1.3.0" core-splashscreen = "1.0.1" dagger = "2.50" health-services = "1.0.0-rc01" -horologist = "0.5.20" +horologist = "0.5.21" org-jetbrains-kotlin = "1.9.21" [libraries] android-lint-gradle = "com.android.tools.lint:lint-gradle:31.2.2" androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } -androidx-compose-navigation = "androidx.navigation:navigation-compose:2.7.6" -androidx-compose-runtime = "androidx.compose.runtime:runtime:1.6.0" +androidx-compose-navigation = "androidx.navigation:navigation-compose:2.7.7" +androidx-compose-runtime = "androidx.compose.runtime:runtime:1.6.1" androidx-compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "androidx-wear-compose" } androidx-concurrent = "androidx.concurrent:concurrent-futures-ktx:1.1.0" androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "core-splashscreen" } diff --git a/health-services/MeasureDataCompose/gradle/libs.versions.toml b/health-services/MeasureDataCompose/gradle/libs.versions.toml index 19ffd127..70b0b09e 100644 --- a/health-services/MeasureDataCompose/gradle/libs.versions.toml +++ b/health-services/MeasureDataCompose/gradle/libs.versions.toml @@ -4,7 +4,7 @@ android-gradle-plugin = "8.2.2" androidx-activity = "1.8.2" androidx-lifecycle = "2.7.0" androidx-wear-compose = "1.3.0" -compose = "1.6.0" +compose = "1.6.1" compose-compiler = "1.5.7" concurrent-futures = "1.1.0" guava = "33.0.0-android" diff --git a/health-services/PassiveDataCompose/gradle/libs.versions.toml b/health-services/PassiveDataCompose/gradle/libs.versions.toml index 751f15bb..70f36500 100644 --- a/health-services/PassiveDataCompose/gradle/libs.versions.toml +++ b/health-services/PassiveDataCompose/gradle/libs.versions.toml @@ -8,7 +8,7 @@ androidx-wear-compose = "1.3.0" androidx-wear-tiles = "1.0.1" androidx-wear-watchface = "1.0.1" androidx-work = "2.9.0" -compose = "1.6.0" +compose = "1.6.1" compose-compiler = "1.5.7" concurrent-futures = "1.1.0" guava = "33.0.0-android" diff --git a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml index 751f15bb..70f36500 100644 --- a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml +++ b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml @@ -8,7 +8,7 @@ androidx-wear-compose = "1.3.0" androidx-wear-tiles = "1.0.1" androidx-wear-watchface = "1.0.1" androidx-work = "2.9.0" -compose = "1.6.0" +compose = "1.6.1" compose-compiler = "1.5.7" concurrent-futures = "1.1.0" guava = "33.0.0-android" From 51d15a062a1b6e698ffa51ef994a082472492e2b Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Tue, 13 Feb 2024 15:59:36 +0000 Subject: [PATCH 2/2] Updates --- .../presentation/dialogs/ExerciseInProgressAlert.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/dialogs/ExerciseInProgressAlert.kt b/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/dialogs/ExerciseInProgressAlert.kt index 9e0d849f..716ad6ee 100644 --- a/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/dialogs/ExerciseInProgressAlert.kt +++ b/health-services/ExerciseSampleCompose/app/src/main/java/com/example/exercisesamplecompose/presentation/dialogs/ExerciseInProgressAlert.kt @@ -19,7 +19,6 @@ package com.example.exercisesamplecompose.presentation.dialogs import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices import com.example.exercisesamplecompose.R import com.google.android.horologist.annotations.ExperimentalHorologistApi @@ -35,8 +34,8 @@ fun ExerciseInProgressAlert( AlertDialog( title = stringResource(id = R.string.exercise_in_progress), message = stringResource(id = R.string.ending_continue), - onCancelButtonClick = onNegative, - onOKButtonClick = onPositive, + onCancel = onNegative, + onOk = onPositive, showDialog = showDialog, ) }