From ed88a67d3165acb2524ec029bc87b52c88ad4930 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 03:49:52 +0000 Subject: [PATCH 1/4] Update plugin com-diffplug-spotless 6.23.3 to v6.24.0 --- health-connect/HealthConnectSample/build.gradle | 2 +- health-services/MeasureDataCompose/gradle/libs.versions.toml | 2 +- health-services/PassiveDataCompose/gradle/libs.versions.toml | 2 +- health-services/PassiveGoalsCompose/gradle/libs.versions.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/health-connect/HealthConnectSample/build.gradle b/health-connect/HealthConnectSample/build.gradle index 8ccfd160..4b3e46de 100644 --- a/health-connect/HealthConnectSample/build.gradle +++ b/health-connect/HealthConnectSample/build.gradle @@ -39,7 +39,7 @@ buildscript { } plugins { - id "com.diffplug.spotless" version "6.23.3" + id "com.diffplug.spotless" version "6.24.0" } subprojects { diff --git a/health-services/MeasureDataCompose/gradle/libs.versions.toml b/health-services/MeasureDataCompose/gradle/libs.versions.toml index 42907936..9d084e39 100644 --- a/health-services/MeasureDataCompose/gradle/libs.versions.toml +++ b/health-services/MeasureDataCompose/gradle/libs.versions.toml @@ -31,5 +31,5 @@ wear-compose-material = { module = "androidx.wear.compose:compose-material", ver [plugins] com-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } -com-diffplug-spotless = "com.diffplug.spotless:6.23.3" +com-diffplug-spotless = "com.diffplug.spotless:6.24.0" org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin" } diff --git a/health-services/PassiveDataCompose/gradle/libs.versions.toml b/health-services/PassiveDataCompose/gradle/libs.versions.toml index 1d65db92..3ee67c8e 100644 --- a/health-services/PassiveDataCompose/gradle/libs.versions.toml +++ b/health-services/PassiveDataCompose/gradle/libs.versions.toml @@ -38,5 +38,5 @@ wear-compose-material = { module = "androidx.wear.compose:compose-material", ver [plugins] com-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } -com-diffplug-spotless = "com.diffplug.spotless:6.23.3" +com-diffplug-spotless = "com.diffplug.spotless:6.24.0" org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin" } diff --git a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml index 1d65db92..3ee67c8e 100644 --- a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml +++ b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml @@ -38,5 +38,5 @@ wear-compose-material = { module = "androidx.wear.compose:compose-material", ver [plugins] com-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } -com-diffplug-spotless = "com.diffplug.spotless:6.23.3" +com-diffplug-spotless = "com.diffplug.spotless:6.24.0" org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin" } From c466fba01ca2b682a1fc1cfd7188bd3343792de1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 02:08:43 +0000 Subject: [PATCH 2/4] Update all dependencies 0.5.18 to v0.5.19 --- health-services/ExerciseSampleCompose/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml index 168ef523..3150d6ae 100644 --- a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml +++ b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml @@ -7,7 +7,7 @@ androidx-wear-compose = "1.2.1" core-splashscreen = "1.0.1" dagger = "2.50" health-services = "1.0.0-rc01" -horologist = "0.5.18" +horologist = "0.5.19" org-jetbrains-kotlin = "1.9.21" [libraries] From 1034e7ee6b58f7d37cb7f8e53f887222f72e0c0c Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Fri, 19 Jan 2024 17:15:29 +0000 Subject: [PATCH 3/4] Fixes --- health-services/ExerciseSampleCompose/app/build.gradle | 2 ++ health-services/ExerciseSampleCompose/gradle/libs.versions.toml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/health-services/ExerciseSampleCompose/app/build.gradle b/health-services/ExerciseSampleCompose/app/build.gradle index c19a4832..92f638ac 100644 --- a/health-services/ExerciseSampleCompose/app/build.gradle +++ b/health-services/ExerciseSampleCompose/app/build.gradle @@ -43,6 +43,7 @@ android { compileOptions { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 + coreLibraryDesugaringEnabled true } kotlinOptions { jvmTarget = JavaVersion.VERSION_17.majorVersion @@ -115,6 +116,7 @@ dependencies { implementation libs.dagger.hilt.android kapt libs.dagger.hilt.android.compiler + coreLibraryDesugaring(libs.desugar.jdk.libs) // Testing testImplementation libs.junit diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml index 3150d6ae..2ea18ce5 100644 --- a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml +++ b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml @@ -6,6 +6,7 @@ androidx-lifecycle = "2.7.0" androidx-wear-compose = "1.2.1" core-splashscreen = "1.0.1" dagger = "2.50" +desugar_jdk_libs = "2.0.4" health-services = "1.0.0-rc01" horologist = "0.5.19" org-jetbrains-kotlin = "1.9.21" @@ -34,6 +35,7 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" compose-wear-navigation = "androidx.wear.compose:compose-navigation:1.2.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 = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" } guava = "com.google.guava:guava:33.0.0-android" hilt-navigation-compose = "androidx.hilt:hilt-navigation-compose:1.1.0" horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" } From 1a5db40952a37ab20c5f5654f8c06c6658037c52 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Fri, 19 Jan 2024 17:25:12 +0000 Subject: [PATCH 4/4] Fixes --- .../ExerciseSampleCompose/gradle/libs.versions.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml index 2ea18ce5..f17a230a 100644 --- a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml +++ b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml @@ -6,7 +6,6 @@ androidx-lifecycle = "2.7.0" androidx-wear-compose = "1.2.1" core-splashscreen = "1.0.1" dagger = "2.50" -desugar_jdk_libs = "2.0.4" health-services = "1.0.0-rc01" horologist = "0.5.19" org-jetbrains-kotlin = "1.9.21" @@ -35,7 +34,7 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" compose-wear-navigation = "androidx.wear.compose:compose-navigation:1.2.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 = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" } +desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.0.4" guava = "com.google.guava:guava:33.0.0-android" hilt-navigation-compose = "androidx.hilt:hilt-navigation-compose:1.1.0" horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }