diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 6b9845b40..33b687535 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.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.12.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -106,14 +106,14 @@ dependencies { implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7" - implementation 'androidx.navigation:navigation-compose:2.8.3' + implementation 'androidx.navigation:navigation-compose:2.8.5' androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test:runner:1.6.2' // TODO: Bump to latest after Espresso 3.5.0 goes stable // (due to https://github.com/robolectric/robolectric/issues/6593) - testImplementation 'org.robolectric:robolectric:4.13' + testImplementation 'org.robolectric:robolectric:4.14.1' } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 54c4d71ee..d1e4aab21 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.7.2' + classpath 'com.android.tools.build:gradle:8.7.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" } } diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index df97d72b8..e2847c820 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.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 16fdad3a7..1169b3729 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -androidGradlePlugin = "8.7.2" -composeBom = "2024.10.01" +androidGradlePlugin = "8.7.3" +composeBom = "2024.12.01" coreKtx = "1.15.0" activityCompose = "1.9.3" espressoCore = "3.6.1" diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index df97d72b8..e2847c820 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index f06a73cd9..6d673ffa4 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.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.12.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -125,8 +125,8 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version" - implementation "com.google.dagger:hilt-android:2.52" - kapt "com.google.dagger:hilt-compiler:2.52" + implementation "com.google.dagger:hilt-android:2.53.1" + kapt "com.google.dagger:hilt-compiler:2.53.1" implementation "io.coil-kt:coil-compose:2.7.0" @@ -137,7 +137,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.9.0" - androidTestImplementation "com.google.dagger:hilt-android:2.52" - androidTestImplementation "com.google.dagger:hilt-android-testing:2.52" - kaptAndroidTest "com.google.dagger:hilt-compiler:2.52" + 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" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 2a35b0d58..f7454a426 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,9 +20,9 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.7.2" + classpath "com.android.tools.build:gradle:8.7.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" - classpath "com.google.dagger:hilt-android-gradle-plugin:2.52" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.53.1" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index df97d72b8..e2847c820 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index dc4a0a570..547e4cde4 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.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.12.01') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 2bffc9664..93478b777 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -19,7 +19,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.7.2" + classpath "com.android.tools.build:gradle:8.7.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index df97d72b8..e2847c820 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 62a77078c..2aa1ef1ed 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.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.12.01') implementation(composeBom) androidTestImplementation(composeBom) @@ -72,8 +72,8 @@ dependencies { implementation "androidx.fragment:fragment-ktx:1.8.5" implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7" - implementation "androidx.navigation:navigation-fragment-ktx:2.8.3" - implementation "androidx.navigation:navigation-ui-ktx:2.8.3" + 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.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 02c4e3502..36e83ddd2 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.7.2" + classpath "com.android.tools.build:gradle:8.7.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.3" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.5" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index df97d72b8..e2847c820 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 1aa940617..b28a4af3d 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.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.12.01') implementation(composeBom) androidTestImplementation(composeBom) @@ -96,12 +96,12 @@ dependencies { implementation "androidx.compose.material:material" implementation "androidx.compose.material:material-icons-extended" implementation "androidx.activity:activity-compose:1.9.3" - implementation "androidx.navigation:navigation-compose:2.8.3" + implementation "androidx.navigation:navigation-compose:2.8.5" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies androidTestImplementation "androidx.arch.core:core-testing:2.2.0" - androidTestImplementation "androidx.navigation:navigation-testing:2.8.4" + androidTestImplementation "androidx.navigation:navigation-testing:2.8.5" androidTestImplementation "androidx.test.espresso:espresso-contrib:3.6.1" androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1" diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index d0e90cfe9..4a2f8df72 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.7.2" + classpath "com.android.tools.build:gradle:8.7.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index df97d72b8..e2847c820 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/PerformanceCodelab/app/build.gradle.kts b/PerformanceCodelab/app/build.gradle.kts index eb137841b..98041c83b 100644 --- a/PerformanceCodelab/app/build.gradle.kts +++ b/PerformanceCodelab/app/build.gradle.kts @@ -92,7 +92,7 @@ dependencies { implementation(libs.androidx.tracing.ktx) // TODO Codelab task: Add androidx.runtime-tracing dependency to enable Composition Tracing - implementation("androidx.compose.runtime:runtime-tracing:1.7.5") + implementation("androidx.compose.runtime:runtime-tracing:1.7.6") implementation(libs.coil.compose) implementation(libs.androidx.media3.exoplayer) diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index a6606e973..16129f47c 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] coil = "2.7.0" -com-android-application = "8.7.2" -desugar_jdk_libs = "2.1.2" +com-android-application = "8.7.3" +desugar_jdk_libs = "2.1.3" kotlinx-datetime = "0.6.1" lifecycle-viewmodel-compose = "2.8.7" -material-icons-core = "1.7.5" -media3 = "1.4.1" +material-icons-core = "1.7.6" +media3 = "1.5.0" org-jetbrains-kotlin-android = "2.0.21" core-ktx = "1.15.0" junit = "4.13.2" @@ -13,8 +13,8 @@ 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.10.01" -runtime-tracing = "1.7.5" +compose-bom = "2024.12.01" +runtime-tracing = "1.7.6" tracing-ktx = "1.3.0-alpha02" tracing-perfetto = "1.0.0" uiautomator = "2.3.0" diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index df97d72b8..e2847c820 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index e23139e0c..7895027c4 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.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.12.01') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index c7f2aacde..a4d19cbc0 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -48,7 +48,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.7.2" + classpath "com.android.tools.build:gradle:8.7.3" 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 df97d72b8..e2847c820 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index a03865479..f195a563a 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.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.12.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index cb1ee0079..4a50d0506 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.7.2' + classpath 'com.android.tools.build:gradle:8.7.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index df97d72b8..e2847c820 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME