diff --git a/health-connect/HealthConnectSample/app/build.gradle b/health-connect/HealthConnectSample/app/build.gradle index 6e3d2e77..3391f464 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.06.00') + def composeBom = platform('androidx.compose:compose-bom:2024.08.00') implementation(composeBom) // For Health Connect diff --git a/health-platform-v1/HealthPlatformSample/app/build.gradle b/health-platform-v1/HealthPlatformSample/app/build.gradle index 235099a6..d7a42011 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.06.00') + def composeBom = platform('androidx.compose:compose-bom:2024.08.00') implementation(composeBom) // For Health Platform diff --git a/health-services/ExerciseSample/app/build.gradle b/health-services/ExerciseSample/app/build.gradle index 28141439..433a59f7 100644 --- a/health-services/ExerciseSample/app/build.gradle +++ b/health-services/ExerciseSample/app/build.gradle @@ -70,7 +70,7 @@ dependencies { // Health Services implementation 'androidx.health:health-services-client:1.0.0-rc02' // Used to bridge between Futures and coroutines - implementation 'com.google.guava:guava:33.2.1-android' + implementation 'com.google.guava:guava:33.3.0-android' implementation "androidx.concurrent:concurrent-futures-ktx:1.2.0" // Lifecycle diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml index d69d8f7a..053822ab 100644 --- a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml +++ b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] android-gradle-plugin = "8.5.2" androidx-activity = "1.9.1" -androidx-compose = "1.7.0-beta07" +androidx-compose = "1.7.0-rc01" androidx-lifecycle = "2.8.4" androidx-wear-compose = "1.3.1" core-splashscreen = "1.0.1" @@ -40,7 +40,7 @@ compose-wear-navigation = "androidx.wear.compose:compose-navigation:1.3.1" dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "dagger"} dagger-hilt-android-compiler = {module = "com.google.dagger:hilt-android-compiler", version.ref = "dagger"} desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.0.4" -guava = "com.google.guava:guava:33.2.1-android" +guava = "com.google.guava:guava:33.3.0-android" hilt-navigation-compose = "androidx.hilt:hilt-navigation-compose:1.2.0" horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" } horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" } diff --git a/health-services/MeasureData/app/build.gradle b/health-services/MeasureData/app/build.gradle index 7fbd5ba5..57ab3b8f 100644 --- a/health-services/MeasureData/app/build.gradle +++ b/health-services/MeasureData/app/build.gradle @@ -70,7 +70,7 @@ dependencies { // Health Services implementation 'androidx.health:health-services-client:1.0.0-rc02' // Used to bridge between Futures and coroutines - implementation 'com.google.guava:guava:33.2.1-android' + implementation 'com.google.guava:guava:33.3.0-android' implementation "androidx.concurrent:concurrent-futures-ktx:1.2.0" // Lifecycle diff --git a/health-services/MeasureDataCompose/gradle/libs.versions.toml b/health-services/MeasureDataCompose/gradle/libs.versions.toml index 8a56db91..53918ca4 100644 --- a/health-services/MeasureDataCompose/gradle/libs.versions.toml +++ b/health-services/MeasureDataCompose/gradle/libs.versions.toml @@ -4,10 +4,10 @@ android-gradle-plugin = "8.5.2" androidx-activity = "1.9.1" androidx-lifecycle = "2.8.4" androidx-wear-compose = "1.3.1" -compose = "1.7.0-beta07" +compose = "1.7.0-rc01" compose-compiler = "1.5.15" concurrent-futures = "1.2.0" -guava = "33.2.1-android" +guava = "33.3.0-android" health-services = "1.0.0-rc02" ktlint = "0.46.1" org-jetbrains-kotlin = "1.9.25" diff --git a/health-services/PassiveData/app/build.gradle b/health-services/PassiveData/app/build.gradle index 6056d481..ac2db762 100644 --- a/health-services/PassiveData/app/build.gradle +++ b/health-services/PassiveData/app/build.gradle @@ -68,7 +68,7 @@ dependencies { // Health Services implementation 'androidx.health:health-services-client:1.0.0-rc02' // Used to bridge between Futures and coroutines - implementation 'com.google.guava:guava:33.2.1-android' + implementation 'com.google.guava:guava:33.3.0-android' implementation "androidx.concurrent:concurrent-futures-ktx:1.2.0" // Datastore diff --git a/health-services/PassiveDataCompose/gradle/libs.versions.toml b/health-services/PassiveDataCompose/gradle/libs.versions.toml index 52409d3f..edb20f46 100644 --- a/health-services/PassiveDataCompose/gradle/libs.versions.toml +++ b/health-services/PassiveDataCompose/gradle/libs.versions.toml @@ -8,10 +8,10 @@ androidx-wear-compose = "1.3.1" androidx-wear-tiles = "1.0.1" androidx-wear-watchface = "1.0.1" androidx-work = "2.9.1" -compose = "1.7.0-beta07" +compose = "1.7.0-rc01" compose-compiler = "1.5.15" concurrent-futures = "1.2.0" -guava = "33.2.1-android" +guava = "33.3.0-android" health-services = "1.0.0-rc02" ktlint = "0.46.1" org-jetbrains-kotlin = "1.9.25" diff --git a/health-services/PassiveGoals/app/build.gradle b/health-services/PassiveGoals/app/build.gradle index 00a7e5d5..22c42e73 100644 --- a/health-services/PassiveGoals/app/build.gradle +++ b/health-services/PassiveGoals/app/build.gradle @@ -68,7 +68,7 @@ dependencies { // Health Services implementation 'androidx.health:health-services-client:1.0.0-rc02' // Used to bridge between Futures and coroutines - implementation 'com.google.guava:guava:33.2.1-android' + implementation 'com.google.guava:guava:33.3.0-android' implementation "androidx.concurrent:concurrent-futures-ktx:1.2.0" // Datastore diff --git a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml index 52409d3f..edb20f46 100644 --- a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml +++ b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml @@ -8,10 +8,10 @@ androidx-wear-compose = "1.3.1" androidx-wear-tiles = "1.0.1" androidx-wear-watchface = "1.0.1" androidx-work = "2.9.1" -compose = "1.7.0-beta07" +compose = "1.7.0-rc01" compose-compiler = "1.5.15" concurrent-futures = "1.2.0" -guava = "33.2.1-android" +guava = "33.3.0-android" health-services = "1.0.0-rc02" ktlint = "0.46.1" org-jetbrains-kotlin = "1.9.25"