diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 932c9bd91..e5b94cec9 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -111,7 +111,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.10.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-ktx:1.10.1' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 1ba4d869b..b345ecb4c 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,13 +22,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.10.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" } } plugins { id 'com.diffplug.spotless' version '7.0.3' - id 'org.jetbrains.kotlin.plugin.compose' version "2.1.10" apply false + id 'org.jetbrains.kotlin.plugin.compose' version "2.1.21" apply false } subprojects { diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 92a344418..95f4d5946 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -6,8 +6,8 @@ activityCompose = "1.10.1" espressoCore = "3.6.1" junit = "4.13.2" junitVersion = "1.2.1" -kotlin = "2.1.10" -kotlinxCoroutinesAndroid = "1.10.1" +kotlin = "2.1.21" +kotlinxCoroutinesAndroid = "1.10.2" lifecycle = "2.9.0" window = "1.3.0" diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 9a0a831ab..3dcd49140 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.10.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" implementation "com.google.android.libraries.maps:maps:3.1.0-beta" implementation "com.google.maps.android:maps-v3-ktx:3.4.0" constraints { @@ -134,7 +134,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.10.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" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index e5958be88..7f5361d3c 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.10.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "com.google.dagger:hilt-android-gradle-plugin:2.56.2" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 143a03750..d2b5221d9 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:8.10.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 54913a08e..a9186fe29 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.10.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index 01e636457..a6961b509 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.10.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts index 940cc2f88..8f43f9c17 100644 --- a/BasicsCodelab/build.gradle.kts +++ b/BasicsCodelab/build.gradle.kts @@ -17,6 +17,6 @@ // 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("org.jetbrains.kotlin.android") version "2.1.10" apply false - id("org.jetbrains.kotlin.plugin.compose") version "2.1.10" 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/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index a8ae438cb..8eee19c1f 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.13.1" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2" // Compose implementation "androidx.compose.runtime:runtime" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 3389f9497..7b52e548b 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,9 +22,9 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.10.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.0" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index ea6290056..62afdd22d 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.10.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 4c364884f..ea5c06a50 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -2,11 +2,11 @@ coil = "2.7.0" com-android-application = "8.10.0" desugar_jdk_libs = "2.1.5" -kotlinx-datetime = "0.6.1" +kotlinx-datetime = "0.6.2" lifecycle-viewmodel-compose = "2.9.0" material-icons-core = "1.7.8" media3 = "1.6.1" -org-jetbrains-kotlin-android = "2.1.10" +org-jetbrains-kotlin-android = "2.1.21" core-ktx = "1.16.0" junit = "4.13.2" androidx-test-ext-junit = "1.2.1" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 12409fb01..4ff10844a 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.10.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 880c6e58f..1142e8cd2 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.10.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-ktx:1.10.1' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 64b7b0340..0290abbf7 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.10.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" + 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/build.gradle b/ThemingCodelabM2/build.gradle index f72a38169..ce467c65f 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.10.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" } }