From ca396e5a19ec040d8f3038401d18878d6c26644e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 19:31:08 +0000
Subject: [PATCH] Update all dependencies

---
 AccessibilityCodelab/app/build.gradle              |  6 +++---
 AccessibilityCodelab/build.gradle                  |  4 ++--
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 AccessibilityCodelab/gradlew                       |  3 +--
 AdaptiveUiCodelab/gradle/libs.versions.toml        |  6 +++---
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 AdaptiveUiCodelab/gradlew                          |  3 +--
 .../app/build.gradle                               | 14 +++++++-------
 AdvancedStateAndSideEffectsCodelab/build.gradle    |  6 +++---
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 AdvancedStateAndSideEffectsCodelab/gradlew         |  3 +--
 AnimationCodelab/build.gradle                      |  2 +-
 AnimationCodelab/finished/build.gradle             |  4 ++--
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 AnimationCodelab/gradlew                           |  3 +--
 AnimationCodelab/start/build.gradle                |  4 ++--
 BasicLayoutsCodelab/app/build.gradle               |  4 ++--
 BasicLayoutsCodelab/build.gradle                   |  4 ++--
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 BasicLayoutsCodelab/gradlew                        |  3 +--
 BasicStateCodelab/app/build.gradle.kts             |  6 +++---
 BasicStateCodelab/build.gradle                     |  4 ++--
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 BasicStateCodelab/gradlew                          |  3 +--
 BasicsCodelab/app/build.gradle.kts                 |  6 +++---
 BasicsCodelab/build.gradle.kts                     |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 BasicsCodelab/gradlew                              |  3 +--
 MigrationCodelab/app/build.gradle                  |  4 ++--
 MigrationCodelab/build.gradle                      |  4 ++--
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 MigrationCodelab/gradlew                           |  3 +--
 NavigationCodelab/app/build.gradle                 |  4 ++--
 NavigationCodelab/build.gradle                     |  4 ++--
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 NavigationCodelab/gradlew                          |  3 +--
 PerformanceCodelab/gradle/libs.versions.toml       | 10 +++++-----
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 PerformanceCodelab/gradlew                         |  3 +--
 TestingCodelab/app/build.gradle                    |  4 ++--
 TestingCodelab/build.gradle                        |  4 ++--
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 TestingCodelab/gradlew                             |  3 +--
 ThemingCodelab/app/build.gradle                    |  6 +++---
 ThemingCodelab/build.gradle                        |  4 ++--
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 ThemingCodelab/gradlew                             |  3 +--
 ThemingCodelabM2/app/build.gradle                  |  4 ++--
 ThemingCodelabM2/build.gradle                      |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 ThemingCodelabM2/gradlew                           |  3 +--
 51 files changed, 87 insertions(+), 100 deletions(-)

diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle
index c6b53a1b9..0c98f76f8 100644
--- a/AccessibilityCodelab/app/build.gradle
+++ b/AccessibilityCodelab/app/build.gradle
@@ -87,7 +87,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
     implementation(composeBom)
     testImplementation(composeBom)
     androidTestImplementation(composeBom)
@@ -114,9 +114,9 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.0"
 
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.activity:activity-ktx:1.9.3'
+    implementation 'androidx.activity:activity-ktx:1.10.0'
     implementation 'androidx.core:core-ktx:1.15.0'
-    implementation "androidx.activity:activity-compose:1.9.3"
+    implementation "androidx.activity:activity-compose:1.10.0"
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7"
diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
index f436d4124..8b51de738 100644
--- a/AccessibilityCodelab/build.gradle
+++ b/AccessibilityCodelab/build.gradle
@@ -21,13 +21,13 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath 'com.android.tools.build:gradle:8.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.25.0'
+    id 'com.diffplug.spotless' version '7.0.2'
     id 'org.jetbrains.kotlin.plugin.compose' version "2.1.0" apply false
 }
 
diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/AccessibilityCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AccessibilityCodelab/gradlew b/AccessibilityCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/AccessibilityCodelab/gradlew
+++ b/AccessibilityCodelab/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/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml
index fff673e83..86d448880 100644
--- a/AdaptiveUiCodelab/gradle/libs.versions.toml
+++ b/AdaptiveUiCodelab/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-androidGradlePlugin = "8.7.3"
-composeBom = "2024.12.01"
+androidGradlePlugin = "8.8.0"
+composeBom = "2025.01.00"
 coreKtx = "1.15.0"
-activityCompose = "1.9.3"
+activityCompose = "1.10.0"
 espressoCore = "3.6.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/AdaptiveUiCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdaptiveUiCodelab/gradlew b/AdaptiveUiCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/AdaptiveUiCodelab/gradlew
+++ b/AdaptiveUiCodelab/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/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
index ec18f05b1..d049c7247 100644
--- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
@@ -103,11 +103,11 @@ dependencies {
         }
     }
 
-    implementation "androidx.activity:activity-compose:1.9.3"
+    implementation "androidx.activity:activity-compose:1.10.0"
     implementation "androidx.appcompat:appcompat:1.7.0"
     implementation "androidx.tracing:tracing:1.2.0"
 
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
     implementation(composeBom)
     androidTestImplementation(composeBom)
     implementation "androidx.compose.runtime:runtime"
@@ -123,8 +123,8 @@ dependencies {
     def lifecycle_version = "2.8.7"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "com.google.dagger:hilt-android:2.53.1"
-    kapt "com.google.dagger:hilt-compiler:2.53.1"
+    implementation "com.google.dagger:hilt-android:2.55"
+    kapt "com.google.dagger:hilt-compiler:2.55"
 
     implementation "io.coil-kt:coil-compose:2.7.0"
 
@@ -135,7 +135,7 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1"
     androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.0"
-    androidTestImplementation "com.google.dagger:hilt-android:2.53.1"
-    androidTestImplementation "com.google.dagger:hilt-android-testing:2.53.1"
-    kaptAndroidTest "com.google.dagger:hilt-compiler:2.53.1"
+    androidTestImplementation "com.google.dagger:hilt-android:2.55"
+    androidTestImplementation "com.google.dagger:hilt-android-testing:2.55"
+    kaptAndroidTest "com.google.dagger:hilt-compiler:2.55"
 }
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
index 0fccbdb72..9208338c4 100644
--- a/AdvancedStateAndSideEffectsCodelab/build.gradle
+++ b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -20,15 +20,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.7.3"
+        classpath "com.android.tools.build:gradle:8.8.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.53.1"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:2.55"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.25.0'
+    id 'com.diffplug.spotless' version '7.0.2'
 }
 
 subprojects {
diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/AdvancedStateAndSideEffectsCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdvancedStateAndSideEffectsCodelab/gradlew b/AdvancedStateAndSideEffectsCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/AdvancedStateAndSideEffectsCodelab/gradlew
+++ b/AdvancedStateAndSideEffectsCodelab/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/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle
index 4674d51a6..6d17eadc7 100644
--- a/AnimationCodelab/build.gradle
+++ b/AnimationCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath 'com.android.tools.build:gradle:8.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle
index 193c9ab0a..c49f19f38 100644
--- a/AnimationCodelab/finished/build.gradle
+++ b/AnimationCodelab/finished/build.gradle
@@ -43,10 +43,10 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
     implementation(composeBom)
 
-    implementation 'androidx.activity:activity-compose:1.9.3'
+    implementation 'androidx.activity:activity-compose:1.10.0'
     implementation 'androidx.core:core-ktx:1.15.0'
     implementation "androidx.compose.ui:ui"
     implementation "androidx.compose.material3:material3"
diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/AnimationCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AnimationCodelab/gradlew b/AnimationCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/AnimationCodelab/gradlew
+++ b/AnimationCodelab/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/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle
index 193c9ab0a..c49f19f38 100644
--- a/AnimationCodelab/start/build.gradle
+++ b/AnimationCodelab/start/build.gradle
@@ -43,10 +43,10 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
     implementation(composeBom)
 
-    implementation 'androidx.activity:activity-compose:1.9.3'
+    implementation 'androidx.activity:activity-compose:1.10.0'
     implementation 'androidx.core:core-ktx:1.15.0'
     implementation "androidx.compose.ui:ui"
     implementation "androidx.compose.material3:material3"
diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle
index 580a784b6..ac5d512fa 100644
--- a/BasicLayoutsCodelab/app/build.gradle
+++ b/BasicLayoutsCodelab/app/build.gradle
@@ -61,7 +61,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -73,7 +73,7 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "com.google.android.material:material:1.12.0"
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
-    implementation 'androidx.activity:activity-compose:1.9.3'
+    implementation 'androidx.activity:activity-compose:1.10.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
index 6d314d74f..c62a4bc67 100644
--- a/BasicLayoutsCodelab/build.gradle
+++ b/BasicLayoutsCodelab/build.gradle
@@ -20,14 +20,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.7.3"
+        classpath "com.android.tools.build:gradle:8.8.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.25.0'
+    id 'com.diffplug.spotless' version '7.0.2'
 }
 
 subprojects {
diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/BasicLayoutsCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicLayoutsCodelab/gradlew b/BasicLayoutsCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/BasicLayoutsCodelab/gradlew
+++ b/BasicLayoutsCodelab/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/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts
index df6568976..c2cc42e65 100644
--- a/BasicStateCodelab/app/build.gradle.kts
+++ b/BasicStateCodelab/app/build.gradle.kts
@@ -67,8 +67,8 @@ dependencies {
     implementation("androidx.core:core-ktx:1.15.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
-    implementation("androidx.activity:activity-compose:1.9.3")
-    implementation(platform("androidx.compose:compose-bom:2024.12.01"))
+    implementation("androidx.activity:activity-compose:1.10.0")
+    implementation(platform("androidx.compose:compose-bom:2025.01.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
@@ -76,7 +76,7 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2024.12.01"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2025.01.00"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
index ef768d7a3..b618d690f 100644
--- a/BasicStateCodelab/build.gradle
+++ b/BasicStateCodelab/build.gradle
@@ -20,14 +20,14 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath 'com.android.tools.build:gradle:8.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.25.0'
+    id 'com.diffplug.spotless' version '7.0.2'
 }
 
 subprojects {
diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/BasicStateCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicStateCodelab/gradlew b/BasicStateCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/BasicStateCodelab/gradlew
+++ b/BasicStateCodelab/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/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts
index 348ec98b2..e0a711720 100644
--- a/BasicsCodelab/app/build.gradle.kts
+++ b/BasicsCodelab/app/build.gradle.kts
@@ -66,8 +66,8 @@ android {
 dependencies {
     implementation("androidx.core:core-ktx:1.15.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
-    implementation("androidx.activity:activity-compose:1.9.3")
-    implementation(platform("androidx.compose:compose-bom:2024.12.01"))
+    implementation("androidx.activity:activity-compose:1.10.0")
+    implementation(platform("androidx.compose:compose-bom:2025.01.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
@@ -76,7 +76,7 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2024.12.01"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2025.01.00"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts
index 9cf9cd608..8da76bb65 100644
--- a/BasicsCodelab/build.gradle.kts
+++ b/BasicsCodelab/build.gradle.kts
@@ -16,7 +16,7 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.7.3" apply false
+    id("com.android.application") version "8.8.0" apply false
     id("org.jetbrains.kotlin.android") version "2.1.0" apply false
     id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false
 }
diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/BasicsCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicsCodelab/gradlew b/BasicsCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/BasicsCodelab/gradlew
+++ b/BasicsCodelab/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/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle
index 869f6d7cb..7870a8c26 100644
--- a/MigrationCodelab/app/build.gradle
+++ b/MigrationCodelab/app/build.gradle
@@ -60,7 +60,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -74,7 +74,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
     implementation "androidx.navigation:navigation-fragment-ktx:2.8.5"
     implementation "androidx.navigation:navigation-ui-ktx:2.8.5"
-    implementation "androidx.recyclerview:recyclerview:1.3.2"
+    implementation "androidx.recyclerview:recyclerview:1.4.0"
     implementation "androidx.room:room-runtime:2.6.1"
     implementation "androidx.room:room-ktx:2.6.1"
     implementation "androidx.tracing:tracing:1.2.0"
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
index 9b2486403..ef843d896 100644
--- a/MigrationCodelab/build.gradle
+++ b/MigrationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.7.3"
+        classpath "com.android.tools.build:gradle:8.8.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.5"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
@@ -29,7 +29,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.25.0'
+    id 'com.diffplug.spotless' version '7.0.2'
 }
 
 allprojects {
diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/MigrationCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/MigrationCodelab/gradlew b/MigrationCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/MigrationCodelab/gradlew
+++ b/MigrationCodelab/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/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle
index ad93418d9..2f790bd8b 100644
--- a/NavigationCodelab/app/build.gradle
+++ b/NavigationCodelab/app/build.gradle
@@ -81,7 +81,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -95,7 +95,7 @@ dependencies {
     implementation "androidx.compose.foundation:foundation"
     implementation "androidx.compose.material:material"
     implementation "androidx.compose.material:material-icons-extended"
-    implementation "androidx.activity:activity-compose:1.9.3"
+    implementation "androidx.activity:activity-compose:1.10.0"
     debugImplementation "androidx.compose.ui:ui-tooling"
 
     // Testing dependencies
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
index 8dcdffd80..b5865167c 100644
--- a/NavigationCodelab/build.gradle
+++ b/NavigationCodelab/build.gradle
@@ -21,14 +21,14 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.7.3"
+        classpath "com.android.tools.build:gradle:8.8.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.25.0'
+    id 'com.diffplug.spotless' version '7.0.2'
 }
 
 subprojects {
diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/NavigationCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/NavigationCodelab/gradlew b/NavigationCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/NavigationCodelab/gradlew
+++ b/NavigationCodelab/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/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml
index 850773f9d..dcf28890b 100644
--- a/PerformanceCodelab/gradle/libs.versions.toml
+++ b/PerformanceCodelab/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 coil = "2.7.0"
-com-android-application = "8.7.3"
-desugar_jdk_libs = "2.1.3"
+com-android-application = "8.8.0"
+desugar_jdk_libs = "2.1.4"
 kotlinx-datetime = "0.6.1"
 lifecycle-viewmodel-compose = "2.8.7"
 material-icons-core = "1.7.6"
@@ -12,8 +12,8 @@ junit = "4.13.2"
 androidx-test-ext-junit = "1.2.1"
 espresso-core = "3.6.1"
 lifecycle-runtime-ktx = "2.8.7"
-activity-compose = "1.9.3"
-compose-bom = "2024.12.01"
+activity-compose = "1.10.0"
+compose-bom = "2025.01.00"
 runtime-tracing = "1.7.6"
 tracing-ktx = "1.3.0-alpha02"
 tracing-perfetto = "1.0.0"
@@ -22,7 +22,7 @@ benchmark = "1.3.3"
 androidx-baselineprofile = "1.3.3"
 profileinstaller = "1.4.1"
 material3 = "1.3.1"
-spotless = "6.25.0"
+spotless = "7.0.2"
 ktlint = "1.2.1"
 
 [libraries]
diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/PerformanceCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/PerformanceCodelab/gradlew b/PerformanceCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/PerformanceCodelab/gradlew
+++ b/PerformanceCodelab/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/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle
index 4845e0e73..b2c1d436c 100644
--- a/TestingCodelab/app/build.gradle
+++ b/TestingCodelab/app/build.gradle
@@ -84,7 +84,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
     implementation(composeBom)
     androidTestImplementation(composeBom)
 
@@ -103,7 +103,7 @@ dependencies {
     implementation "androidx.compose.runtime:runtime-livedata"
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "androidx.compose.material:material-icons-extended"
-    implementation "androidx.activity:activity-compose:1.9.3"
+    implementation "androidx.activity:activity-compose:1.10.0"
     debugImplementation "androidx.compose.ui:ui-tooling"
 
     // Testing dependencies
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
index 8570736b9..4ef3af4b0 100644
--- a/TestingCodelab/build.gradle
+++ b/TestingCodelab/build.gradle
@@ -21,14 +21,14 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.7.3"
+        classpath "com.android.tools.build:gradle:8.8.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.25.0'
+    id 'com.diffplug.spotless' version '7.0.2'
 }
 
 subprojects {
diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/TestingCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/TestingCodelab/gradlew b/TestingCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/TestingCodelab/gradlew
+++ b/TestingCodelab/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/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle
index 565a1e34f..9da58658b 100644
--- a/ThemingCodelab/app/build.gradle
+++ b/ThemingCodelab/app/build.gradle
@@ -87,7 +87,7 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
     implementation(composeBom)
     testImplementation(composeBom)
     androidTestImplementation(composeBom)
@@ -110,9 +110,9 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.0"
 
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.activity:activity-ktx:1.9.3'
+    implementation 'androidx.activity:activity-ktx:1.10.0'
     implementation 'androidx.core:core-ktx:1.15.0'
-    implementation "androidx.activity:activity-compose:1.9.3"
+    implementation "androidx.activity:activity-compose:1.10.0"
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7"
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
index 8e29318e7..f62387d3d 100644
--- a/ThemingCodelab/build.gradle
+++ b/ThemingCodelab/build.gradle
@@ -21,14 +21,14 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath 'com.android.tools.build:gradle:8.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.25.0'
+    id 'com.diffplug.spotless' version '7.0.2'
 }
 
 subprojects {
diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
+++ b/ThemingCodelab/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ThemingCodelab/gradlew b/ThemingCodelab/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/ThemingCodelab/gradlew
+++ b/ThemingCodelab/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/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle
index 44be2c763..5e0427f7a 100644
--- a/ThemingCodelabM2/app/build.gradle
+++ b/ThemingCodelabM2/app/build.gradle
@@ -44,14 +44,14 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
     implementation(composeBom)
 
     implementation 'androidx.core:core-ktx:1.15.0'
     implementation "androidx.compose.ui:ui"
     implementation "androidx.compose.material:material"
     implementation "androidx.compose.material:material-icons-extended"
-    implementation 'androidx.activity:activity-compose:1.9.3'
+    implementation 'androidx.activity:activity-compose:1.10.0'
     implementation "androidx.compose.ui:ui-tooling-preview"
     debugImplementation "androidx.compose.ui:ui-tooling"
 }
diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle
index ee4d60b77..cafccaaf0 100644
--- a/ThemingCodelabM2/build.gradle
+++ b/ThemingCodelabM2/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.7.3"
+        classpath "com.android.tools.build:gradle:8.8.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties
index e2847c820..e18bc253b 100644
--- a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties
+++ b/ThemingCodelabM2/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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ThemingCodelabM2/gradlew b/ThemingCodelabM2/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/ThemingCodelabM2/gradlew
+++ b/ThemingCodelabM2/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