diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 932c9bd91..f3acfb768 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.05.00') + def composeBom = platform('androidx.compose:compose-bom:2025.06.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -113,15 +113,15 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1" - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.appcompat:appcompat:1.7.1' implementation 'androidx.activity:activity-ktx:1.10.1' implementation 'androidx.core:core-ktx:1.16.0' implementation "androidx.activity:activity-compose:1.10.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.0" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0" + 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.navigation:navigation-compose:2.9.0' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 1ba4d869b..f5d5f7cda 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.10.0' + classpath 'com.android.tools.build:gradle:8.10.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" } } plugins { - id 'com.diffplug.spotless' version '7.0.3' + id 'com.diffplug.spotless' version '7.0.4' id 'org.jetbrains.kotlin.plugin.compose' version "2.1.10" apply false } diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-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 92a344418..36821462a 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -androidGradlePlugin = "8.10.0" -composeBom = "2025.05.00" +androidGradlePlugin = "8.10.1" +composeBom = "2025.06.00" coreKtx = "1.16.0" activityCompose = "1.10.1" espressoCore = "3.6.1" @@ -8,8 +8,8 @@ junit = "4.13.2" junitVersion = "1.2.1" kotlin = "2.1.10" kotlinxCoroutinesAndroid = "1.10.1" -lifecycle = "2.9.0" -window = "1.3.0" +lifecycle = "2.9.1" +window = "1.4.0" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 9a0a831ab..3f3929592 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -104,10 +104,10 @@ dependencies { } implementation "androidx.activity:activity-compose:1.10.1" - implementation "androidx.appcompat:appcompat:1.7.0" + implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.tracing:tracing:1.3.0" - def composeBom = platform('androidx.compose:compose-bom:2025.05.00') + def composeBom = platform('androidx.compose:compose-bom:2025.06.00') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -120,7 +120,7 @@ dependencies { debugImplementation "androidx.compose.ui:ui-tooling" debugImplementation "androidx.compose.ui:ui-test-manifest" - def lifecycle_version = "2.9.0" + def lifecycle_version = "2.9.1" 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" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index e5958be88..c770d9718 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.10.0" + classpath "com.android.tools.build:gradle:8.10.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "com.google.dagger:hilt-android-gradle-plugin:2.56.2" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" @@ -28,7 +28,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '7.0.3' + id 'com.diffplug.spotless' version '7.0.4' } subprojects { diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 143a03750..df9408407 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.10.0' + classpath 'com.android.tools.build:gradle:8.10.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index ba4b89f07..d294318fb 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.05.00') + def composeBom = platform('androidx.compose:compose-bom:2025.06.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 ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index ba4b89f07..d294318fb 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.05.00') + def composeBom = platform('androidx.compose:compose-bom:2025.06.00') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.10.1' diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index af83952c8..b4d133086 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.05.00') + def composeBom = platform('androidx.compose:compose-bom:2025.06.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.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.1' 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 54913a08e..5b40f7b91 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.10.0" + classpath "com.android.tools.build:gradle:8.10.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } } plugins { - id 'com.diffplug.spotless' version '7.0.3' + id 'com.diffplug.spotless' version '7.0.4' } subprojects { diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-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 d21248bc9..73f7eb9c3 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.0") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1") implementation("androidx.activity:activity-compose:1.10.1") - implementation(platform("androidx.compose:compose-bom:2025.05.00")) + implementation(platform("androidx.compose:compose-bom:2025.06.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.05.00")) + androidTestImplementation(platform("androidx.compose:compose-bom:2025.06.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 01e636457..145b5b15d 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.10.0' + classpath 'com.android.tools.build:gradle:8.10.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } } plugins { - id 'com.diffplug.spotless' version '7.0.3' + id 'com.diffplug.spotless' version '7.0.4' } subprojects { diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-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 10f96b600..8331d9c4e 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.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") implementation("androidx.activity:activity-compose:1.10.1") - implementation(platform("androidx.compose:compose-bom:2025.05.00")) + implementation(platform("androidx.compose:compose-bom:2025.06.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.05.00")) + androidTestImplementation(platform("androidx.compose:compose-bom:2025.06.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 940cc2f88..e2cfe5333 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.0" apply false + id("com.android.application") version "8.10.1" apply false id("org.jetbrains.kotlin.android") version "2.1.10" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.1.10" apply false } diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index a8ae438cb..b6aa74d37 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -60,18 +60,18 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.05.00') + def composeBom = platform('androidx.compose:compose-bom:2025.06.00') implementation(composeBom) androidTestImplementation(composeBom) kapt "androidx.room:room-compiler:2.7.1" kapt "com.github.bumptech.glide:compiler:4.16.0" - implementation "androidx.appcompat:appcompat:1.7.0" + implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.constraintlayout:constraintlayout:2.2.1" implementation "androidx.core:core-ktx:1.16.0" - implementation "androidx.fragment:fragment-ktx:1.8.6" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.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.recyclerview:recyclerview:1.4.0" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 3389f9497..e1bae25cb 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.10.0" + classpath "com.android.tools.build:gradle:8.10.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.0" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" @@ -29,7 +29,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '7.0.3' + id 'com.diffplug.spotless' version '7.0.4' } allprojects { diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index c304de612..4c798e534 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -81,11 +81,11 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.05.00') + def composeBom = platform('androidx.compose:compose-bom:2025.06.00') implementation(composeBom) androidTestImplementation(composeBom) - implementation "androidx.appcompat:appcompat:1.7.0" + implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.core:core-ktx:1.16.0" implementation "com.google.android.material:material:1.12.0" diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index ea6290056..61e4febb4 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.10.0" + classpath "com.android.tools.build:gradle:8.10.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } } plugins { - id 'com.diffplug.spotless' version '7.0.3' + id 'com.diffplug.spotless' version '7.0.4' } subprojects { diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-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 4c364884f..3765a36a4 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,20 +1,20 @@ [versions] coil = "2.7.0" -com-android-application = "8.10.0" +com-android-application = "8.10.1" desugar_jdk_libs = "2.1.5" kotlinx-datetime = "0.6.1" -lifecycle-viewmodel-compose = "2.9.0" +lifecycle-viewmodel-compose = "2.9.1" material-icons-core = "1.7.8" -media3 = "1.6.1" +media3 = "1.7.1" org-jetbrains-kotlin-android = "2.1.10" 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.0" +lifecycle-runtime-ktx = "2.9.1" activity-compose = "1.10.1" -compose-bom = "2025.05.00" -runtime-tracing = "1.8.1" +compose-bom = "2025.06.00" +runtime-tracing = "1.8.2" tracing-ktx = "1.3.0" tracing-perfetto = "1.0.0" uiautomator = "2.3.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.3" +spotless = "7.0.4" ktlint = "1.2.1" [libraries] diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 9a401550e..03bf8ebb7 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -84,14 +84,14 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2025.05.00') + def composeBom = platform('androidx.compose:compose-bom:2025.06.00') implementation(composeBom) androidTestImplementation(composeBom) - implementation "androidx.appcompat:appcompat:1.7.0" + implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.core:core-ktx:1.16.0" implementation "com.google.android.material:material:1.12.0" - implementation "androidx.fragment:fragment-ktx:1.8.6" + implementation "androidx.fragment:fragment-ktx:1.8.8" // Compose implementation "androidx.compose.runtime:runtime" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 12409fb01..1cbd0ebbc 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.10.0" + classpath "com.android.tools.build:gradle:8.10.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } } plugins { - id 'com.diffplug.spotless' version '7.0.3' + id 'com.diffplug.spotless' version '7.0.4' } subprojects { diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 880c6e58f..d64661313 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.05.00') + def composeBom = platform('androidx.compose:compose-bom:2025.06.00') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -109,15 +109,15 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1" - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.appcompat:appcompat:1.7.1' implementation 'androidx.activity:activity-ktx:1.10.1' implementation 'androidx.core:core-ktx:1.16.0' implementation "androidx.activity:activity-compose:1.10.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.0" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0" + 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" 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 64b7b0340..f0ee04b86 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.10.0' + classpath 'com.android.tools.build:gradle:8.10.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } } plugins { - id 'com.diffplug.spotless' version '7.0.3' + id 'com.diffplug.spotless' version '7.0.4' } subprojects { diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index 70bf8f635..bd4ed5040 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.05.00') + def composeBom = platform('androidx.compose:compose-bom:2025.06.00') implementation(composeBom) implementation 'androidx.core:core-ktx:1.16.0' diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index f72a38169..4092a4719 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.10.0" + classpath "com.android.tools.build:gradle:8.10.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties index ca025c83a..ff23a68d7 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME