diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index febad5514..860a83def 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -94,7 +94,7 @@ dependencies { implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version" implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1" implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-ktx:1.10.0' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 8cd15906f..5285027bb 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,13 +22,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.8.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" } } plugins { id 'com.diffplug.spotless' version '7.0.2' - id 'org.jetbrains.kotlin.plugin.compose' version "2.1.0" apply false + id 'org.jetbrains.kotlin.plugin.compose' version "2.1.10" apply false } subprojects { diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 870446f7b..5b1f80596 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -6,8 +6,8 @@ activityCompose = "1.10.0" espressoCore = "3.6.1" junit = "4.13.2" junitVersion = "1.2.1" -kotlin = "2.1.0" -kotlinxCoroutinesAndroid = "1.9.0" +kotlin = "2.1.10" +kotlinxCoroutinesAndroid = "1.10.1" lifecycle = "2.8.7" material3Adaptive = "1.0.0" material3AdaptiveNavSuite = "1.3.1" diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 0456dcd4f..5d73cb0fc 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -93,7 +93,7 @@ android { } dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1" implementation "com.google.android.libraries.maps:maps:3.1.0-beta" implementation "com.google.maps.android:maps-v3-ktx:3.4.0" constraints { @@ -136,7 +136,7 @@ dependencies { androidTestImplementation "androidx.test:rules:1.6.1" 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 "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1" androidTestImplementation "com.google.dagger:hilt-android:2.55" androidTestImplementation "com.google.dagger:hilt-android-testing:2.55" kaptAndroidTest "com.google.dagger:hilt-compiler:2.55" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 9208338c4..11ca46981 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.8.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "com.google.dagger:hilt-android-gradle-plugin:2.55" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 52f60c96c..ae88377c1 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.8.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 0f36902f0..0bd74d70c 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -83,8 +83,8 @@ dependencies { implementation "com.github.bumptech.glide:glide:4.16.0" implementation "com.google.android.material:material:1.12.0" implementation "com.google.code.gson:gson:2.12.0" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1" // Compose implementation "androidx.compose.runtime:runtime" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 01fdec58d..e3ab4e67a 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,9 +22,9 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.8.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.6" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index b5865167c..f147c8e07 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.8.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } } diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index be63993c1..32b2193d7 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -6,7 +6,7 @@ kotlinx-datetime = "0.6.1" lifecycle-viewmodel-compose = "2.8.7" material-icons-core = "1.7.7" media3 = "1.5.1" -org-jetbrains-kotlin-android = "2.1.0" +org-jetbrains-kotlin-android = "2.1.10" core-ktx = "1.15.0" junit = "4.13.2" androidx-test-ext-junit = "1.2.1" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 08f0b6f1e..8f92d8196 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -30,7 +30,7 @@ buildscript { espressoVersion = '3.6.1' fragmentVersion = '1.8.5' junitVersion = '4.13.1' - kotlinVersion = '2.1.0' + kotlinVersion = '2.1.10' ktlintVersion = '0.48.2' ktxVersion = '1.15.0' lifecycleVersion = '2.3.0' diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index f2e46e694..ff7087b23 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -107,7 +107,7 @@ dependencies { androidTestImplementation "androidx.compose.ui:ui-test" androidTestImplementation "androidx.compose.ui:ui-test-junit4" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1" implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-ktx:1.10.0' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index f62387d3d..642fecbd5 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.8.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" } }