diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 27c34a421..bc52e3099 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -118,12 +118,12 @@ dependencies { implementation 'androidx.core:core-ktx:1.16.0' implementation "androidx.activity:activity-compose:1.10.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2" - implementation 'androidx.navigation:navigation-compose:2.9.0' + implementation 'androidx.navigation:navigation-compose:2.9.2' 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 fc0f43708..4c33d6bf9 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.10.1' + classpath 'com.android.tools.build:gradle:8.11.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' id 'org.jetbrains.kotlin.plugin.compose' version "2.1.21" apply false } diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-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 bf173ad12..e3a5894a6 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -androidGradlePlugin = "8.10.1" -composeBom = "2025.06.01" +androidGradlePlugin = "8.11.1" +composeBom = "2025.07.00" coreKtx = "1.16.0" activityCompose = "1.10.1" espressoCore = "3.6.1" @@ -8,7 +8,7 @@ junit = "4.13.2" junitVersion = "1.2.1" kotlin = "2.1.21" kotlinxCoroutinesAndroid = "1.10.2" -lifecycle = "2.9.1" +lifecycle = "2.9.2" window = "1.4.0" [libraries] diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index c90dba2ea..b3cdb0310 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -107,7 +107,7 @@ dependencies { implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.tracing:tracing:1.3.0" - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -120,11 +120,11 @@ dependencies { debugImplementation "androidx.compose.ui:ui-tooling" debugImplementation "androidx.compose.ui:ui-test-manifest" - def lifecycle_version = "2.9.1" + def lifecycle_version = "2.9.2" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "com.google.dagger:hilt-android:2.56.2" - kapt "com.google.dagger:hilt-compiler:2.56.2" + implementation "com.google.dagger:hilt-android:2.57" + kapt "com.google.dagger:hilt-compiler:2.57" 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.2" - androidTestImplementation "com.google.dagger:hilt-android:2.56.2" - androidTestImplementation "com.google.dagger:hilt-android-testing:2.56.2" - kaptAndroidTest "com.google.dagger:hilt-compiler:2.56.2" + androidTestImplementation "com.google.dagger:hilt-android:2.57" + androidTestImplementation "com.google.dagger:hilt-android-testing:2.57" + kaptAndroidTest "com.google.dagger:hilt-compiler:2.57" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index b32674ea8..68cd4ca27 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,15 +20,15 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.11.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" - classpath "com.google.dagger:hilt-android-gradle-plugin:2.56.2" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.57" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 47b60be49..42669926c 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.10.1' + classpath 'com.android.tools.build:gradle:8.11.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index e5265d911..d91838ef9 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -43,7 +43,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.10.1' diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index e5265d911..d91838ef9 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -43,7 +43,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.10.1' diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 7634b5ad6..9b8b8b73c 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -61,7 +61,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') 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.9.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.2' implementation 'androidx.activity:activity-compose:1.10.1' 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 d751fa596..23f1cc6b6 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.11.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index 55af671dd..c5b86ec12 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -65,10 +65,10 @@ android { dependencies { implementation("androidx.core:core-ktx:1.16.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2") implementation("androidx.activity:activity-compose:1.10.1") - implementation(platform("androidx.compose:compose-bom:2025.06.01")) + implementation(platform("androidx.compose:compose-bom:2025.07.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:2025.06.01")) + androidTestImplementation(platform("androidx.compose:compose-bom:2025.07.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 89b5eddfd..ea0a6d9d6 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.10.1' + classpath 'com.android.tools.build:gradle:8.11.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts index 9cd35e8c2..5f4fff3b7 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -65,9 +65,9 @@ android { dependencies { implementation("androidx.core:core-ktx:1.16.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.2") implementation("androidx.activity:activity-compose:1.10.1") - implementation(platform("androidx.compose:compose-bom:2025.06.01")) + implementation(platform("androidx.compose:compose-bom:2025.07.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:2025.06.01")) + androidTestImplementation(platform("androidx.compose:compose-bom:2025.07.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 1a5377dca..580f6ddf5 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.10.1" apply false + id("com.android.application") version "8.11.1" apply false id("org.jetbrains.kotlin.android") version "2.1.21" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.1.21" apply false } diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 0a4fc472c..10e5a66ab 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -60,7 +60,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') implementation(composeBom) androidTestImplementation(composeBom) @@ -70,10 +70,10 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout:2.2.1" implementation "androidx.core:core-ktx:1.16.0" implementation "androidx.fragment:fragment-ktx:1.8.8" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1" - implementation "androidx.navigation:navigation-fragment-ktx:2.9.0" - implementation "androidx.navigation:navigation-ui-ktx:2.9.0" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2" + implementation "androidx.navigation:navigation-fragment-ktx:2.9.2" + implementation "androidx.navigation:navigation-ui-ktx:2.9.2" implementation "androidx.recyclerview:recyclerview:1.4.0" implementation "androidx.room:room-runtime:2.7.2" implementation "androidx.room:room-ktx:2.7.2" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index d1053a8c8..22f9579c9 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,15 +21,15 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.11.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.0" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.2" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } allprojects { diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 95274f947..8bae0f2a5 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -81,7 +81,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index e74dfd91d..b60ddaa93 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.11.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-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 67964b79d..191f313ef 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] coil = "2.7.0" -com-android-application = "8.10.1" +com-android-application = "8.11.1" desugar_jdk_libs = "2.1.5" kotlinx-datetime = "0.6.2" -lifecycle-viewmodel-compose = "2.9.1" +lifecycle-viewmodel-compose = "2.9.2" material-icons-core = "1.7.8" media3 = "1.7.1" org-jetbrains-kotlin-android = "2.1.21" @@ -11,9 +11,9 @@ core-ktx = "1.16.0" junit = "4.13.2" androidx-test-ext-junit = "1.2.1" espresso-core = "3.6.1" -lifecycle-runtime-ktx = "2.9.1" +lifecycle-runtime-ktx = "2.9.2" activity-compose = "1.10.1" -compose-bom = "2025.06.01" +compose-bom = "2025.07.00" runtime-tracing = "1.8.3" tracing-ktx = "1.3.0" tracing-perfetto = "1.0.0" @@ -22,7 +22,7 @@ benchmark = "1.3.4" androidx-baselineprofile = "1.3.4" profileinstaller = "1.4.1" material3 = "1.3.2" -spotless = "7.0.4" +spotless = "7.2.1" ktlint = "1.2.1" [libraries] diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 64ad45b40..10e3047fd 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -84,7 +84,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index e9bbeb7c7..3401b8e1e 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.11.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 759b05fdf..011a81372 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -114,10 +114,10 @@ dependencies { implementation 'androidx.core:core-ktx:1.16.0' implementation "androidx.activity:activity-compose:1.10.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2" 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 42a0527af..dd1a8c5a0 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.10.1' + classpath 'com.android.tools.build:gradle:8.11.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } plugins { - id 'com.diffplug.spotless' version '7.0.4' + id 'com.diffplug.spotless' version '7.2.1' } subprojects { diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index 6119daa5b..5e63571c9 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -44,7 +44,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.06.01') + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') implementation(composeBom) implementation 'androidx.core:core-ktx:1.16.0' diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 204f8bbe1..2cbed1bb0 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.10.1" + classpath "com.android.tools.build:gradle:8.11.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties index ff23a68d7..d4081da47 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME