diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index a241992b5..b5acbf912 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -86,7 +86,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.06.00') + def composeBom = platform('androidx.compose:compose-bom:2026.06.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 7d4c15f30..02b850919 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '8.7.0' + id 'com.diffplug.spotless' version '8.8.0' id 'org.jetbrains.kotlin.plugin.compose' version "2.3.10" apply false } diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/AccessibilityCodelab/gradlew b/AccessibilityCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/AccessibilityCodelab/gradlew +++ b/AccessibilityCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/AccessibilityCodelab/gradlew.bat b/AccessibilityCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/AccessibilityCodelab/gradlew.bat +++ b/AccessibilityCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index dd58811b4..d74e6ed10 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] androidGradlePlugin = "9.2.1" -composeBom = "2026.06.00" +composeBom = "2026.06.01" coreKtx = "1.19.0" activityCompose = "1.13.0" espressoCore = "3.7.0" diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/AdaptiveUiCodelab/gradlew b/AdaptiveUiCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/AdaptiveUiCodelab/gradlew +++ b/AdaptiveUiCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/AdaptiveUiCodelab/gradlew.bat b/AdaptiveUiCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/AdaptiveUiCodelab/gradlew.bat +++ b/AdaptiveUiCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index b77d24a7f..47a4f0cd5 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -102,7 +102,7 @@ dependencies { implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.tracing:tracing:1.3.0" - def composeBom = platform('androidx.compose:compose-bom:2026.06.00') + def composeBom = platform('androidx.compose:compose-bom:2026.06.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -119,8 +119,8 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "com.google.dagger:hilt-android:2.59.2" - ksp "com.google.dagger:hilt-compiler:2.59.2" + implementation "com.google.dagger:hilt-android:2.60.1" + ksp "com.google.dagger:hilt-compiler:2.60.1" ksp "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10" implementation "io.coil-kt:coil-compose:2.7.0" @@ -132,8 +132,8 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0" androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0" androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2" - androidTestImplementation "com.google.dagger:hilt-android:2.59.2" - androidTestImplementation "com.google.dagger:hilt-android-testing:2.59.2" - kspAndroidTest "com.google.dagger:hilt-compiler:2.59.2" + androidTestImplementation "com.google.dagger:hilt-android:2.60.1" + androidTestImplementation "com.google.dagger:hilt-android-testing:2.60.1" + kspAndroidTest "com.google.dagger:hilt-compiler:2.60.1" kspAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 39dacc63c..7e7ab8ba2 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,15 +21,15 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:9.2.1" - classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.2" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.60.1" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" - classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.9" + classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.10" } } plugins { - id 'com.diffplug.spotless' version '8.7.0' - id 'com.google.devtools.ksp' version '2.3.9' apply false + id 'com.diffplug.spotless' version '8.8.0' + id 'com.google.devtools.ksp' version '2.3.10' apply false } subprojects { diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/AdvancedStateAndSideEffectsCodelab/gradlew b/AdvancedStateAndSideEffectsCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/AdvancedStateAndSideEffectsCodelab/gradlew +++ b/AdvancedStateAndSideEffectsCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/AdvancedStateAndSideEffectsCodelab/gradlew.bat b/AdvancedStateAndSideEffectsCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/AdvancedStateAndSideEffectsCodelab/gradlew.bat +++ b/AdvancedStateAndSideEffectsCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index 39fe23beb..37c69b8d3 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -39,7 +39,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.06.00') + def composeBom = platform('androidx.compose:compose-bom:2026.06.01') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.13.0' diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/AnimationCodelab/gradlew b/AnimationCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/AnimationCodelab/gradlew +++ b/AnimationCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/AnimationCodelab/gradlew.bat b/AnimationCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/AnimationCodelab/gradlew.bat +++ b/AnimationCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index 39fe23beb..37c69b8d3 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -39,7 +39,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.06.00') + def composeBom = platform('androidx.compose:compose-bom:2026.06.01') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.13.0' diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 6d6cf4e6f..df9faa3ba 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.06.00') + def composeBom = platform('androidx.compose:compose-bom:2026.06.01') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 641a47685..e97bef2b9 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '8.7.0' + id 'com.diffplug.spotless' version '8.8.0' } subprojects { diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/BasicLayoutsCodelab/gradlew b/BasicLayoutsCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/BasicLayoutsCodelab/gradlew +++ b/BasicLayoutsCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/BasicLayoutsCodelab/gradlew.bat b/BasicLayoutsCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/BasicLayoutsCodelab/gradlew.bat +++ b/BasicLayoutsCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index f1073be88..f929ed4ae 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -73,7 +73,7 @@ dependencies { implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.11.0") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0") implementation("androidx.activity:activity-compose:1.13.0") - implementation(platform("androidx.compose:compose-bom:2026.06.00")) + implementation(platform("androidx.compose:compose-bom:2026.06.01")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -82,7 +82,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.3.0") androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0") - androidTestImplementation(platform("androidx.compose:compose-bom:2026.06.00")) + androidTestImplementation(platform("androidx.compose:compose-bom:2026.06.01")) 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 0ca07e02b..36369a150 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -27,7 +27,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '8.7.0' + id 'com.diffplug.spotless' version '8.8.0' } subprojects { diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/BasicStateCodelab/gradlew b/BasicStateCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/BasicStateCodelab/gradlew +++ b/BasicStateCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/BasicStateCodelab/gradlew.bat b/BasicStateCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/BasicStateCodelab/gradlew.bat +++ b/BasicStateCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/BasicsCodelab/gradle/libs.versions.toml b/BasicsCodelab/gradle/libs.versions.toml index d463cbf85..e6c60ef17 100644 --- a/BasicsCodelab/gradle/libs.versions.toml +++ b/BasicsCodelab/gradle/libs.versions.toml @@ -7,7 +7,7 @@ androidxJunit = "1.3.0" espressoCore = "3.7.0" lifecycleRuntimeKtx = "2.11.0" activityCompose = "1.13.0" -composeBom = "2026.06.00" +composeBom = "2026.06.01" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/BasicsCodelab/gradlew b/BasicsCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/BasicsCodelab/gradlew +++ b/BasicsCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/BasicsCodelab/gradlew.bat b/BasicsCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/BasicsCodelab/gradlew.bat +++ b/BasicsCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 87ccbf5e4..ab7f9ccb8 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -56,12 +56,12 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.06.00') + def composeBom = platform('androidx.compose:compose-bom:2026.06.01') implementation(composeBom) androidTestImplementation(composeBom) kapt "androidx.room:room-compiler:2.8.4" - kapt "com.github.bumptech.glide:compiler:5.0.7" + kapt "com.github.bumptech.glide:compiler:5.0.9" kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10" implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.constraintlayout:constraintlayout:2.2.1" @@ -77,7 +77,7 @@ dependencies { implementation "androidx.tracing:tracing:1.3.0" implementation "androidx.viewpager2:viewpager2:1.1.0" implementation "androidx.work:work-runtime-ktx:2.11.2" - implementation "com.github.bumptech.glide:glide:5.0.7" + implementation "com.github.bumptech.glide:glide:5.0.9" implementation "com.google.android.material:material:1.14.0" implementation "com.google.code.gson:gson:2.14.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" @@ -99,7 +99,7 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0" androidTestImplementation "androidx.test.espresso:espresso-intents:3.7.0" androidTestImplementation "androidx.test.ext:junit:1.3.0" - androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0" + androidTestImplementation "androidx.test.uiautomator:uiautomator:2.4.0" androidTestImplementation "androidx.work:work-testing:2.11.2" androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1" androidTestImplementation "com.google.truth:truth:1.4.5" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index c0f064965..747dbe1fe 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -29,7 +29,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '8.7.0' + id 'com.diffplug.spotless' version '8.8.0' id 'com.android.legacy-kapt' version '9.2.1' apply false } diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/MigrationCodelab/gradlew b/MigrationCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/MigrationCodelab/gradlew +++ b/MigrationCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/MigrationCodelab/gradlew.bat b/MigrationCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/MigrationCodelab/gradlew.bat +++ b/MigrationCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 8849cf8cf..dcaf30c29 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -76,7 +76,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.06.00') + def composeBom = platform('androidx.compose:compose-bom:2026.06.01') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 4478d8cc1..ed37ae221 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -28,7 +28,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '8.7.0' + id 'com.diffplug.spotless' version '8.8.0' } subprojects { diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/NavigationCodelab/gradlew b/NavigationCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/NavigationCodelab/gradlew +++ b/NavigationCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/NavigationCodelab/gradlew.bat b/NavigationCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/NavigationCodelab/gradlew.bat +++ b/NavigationCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 65355958a..d608dac33 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -13,16 +13,16 @@ androidx-test-ext-junit = "1.3.0" espresso-core = "3.7.0" lifecycle-runtime-ktx = "2.11.0" activity-compose = "1.13.0" -compose-bom = "2026.06.00" -runtime-tracing = "1.11.3" +compose-bom = "2026.06.01" +runtime-tracing = "1.11.4" tracing-ktx = "1.3.0" tracing-perfetto = "1.0.1" -uiautomator = "2.3.0" +uiautomator = "2.4.0" benchmark = "1.4.1" -androidx-baselineprofile = "1.5.0-alpha06" +androidx-baselineprofile = "1.5.0-alpha07" profileinstaller = "1.4.1" material3 = "1.4.0" -spotless = "8.7.0" +spotless = "8.8.0" ktlint = "1.2.1" [libraries] diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/PerformanceCodelab/gradlew b/PerformanceCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/PerformanceCodelab/gradlew +++ b/PerformanceCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/PerformanceCodelab/gradlew.bat b/PerformanceCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/PerformanceCodelab/gradlew.bat +++ b/PerformanceCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index c0bb82e49..0eae4e125 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -79,7 +79,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.06.00') + def composeBom = platform('androidx.compose:compose-bom:2026.06.01') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 431e35bfe..b4f56e4af 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -28,7 +28,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '8.7.0' + id 'com.diffplug.spotless' version '8.8.0' } subprojects { diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/TestingCodelab/gradlew b/TestingCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/TestingCodelab/gradlew +++ b/TestingCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/TestingCodelab/gradlew.bat b/TestingCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/TestingCodelab/gradlew.bat +++ b/TestingCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 512105a2c..4309c3950 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -86,7 +86,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.06.00') + def composeBom = platform('androidx.compose:compose-bom:2026.06.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 176f57eeb..a28e2685b 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -28,7 +28,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '8.7.0' + id 'com.diffplug.spotless' version '8.8.0' } subprojects { diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/ThemingCodelab/gradlew b/ThemingCodelab/gradlew index b9bb139f7..249efbb03 100755 --- a/ThemingCodelab/gradlew +++ b/ThemingCodelab/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/ThemingCodelab/gradlew.bat b/ThemingCodelab/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/ThemingCodelab/gradlew.bat +++ b/ThemingCodelab/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index c998f497f..98343ce80 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -43,7 +43,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2026.06.00') + def composeBom = platform('androidx.compose:compose-bom:2026.06.01') implementation(composeBom) implementation 'androidx.core:core-ktx:1.19.0' diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties index eb84db68d..a9db11550 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-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/ThemingCodelabM2/gradlew b/ThemingCodelabM2/gradlew index b9bb139f7..249efbb03 100755 --- a/ThemingCodelabM2/gradlew +++ b/ThemingCodelabM2/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/ThemingCodelabM2/gradlew.bat b/ThemingCodelabM2/gradlew.bat index aa5f10b06..8508ef684 100644 --- a/ThemingCodelabM2/gradlew.bat +++ b/ThemingCodelabM2/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel