Merge branch 'main' into integrate-flp

android · Jan 23, 2024 · d707a17 · d707a17
2 parents 343a5a3 + 14920ed
commit d707a17
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git 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/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
@@ -118,6 +119,8 @@ dependencies {
   implementation libs.dagger.hilt.android
   kapt libs.dagger.hilt.android.compiler
 
+  coreLibraryDesugaring(libs.desugar.jdk.libs)
+
   // Testing
   testImplementation libs.junit
   androidTestImplementation libs.test.ext.junit

diff --git 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]
@@ -34,6 +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 = "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" }

diff --git 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
@@ -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
@@ -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" }