diff --git a/health-connect/HealthConnectSample/build.gradle b/health-connect/HealthConnectSample/build.gradle
index b9f6a97b..9dc949e9 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.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.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/build.gradle b/health-platform-v1/HealthPlatformSample/build.gradle
index 9e8c40df..2a2fcdf7 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.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.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 0aaa17c5..0bb720e6 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.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.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 984efa22..11dada6a 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.3.2"
+android-gradle-plugin = "8.4.0"
 androidx-activity = "1.9.0"
 androidx-compose = "1.6.6"
 androidx-lifecycle = "2.7.0"
@@ -14,7 +14,7 @@ robolectric = "4.12.1"
 roborazzi = "1.13.0"
 
 [libraries]
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.3.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.4.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.6"
diff --git a/health-services/MeasureData/build.gradle b/health-services/MeasureData/build.gradle
index b94403b2..0cdeab39 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.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.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 b5fa3280..6b0b3d41 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.3.2"
+android-gradle-plugin = "8.4.0"
 androidx-activity = "1.9.0"
 androidx-lifecycle = "2.7.0"
 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.3.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.4.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 80d2a1d1..e3374ea0 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.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.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 7d8179d4..f86af7bc 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.3.2"
+android-gradle-plugin = "8.4.0"
 androidx-activity = "1.9.0"
 androidx-datastore = "1.1.0"
 androidx-lifecycle = "2.7.0"
@@ -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.3.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.4.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 4e0e79bb..6ffb8e04 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.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.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 7d8179d4..f86af7bc 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.3.2"
+android-gradle-plugin = "8.4.0"
 androidx-activity = "1.9.0"
 androidx-datastore = "1.1.0"
 androidx-lifecycle = "2.7.0"
@@ -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.3.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.4.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" }