diff --git a/health-connect/HealthConnectSample/build.gradle b/health-connect/HealthConnectSample/build.gradle
index cb5f479f..4d67ce24 100644
--- a/health-connect/HealthConnectSample/build.gradle
+++ b/health-connect/HealthConnectSample/build.gradle
@@ -23,14 +23,14 @@ buildscript {
 
         concurrent_futures_version = '1.2.0'
         health_connect_version = '1.1.0-alpha07'
-        lifecycle_version = '2.8.2'
+        lifecycle_version = '2.8.3'
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.jar b/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.jar
index e6441136..2c352119 100644
Binary files a/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.jar and b/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.properties b/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.properties
index a4413138..09523c0e 100644
--- a/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.properties
+++ b/health-connect/HealthConnectSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-connect/HealthConnectSample/gradlew b/health-connect/HealthConnectSample/gradlew
index b740cf13..f5feea6d 100755
--- a/health-connect/HealthConnectSample/gradlew
+++ b/health-connect/HealthConnectSample/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/health-connect/HealthConnectSample/gradlew.bat b/health-connect/HealthConnectSample/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/health-connect/HealthConnectSample/gradlew.bat
+++ b/health-connect/HealthConnectSample/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/health-platform-v1/HealthPlatformSample/build.gradle b/health-platform-v1/HealthPlatformSample/build.gradle
index 0f569fd8..e7eccf3f 100644
--- a/health-platform-v1/HealthPlatformSample/build.gradle
+++ b/health-platform-v1/HealthPlatformSample/build.gradle
@@ -23,14 +23,14 @@ buildscript {
 
         concurrent_futures_version = '1.2.0'
         health_platform_version = '1.0.0-alpha01'
-        lifecycle_version = '2.8.2'
+        lifecycle_version = '2.8.3'
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         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/gradle/wrapper/gradle-wrapper.jar b/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.jar
index e6441136..2c352119 100644
Binary files a/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.jar and b/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.properties b/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.properties
index a4413138..09523c0e 100644
--- a/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.properties
+++ b/health-platform-v1/HealthPlatformSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-platform-v1/HealthPlatformSample/gradlew b/health-platform-v1/HealthPlatformSample/gradlew
index b740cf13..f5feea6d 100755
--- a/health-platform-v1/HealthPlatformSample/gradlew
+++ b/health-platform-v1/HealthPlatformSample/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/health-platform-v1/HealthPlatformSample/gradlew.bat b/health-platform-v1/HealthPlatformSample/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/health-platform-v1/HealthPlatformSample/gradlew.bat
+++ b/health-platform-v1/HealthPlatformSample/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/health-services/ExerciseSample/app/build.gradle b/health-services/ExerciseSample/app/build.gradle
index 0b1b8deb..6da57eaf 100644
--- a/health-services/ExerciseSample/app/build.gradle
+++ b/health-services/ExerciseSample/app/build.gradle
@@ -56,7 +56,7 @@ android {
 dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation "androidx.fragment:fragment-ktx:1.8.0"
+    implementation "androidx.fragment:fragment-ktx:1.8.1"
 
     // Hilt dependency injection
     implementation "com.google.dagger:hilt-android:$hilt_version"
diff --git a/health-services/ExerciseSample/build.gradle b/health-services/ExerciseSample/build.gradle
index 80f39472..e5d06991 100644
--- a/health-services/ExerciseSample/build.gradle
+++ b/health-services/ExerciseSample/build.gradle
@@ -19,7 +19,7 @@ buildscript {
     ext {
         kotlin_version = "1.9.24"
         hilt_version = '2.51.1'
-        lifecycle_version = "2.8.2"
+        lifecycle_version = "2.8.3"
     }
 
     repositories {
@@ -28,7 +28,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.jar b/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.jar
index e6441136..2c352119 100644
Binary files a/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.jar and b/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.properties b/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.properties
index a4413138..09523c0e 100644
--- a/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/ExerciseSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/ExerciseSample/gradlew b/health-services/ExerciseSample/gradlew
index b740cf13..f5feea6d 100755
--- a/health-services/ExerciseSample/gradlew
+++ b/health-services/ExerciseSample/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/health-services/ExerciseSample/gradlew.bat b/health-services/ExerciseSample/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/health-services/ExerciseSample/gradlew.bat
+++ b/health-services/ExerciseSample/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
index 29043089..1d60663c 100644
--- a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
+++ b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.1"
 androidx-activity = "1.9.0"
-androidx-compose = "1.7.0-beta03"
-androidx-lifecycle = "2.8.2"
+androidx-compose = "1.7.0-beta05"
+androidx-lifecycle = "2.8.3"
 androidx-wear-compose = "1.3.1"
 core-splashscreen = "1.0.1"
 dagger = "2.51.1"
@@ -10,11 +10,11 @@ health-services = "1.0.0-rc02"
 horologist = "0.5.27"
 org-jetbrains-kotlin = "1.9.24"
 ui-test-junit4 = "1.6.8"
-robolectric = "4.12.2"
-roborazzi = "1.20.0"
+robolectric = "4.13"
+roborazzi = "1.23.0"
 
 [libraries]
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.4.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.1"
 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"
@@ -25,7 +25,7 @@ androidx-health-services = { module = "androidx.health:health-services-client",
 androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidx-lifecycle"}
 androidx-lifecycle-extensions  = "androidx.lifecycle:lifecycle-extensions:2.2.0"
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle"}
-androidx-lifecycle-runtime-compose = "androidx.lifecycle:lifecycle-runtime-compose:2.8.2"
+androidx-lifecycle-runtime-compose = "androidx.lifecycle:lifecycle-runtime-compose:2.8.3"
 androidx-lifecycle-service = {module = "androidx.lifecycle:lifecycle-service", version.ref = "androidx-lifecycle"}
 androidx-lifecycle-viewmodel = {module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle"}
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidx-compose" }
@@ -53,8 +53,8 @@ robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectr
 roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
 roborazzi-compose = { group = "io.github.takahirom.roborazzi", name = "roborazzi-compose", version.ref = "roborazzi" }
 roborazzi-rule = { group = "io.github.takahirom.roborazzi", name = "roborazzi-junit-rule", version.ref = "roborazzi" }
-test-espresso-core = "androidx.test.espresso:espresso-core:3.5.1"
-test-ext-junit = "androidx.test.ext:junit:1.1.5"
+test-espresso-core = "androidx.test.espresso:espresso-core:3.6.1"
+test-ext-junit = "androidx.test.ext:junit:1.2.1"
 wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "androidx-wear-compose" }
 wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "androidx-wear-compose" }
 wear-ongoing-activity = "androidx.wear:wear-ongoing:1.0.0"
diff --git a/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.jar b/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.jar
index e6441136..2c352119 100644
Binary files a/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.jar and b/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.properties b/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.properties
index a4413138..09523c0e 100644
--- a/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/ExerciseSampleCompose/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/ExerciseSampleCompose/gradlew b/health-services/ExerciseSampleCompose/gradlew
index b740cf13..f5feea6d 100755
--- a/health-services/ExerciseSampleCompose/gradlew
+++ b/health-services/ExerciseSampleCompose/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/health-services/ExerciseSampleCompose/gradlew.bat b/health-services/ExerciseSampleCompose/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/health-services/ExerciseSampleCompose/gradlew.bat
+++ b/health-services/ExerciseSampleCompose/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/health-services/MeasureData/app/build.gradle b/health-services/MeasureData/app/build.gradle
index 960a144c..9d4f7446 100644
--- a/health-services/MeasureData/app/build.gradle
+++ b/health-services/MeasureData/app/build.gradle
@@ -56,7 +56,7 @@ android {
 dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation "androidx.fragment:fragment-ktx:1.8.0"
+    implementation "androidx.fragment:fragment-ktx:1.8.1"
     implementation 'androidx.work:work-runtime:2.9.0'
 
     // Hilt dependency injection
@@ -74,8 +74,8 @@ dependencies {
     implementation "androidx.concurrent:concurrent-futures-ktx:1.2.0"
 
     // Lifecycle
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.2"
-    implementation "androidx.lifecycle:lifecycle-service:2.8.2"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.3"
+    implementation "androidx.lifecycle:lifecycle-service:2.8.3"
 
     // Material
     implementation 'com.google.android.material:material:1.12.0'
diff --git a/health-services/MeasureData/build.gradle b/health-services/MeasureData/build.gradle
index 710b2147..d099e7fb 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.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/MeasureData/gradle/wrapper/gradle-wrapper.jar b/health-services/MeasureData/gradle/wrapper/gradle-wrapper.jar
index e6441136..2c352119 100644
Binary files a/health-services/MeasureData/gradle/wrapper/gradle-wrapper.jar and b/health-services/MeasureData/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/MeasureData/gradle/wrapper/gradle-wrapper.properties b/health-services/MeasureData/gradle/wrapper/gradle-wrapper.properties
index a4413138..09523c0e 100644
--- a/health-services/MeasureData/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/MeasureData/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/MeasureData/gradlew b/health-services/MeasureData/gradlew
index b740cf13..f5feea6d 100755
--- a/health-services/MeasureData/gradlew
+++ b/health-services/MeasureData/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/health-services/MeasureData/gradlew.bat b/health-services/MeasureData/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/health-services/MeasureData/gradlew.bat
+++ b/health-services/MeasureData/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/health-services/MeasureDataCompose/gradle/libs.versions.toml b/health-services/MeasureDataCompose/gradle/libs.versions.toml
index 03031d17..9908da19 100644
--- a/health-services/MeasureDataCompose/gradle/libs.versions.toml
+++ b/health-services/MeasureDataCompose/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
 accompanist-permissions = "0.34.0"
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.1"
 androidx-activity = "1.9.0"
-androidx-lifecycle = "2.8.2"
+androidx-lifecycle = "2.8.3"
 androidx-wear-compose = "1.3.1"
-compose = "1.7.0-beta03"
+compose = "1.7.0-beta05"
 compose-compiler = "1.5.14"
 concurrent-futures = "1.2.0"
 guava = "33.2.1-android"
@@ -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.4.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.1"
 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/MeasureDataCompose/gradle/wrapper/gradle-wrapper.jar b/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.jar
index e6441136..2c352119 100644
Binary files a/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.jar and b/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.properties b/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.properties
index a4413138..09523c0e 100644
--- a/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/MeasureDataCompose/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/MeasureDataCompose/gradlew b/health-services/MeasureDataCompose/gradlew
index b740cf13..f5feea6d 100755
--- a/health-services/MeasureDataCompose/gradlew
+++ b/health-services/MeasureDataCompose/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/health-services/MeasureDataCompose/gradlew.bat b/health-services/MeasureDataCompose/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/health-services/MeasureDataCompose/gradlew.bat
+++ b/health-services/MeasureDataCompose/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/health-services/PassiveData/app/build.gradle b/health-services/PassiveData/app/build.gradle
index 5e8f26b1..b3a19b48 100644
--- a/health-services/PassiveData/app/build.gradle
+++ b/health-services/PassiveData/app/build.gradle
@@ -55,7 +55,7 @@ android {
 dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation "androidx.fragment:fragment-ktx:1.8.0"
+    implementation "androidx.fragment:fragment-ktx:1.8.1"
 
     // Hilt dependency injection
     implementation "com.google.dagger:hilt-android:$hilt_version"
diff --git a/health-services/PassiveData/build.gradle b/health-services/PassiveData/build.gradle
index 4ca6a883..cee8fa9b 100644
--- a/health-services/PassiveData/build.gradle
+++ b/health-services/PassiveData/build.gradle
@@ -19,14 +19,14 @@ buildscript {
     ext {
         kotlin_version = '1.9.24'
         hilt_version = '2.51.1'
-        lifecycle_version = '2.8.2'
+        lifecycle_version = '2.8.3'
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/PassiveData/gradle/wrapper/gradle-wrapper.jar b/health-services/PassiveData/gradle/wrapper/gradle-wrapper.jar
index e6441136..2c352119 100644
Binary files a/health-services/PassiveData/gradle/wrapper/gradle-wrapper.jar and b/health-services/PassiveData/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/PassiveData/gradle/wrapper/gradle-wrapper.properties b/health-services/PassiveData/gradle/wrapper/gradle-wrapper.properties
index a4413138..09523c0e 100644
--- a/health-services/PassiveData/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/PassiveData/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/PassiveData/gradlew b/health-services/PassiveData/gradlew
index b740cf13..f5feea6d 100755
--- a/health-services/PassiveData/gradlew
+++ b/health-services/PassiveData/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/health-services/PassiveData/gradlew.bat b/health-services/PassiveData/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/health-services/PassiveData/gradlew.bat
+++ b/health-services/PassiveData/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/health-services/PassiveDataCompose/gradle/libs.versions.toml b/health-services/PassiveDataCompose/gradle/libs.versions.toml
index 0a716fe2..c9d272ad 100644
--- a/health-services/PassiveDataCompose/gradle/libs.versions.toml
+++ b/health-services/PassiveDataCompose/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 accompanist-permissions = "0.34.0"
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.1"
 androidx-activity = "1.9.0"
 androidx-datastore = "1.1.1"
-androidx-lifecycle = "2.8.2"
+androidx-lifecycle = "2.8.3"
 androidx-wear-compose = "1.3.1"
 androidx-wear-tiles = "1.0.1"
 androidx-wear-watchface = "1.0.1"
 androidx-work = "2.9.0"
-compose = "1.7.0-beta03"
+compose = "1.7.0-beta05"
 compose-compiler = "1.5.14"
 concurrent-futures = "1.2.0"
 guava = "33.2.1-android"
@@ -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.4.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.1"
 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/PassiveDataCompose/gradle/wrapper/gradle-wrapper.jar b/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.jar
index e6441136..2c352119 100644
Binary files a/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.jar and b/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.properties b/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.properties
index a4413138..09523c0e 100644
--- a/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/PassiveDataCompose/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/PassiveDataCompose/gradlew b/health-services/PassiveDataCompose/gradlew
index b740cf13..f5feea6d 100755
--- a/health-services/PassiveDataCompose/gradlew
+++ b/health-services/PassiveDataCompose/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/health-services/PassiveDataCompose/gradlew.bat b/health-services/PassiveDataCompose/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/health-services/PassiveDataCompose/gradlew.bat
+++ b/health-services/PassiveDataCompose/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/health-services/PassiveGoals/app/build.gradle b/health-services/PassiveGoals/app/build.gradle
index 11ff9062..751000cd 100644
--- a/health-services/PassiveGoals/app/build.gradle
+++ b/health-services/PassiveGoals/app/build.gradle
@@ -55,7 +55,7 @@ android {
 dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation "androidx.fragment:fragment-ktx:1.8.0"
+    implementation "androidx.fragment:fragment-ktx:1.8.1"
 
     // Hilt dependency injection
     implementation "com.google.dagger:hilt-android:$hilt_version"
diff --git a/health-services/PassiveGoals/build.gradle b/health-services/PassiveGoals/build.gradle
index 818b8408..56ca44a2 100644
--- a/health-services/PassiveGoals/build.gradle
+++ b/health-services/PassiveGoals/build.gradle
@@ -19,7 +19,7 @@ buildscript {
     ext {
         kotlin_version = "1.9.24"
         hilt_version = '2.51.1'
-        lifecycle_version = "2.8.2"
+        lifecycle_version = "2.8.3"
     }
 
     repositories {
@@ -27,7 +27,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
diff --git a/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.jar b/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.jar
index e6441136..2c352119 100644
Binary files a/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.jar and b/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.properties b/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.properties
index a4413138..09523c0e 100644
--- a/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/PassiveGoals/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/PassiveGoals/gradlew b/health-services/PassiveGoals/gradlew
index b740cf13..f5feea6d 100755
--- a/health-services/PassiveGoals/gradlew
+++ b/health-services/PassiveGoals/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/health-services/PassiveGoals/gradlew.bat b/health-services/PassiveGoals/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/health-services/PassiveGoals/gradlew.bat
+++ b/health-services/PassiveGoals/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
index 0a716fe2..c9d272ad 100644
--- a/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
+++ b/health-services/PassiveGoalsCompose/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 accompanist-permissions = "0.34.0"
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.1"
 androidx-activity = "1.9.0"
 androidx-datastore = "1.1.1"
-androidx-lifecycle = "2.8.2"
+androidx-lifecycle = "2.8.3"
 androidx-wear-compose = "1.3.1"
 androidx-wear-tiles = "1.0.1"
 androidx-wear-watchface = "1.0.1"
 androidx-work = "2.9.0"
-compose = "1.7.0-beta03"
+compose = "1.7.0-beta05"
 compose-compiler = "1.5.14"
 concurrent-futures = "1.2.0"
 guava = "33.2.1-android"
@@ -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.4.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.1"
 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/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.jar b/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.jar
index e6441136..2c352119 100644
Binary files a/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.jar and b/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.properties b/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.properties
index a4413138..09523c0e 100644
--- a/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.properties
+++ b/health-services/PassiveGoalsCompose/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/health-services/PassiveGoalsCompose/gradlew b/health-services/PassiveGoalsCompose/gradlew
index b740cf13..f5feea6d 100755
--- a/health-services/PassiveGoalsCompose/gradlew
+++ b/health-services/PassiveGoalsCompose/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/health-services/PassiveGoalsCompose/gradlew.bat b/health-services/PassiveGoalsCompose/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/health-services/PassiveGoalsCompose/gradlew.bat
+++ b/health-services/PassiveGoalsCompose/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################