diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 33decd558..49f59293a 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -70,7 +70,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.00') + def composeBom = platform('androidx.compose:compose-bom:2024.09.02') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -103,12 +103,12 @@ dependencies { implementation 'androidx.core:core-ktx:1.13.1' implementation "androidx.activity:activity-compose:1.9.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.5" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.5" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6" - implementation 'androidx.navigation:navigation-compose:2.8.0' + implementation 'androidx.navigation:navigation-compose:2.8.1' androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test:runner:1.6.2' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 611fee6e7..4628148b6 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.6.0' + classpath 'com.android.tools.build:gradle:8.6.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" } } diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index 9355b4155..0aaefbcaf 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 18c239dae..f73009fee 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -androidGradlePlugin = "8.6.0" -composeBom = "2024.09.00" +androidGradlePlugin = "8.6.1" +composeBom = "2024.09.02" coreKtx = "1.13.1" activityCompose = "1.9.2" espressoCore = "3.6.1" @@ -8,7 +8,7 @@ junit = "4.13.2" junitVersion = "1.2.1" kotlin = "2.0.20" kotlinxCoroutinesAndroid = "1.8.1" -lifecycle = "2.8.5" +lifecycle = "2.8.6" material3Adaptive = "1.0.0" material3AdaptiveNavSuite = "1.3.0" window = "1.3.0" diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index 9355b4155..0aaefbcaf 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 01bd6b947..60936818b 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -107,7 +107,7 @@ dependencies { implementation "androidx.appcompat:appcompat:1.7.0" implementation "androidx.tracing:tracing:1.2.0" - def composeBom = platform('androidx.compose:compose-bom:2024.09.00') + def composeBom = platform('androidx.compose:compose-bom:2024.09.02') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -121,7 +121,7 @@ dependencies { debugImplementation "androidx.compose.ui:ui-test-manifest" - def lifecycle_version = "2.8.5" + def lifecycle_version = "2.8.6" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 2d06a535e..8a5144420 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.6.0" + classpath "com.android.tools.build:gradle:8.6.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "com.google.dagger:hilt-android-gradle-plugin:2.52" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index 9355b4155..0aaefbcaf 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index e1fe5b176..93f0dad78 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.09.00') + def composeBom = platform('androidx.compose:compose-bom:2024.09.02') implementation(composeBom) androidTestImplementation(composeBom) @@ -72,7 +72,7 @@ dependencies { implementation "androidx.compose.material:material-icons-extended" implementation "androidx.compose.ui:ui-tooling-preview" implementation "com.google.android.material:material:1.12.0" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.5' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6' implementation 'androidx.activity:activity-compose:1.9.2' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.2.1' diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index a6dfd6fda..1b9f29085 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -19,7 +19,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.6.0" + classpath "com.android.tools.build:gradle:8.6.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index 9355b4155..0aaefbcaf 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index a3e158948..518ad4cb0 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.09.00') + def composeBom = platform('androidx.compose:compose-bom:2024.09.02') implementation(composeBom) androidTestImplementation(composeBom) @@ -70,10 +70,10 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout:2.1.4" implementation "androidx.core:core-ktx:1.13.1" implementation "androidx.fragment:fragment-ktx:1.8.3" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.5" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5" - implementation "androidx.navigation:navigation-fragment-ktx:2.8.0" - implementation "androidx.navigation:navigation-ui-ktx:2.8.0" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6" + implementation "androidx.navigation:navigation-fragment-ktx:2.8.1" + implementation "androidx.navigation:navigation-ui-ktx:2.8.1" implementation "androidx.recyclerview:recyclerview:1.3.2" implementation "androidx.room:room-runtime:2.6.1" implementation "androidx.room:room-ktx:2.6.1" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index b45bbe8a9..dc930ba1e 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.6.0" + classpath "com.android.tools.build:gradle:8.6.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.0" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.1" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } } diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index 9355b4155..0aaefbcaf 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 2d3ad365d..1179d558f 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.09.00') + def composeBom = platform('androidx.compose:compose-bom:2024.09.02') implementation(composeBom) androidTestImplementation(composeBom) @@ -96,7 +96,7 @@ dependencies { implementation "androidx.compose.material:material" implementation "androidx.compose.material:material-icons-extended" implementation "androidx.activity:activity-compose:1.9.2" - implementation "androidx.navigation:navigation-compose:2.8.0" + implementation "androidx.navigation:navigation-compose:2.8.1" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 6ec45d582..8dc425e39 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.6.0" + classpath "com.android.tools.build:gradle:8.6.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index 9355b4155..0aaefbcaf 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 0b7ae54f1..625bbc669 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,26 +1,26 @@ [versions] coil = "2.7.0" -com-android-application = "8.6.0" +com-android-application = "8.6.1" desugar_jdk_libs = "2.1.2" kotlinx-datetime = "0.6.1" -lifecycle-viewmodel-compose = "2.8.5" -material-icons-core = "1.7.0" +lifecycle-viewmodel-compose = "2.8.6" +material-icons-core = "1.7.2" media3 = "1.4.1" org-jetbrains-kotlin-android = "2.0.20" core-ktx = "1.13.1" junit = "4.13.2" androidx-test-ext-junit = "1.2.1" espresso-core = "3.6.1" -lifecycle-runtime-ktx = "2.8.5" +lifecycle-runtime-ktx = "2.8.6" activity-compose = "1.9.2" -compose-bom = "2024.09.00" +compose-bom = "2024.09.02" runtime-tracing = "1.0.0-beta01" tracing-ktx = "1.3.0-alpha02" tracing-perfetto = "1.0.0" uiautomator = "2.3.0" -benchmark = "1.3.0" -androidx-baselineprofile = "1.3.0" -profileinstaller = "1.3.1" +benchmark = "1.3.1" +androidx-baselineprofile = "1.3.1" +profileinstaller = "1.4.0" material3 = "1.3.0" spotless = "6.25.0" ktlint = "1.2.1" diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index 9355b4155..0aaefbcaf 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index a8d1c25f8..0aea4672a 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.09.00') + def composeBom = platform('androidx.compose:compose-bom:2024.09.02') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index b6e736051..1491ae31f 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -48,7 +48,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.6.0" + classpath "com.android.tools.build:gradle:8.6.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion" } diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index 9355b4155..0aaefbcaf 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 80ac64cd4..7053097e9 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.09.00') + def composeBom = platform('androidx.compose:compose-bom:2024.09.02') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -114,11 +114,11 @@ dependencies { implementation 'androidx.core:core-ktx:1.13.1' implementation "androidx.activity:activity-compose:1.9.2" - implementation "androidx.lifecycle:lifecycle-runtime-compose:2.8.5" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.5" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.5" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5" + implementation "androidx.lifecycle:lifecycle-runtime-compose:2.8.6" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6" androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test:runner:1.6.2' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 75880cb28..8c882be95 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.6.0' + classpath 'com.android.tools.build:gradle:8.6.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index 9355b4155..0aaefbcaf 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME