diff --git a/Complications/gradle/wrapper/gradle-wrapper.properties b/Complications/gradle/wrapper/gradle-wrapper.properties
index c1d5e0185..e0fd02028 100644
--- a/Complications/gradle/wrapper/gradle-wrapper.properties
+++ b/Complications/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/Complications/gradlew b/Complications/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/Complications/gradlew
+++ b/Complications/gradlew
@@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/ComposeStarter/gradle/libs.versions.toml b/ComposeStarter/gradle/libs.versions.toml
index a222313c0..a2a072f4f 100644
--- a/ComposeStarter/gradle/libs.versions.toml
+++ b/ComposeStarter/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref
 compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
-desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.3"
+desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.4"
 horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
 horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" }
 horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" }
diff --git a/ComposeStarter/gradle/wrapper/gradle-wrapper.properties b/ComposeStarter/gradle/wrapper/gradle-wrapper.properties
index c1d5e0185..e0fd02028 100644
--- a/ComposeStarter/gradle/wrapper/gradle-wrapper.properties
+++ b/ComposeStarter/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ComposeStarter/gradlew b/ComposeStarter/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/ComposeStarter/gradlew
+++ b/ComposeStarter/gradlew
@@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/DataLayer/gradle/libs.versions.toml b/DataLayer/gradle/libs.versions.toml
index c0f1b938d..c537bce5f 100644
--- a/DataLayer/gradle/libs.versions.toml
+++ b/DataLayer/gradle/libs.versions.toml
@@ -42,7 +42,7 @@ wear-compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling",
 horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
 horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
-desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.3"
+desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.4"
 horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" }
 junit = "junit:junit:4.13.2"
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
diff --git a/DataLayer/gradle/wrapper/gradle-wrapper.properties b/DataLayer/gradle/wrapper/gradle-wrapper.properties
index c1d5e0185..e0fd02028 100644
--- a/DataLayer/gradle/wrapper/gradle-wrapper.properties
+++ b/DataLayer/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/DataLayer/gradlew b/DataLayer/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/DataLayer/gradlew
+++ b/DataLayer/gradlew
@@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/WatchFaceFormat/Complications/gradle/wrapper/gradle-wrapper.properties b/WatchFaceFormat/Complications/gradle/wrapper/gradle-wrapper.properties
index e2847c820..cea7a793a 100644
--- a/WatchFaceFormat/Complications/gradle/wrapper/gradle-wrapper.properties
+++ b/WatchFaceFormat/Complications/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/WatchFaceFormat/Flavors/gradle/wrapper/gradle-wrapper.properties b/WatchFaceFormat/Flavors/gradle/wrapper/gradle-wrapper.properties
index e2847c820..cea7a793a 100644
--- a/WatchFaceFormat/Flavors/gradle/wrapper/gradle-wrapper.properties
+++ b/WatchFaceFormat/Flavors/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/WatchFaceFormat/SimpleAnalog/gradle/wrapper/gradle-wrapper.properties b/WatchFaceFormat/SimpleAnalog/gradle/wrapper/gradle-wrapper.properties
index e2847c820..cea7a793a 100644
--- a/WatchFaceFormat/SimpleAnalog/gradle/wrapper/gradle-wrapper.properties
+++ b/WatchFaceFormat/SimpleAnalog/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/WatchFaceFormat/SimpleDigital/gradle/wrapper/gradle-wrapper.properties b/WatchFaceFormat/SimpleDigital/gradle/wrapper/gradle-wrapper.properties
index e2847c820..cea7a793a 100644
--- a/WatchFaceFormat/SimpleDigital/gradle/wrapper/gradle-wrapper.properties
+++ b/WatchFaceFormat/SimpleDigital/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/WatchFaceFormat/Weather/gradle/wrapper/gradle-wrapper.properties b/WatchFaceFormat/Weather/gradle/wrapper/gradle-wrapper.properties
index e2847c820..cea7a793a 100644
--- a/WatchFaceFormat/Weather/gradle/wrapper/gradle-wrapper.properties
+++ b/WatchFaceFormat/Weather/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/WatchFaceFormat/validator-plugin/gradle/wrapper/gradle-wrapper.properties b/WatchFaceFormat/validator-plugin/gradle/wrapper/gradle-wrapper.properties
index e2847c820..cea7a793a 100644
--- a/WatchFaceFormat/validator-plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/WatchFaceFormat/validator-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/WearOAuth/gradle/libs.versions.toml b/WearOAuth/gradle/libs.versions.toml
index fb456d26e..cb6d9b9e8 100644
--- a/WearOAuth/gradle/libs.versions.toml
+++ b/WearOAuth/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ ui-test-junit4 = "1.7.6"
 
 [libraries]
 android-build-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
-android-desugarjdklibs = "com.android.tools:desugar_jdk_libs:2.1.3"
+android-desugarjdklibs = "com.android.tools:desugar_jdk_libs:2.1.4"
 android-lint-gradle = "com.android.tools.lint:lint-gradle:31.7.3"
 android-material = "com.google.android.material:material:1.12.0"
 android-tools-lint-gradle = "com.android.tools.lint:lint-gradle:31.7.3"
diff --git a/WearOAuth/gradle/wrapper/gradle-wrapper.properties b/WearOAuth/gradle/wrapper/gradle-wrapper.properties
index c1d5e0185..e0fd02028 100644
--- a/WearOAuth/gradle/wrapper/gradle-wrapper.properties
+++ b/WearOAuth/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/WearOAuth/gradlew b/WearOAuth/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/WearOAuth/gradlew
+++ b/WearOAuth/gradlew
@@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/WearSpeakerSample/gradle/libs.versions.toml b/WearSpeakerSample/gradle/libs.versions.toml
index e3663f254..6d7339ffe 100644
--- a/WearSpeakerSample/gradle/libs.versions.toml
+++ b/WearSpeakerSample/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ androidx-media = "androidx.media:media:1.7.0"
 compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
-desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.3"
+desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.4"
 horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
 horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" }
 horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" }
diff --git a/WearSpeakerSample/gradle/wrapper/gradle-wrapper.properties b/WearSpeakerSample/gradle/wrapper/gradle-wrapper.properties
index c1d5e0185..e0fd02028 100644
--- a/WearSpeakerSample/gradle/wrapper/gradle-wrapper.properties
+++ b/WearSpeakerSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/WearSpeakerSample/gradlew b/WearSpeakerSample/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/WearSpeakerSample/gradlew
+++ b/WearSpeakerSample/gradlew
@@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/WearTilesKotlin/gradle/libs.versions.toml b/WearTilesKotlin/gradle/libs.versions.toml
index 62389ced1..0cfa35a7f 100644
--- a/WearTilesKotlin/gradle/libs.versions.toml
+++ b/WearTilesKotlin/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", v
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "org-jetbrains-kotlinx" }
 kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "org-jetbrains-kotlinx" }
 androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "compose" }
-desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.3"
+desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.4"
 
 [plugins]
 com-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
diff --git a/WearTilesKotlin/gradle/wrapper/gradle-wrapper.properties b/WearTilesKotlin/gradle/wrapper/gradle-wrapper.properties
index c1d5e0185..e0fd02028 100644
--- a/WearTilesKotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/WearTilesKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/WearTilesKotlin/gradlew b/WearTilesKotlin/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/WearTilesKotlin/gradlew
+++ b/WearTilesKotlin/gradlew
@@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum