diff --git a/health-connect/HealthConnectSample/app/build.gradle b/health-connect/HealthConnectSample/app/build.gradle
index 3391f464..b3a8b200 100644
--- a/health-connect/HealthConnectSample/app/build.gradle
+++ b/health-connect/HealthConnectSample/app/build.gradle
@@ -96,5 +96,5 @@ dependencies {
 
     debugImplementation "androidx.compose.ui:ui-tooling"
 
-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.1"
 }
\ No newline at end of file
diff --git a/health-connect/HealthConnectSample/build.gradle b/health-connect/HealthConnectSample/build.gradle
index 253cd61d..11b39c78 100644
--- a/health-connect/HealthConnectSample/build.gradle
+++ b/health-connect/HealthConnectSample/build.gradle
@@ -30,7 +30,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/health-platform-v1/HealthPlatformSample/app/build.gradle b/health-platform-v1/HealthPlatformSample/app/build.gradle
index d7a42011..cf00b79a 100644
--- a/health-platform-v1/HealthPlatformSample/app/build.gradle
+++ b/health-platform-v1/HealthPlatformSample/app/build.gradle
@@ -97,5 +97,5 @@ dependencies {
 
     debugImplementation "androidx.compose.ui:ui-tooling"
 
-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.1"
 }
\ No newline at end of file
diff --git a/health-platform-v1/HealthPlatformSample/build.gradle b/health-platform-v1/HealthPlatformSample/build.gradle
index 240ba735..28db10e6 100644
--- a/health-platform-v1/HealthPlatformSample/build.gradle
+++ b/health-platform-v1/HealthPlatformSample/build.gradle
@@ -30,7 +30,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/health-services/ExerciseSample/build.gradle b/health-services/ExerciseSample/build.gradle
index 76e24868..1adf1588 100644
--- a/health-services/ExerciseSample/build.gradle
+++ b/health-services/ExerciseSample/build.gradle
@@ -28,7 +28,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
index 2dee4eff..a5009dee 100644
--- a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
+++ b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-android-gradle-plugin = "8.5.2"
+android-gradle-plugin = "8.6.0"
 androidx-activity = "1.9.1"
 androidx-compose = "1.7.0-rc01"
 androidx-lifecycle = "2.8.4"
@@ -15,7 +15,7 @@ roborazzi = "1.26.0"
 
 
 [libraries]
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.6.0"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-compose-navigation = "androidx.navigation:navigation-compose:2.7.7"
 androidx-compose-runtime = "androidx.compose.runtime:runtime:1.6.8"
@@ -40,7 +40,7 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview"
 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"
+desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.1"
 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" }
diff --git a/health-services/MeasureData/build.gradle b/health-services/MeasureData/build.gradle
index 189ba62f..a1e266fe 100644
--- a/health-services/MeasureData/build.gradle
+++ b/health-services/MeasureData/build.gradle
@@ -26,7 +26,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/MeasureDataCompose/gradle/libs.versions.toml b/health-services/MeasureDataCompose/gradle/libs.versions.toml
index 53918ca4..665dcaeb 100644
--- a/health-services/MeasureDataCompose/gradle/libs.versions.toml
+++ b/health-services/MeasureDataCompose/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist-permissions = "0.34.0"
-android-gradle-plugin = "8.5.2"
+android-gradle-plugin = "8.6.0"
 androidx-activity = "1.9.1"
 androidx-lifecycle = "2.8.4"
 androidx-wear-compose = "1.3.1"
@@ -15,7 +15,7 @@ org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist-permissions" }
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.6.0"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-health-services = { module = "androidx.health:health-services-client", version.ref = "health-services" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
diff --git a/health-services/PassiveData/build.gradle b/health-services/PassiveData/build.gradle
index 45054ed8..2c8f4ee3 100644
--- a/health-services/PassiveData/build.gradle
+++ b/health-services/PassiveData/build.gradle
@@ -26,7 +26,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/PassiveDataCompose/gradle/libs.versions.toml b/health-services/PassiveDataCompose/gradle/libs.versions.toml
index edb20f46..f9277ca2 100644
--- a/health-services/PassiveDataCompose/gradle/libs.versions.toml
+++ b/health-services/PassiveDataCompose/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist-permissions = "0.34.0"
-android-gradle-plugin = "8.5.2"
+android-gradle-plugin = "8.6.0"
 androidx-activity = "1.9.1"
 androidx-datastore = "1.1.1"
 androidx-lifecycle = "2.8.4"
@@ -19,7 +19,7 @@ org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist-permissions" }
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.6.0"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
 androidx-health-services = { module = "androidx.health:health-services-client", version.ref = "health-services" }
diff --git a/health-services/PassiveGoals/build.gradle b/health-services/PassiveGoals/build.gradle
index f76d3aae..670b4863 100644
--- a/health-services/PassiveGoals/build.gradle
+++ b/health-services/PassiveGoals/build.gradle
@@ -27,7 +27,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
index edb20f46..f9277ca2 100644
--- a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
+++ b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist-permissions = "0.34.0"
-android-gradle-plugin = "8.5.2"
+android-gradle-plugin = "8.6.0"
 androidx-activity = "1.9.1"
 androidx-datastore = "1.1.1"
 androidx-lifecycle = "2.8.4"
@@ -19,7 +19,7 @@ org-jetbrains-kotlinx = "1.6.0"
 
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist-permissions" }
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.6.0"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
 androidx-health-services = { module = "androidx.health:health-services-client", version.ref = "health-services" }