diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 0a24eb895..b0652ce2e 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -110,7 +110,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.2" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0" implementation 'androidx.appcompat:appcompat:1.7.1' implementation 'androidx.activity:activity-ktx:1.13.0' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index ebd865b17..8008ec843 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,13 +22,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:9.2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21" } } plugins { id 'com.diffplug.spotless' version '8.4.0' - id 'org.jetbrains.kotlin.plugin.compose' version "2.3.10" apply false + id 'org.jetbrains.kotlin.plugin.compose' version "2.3.21" apply false } subprojects { diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 9416e5561..2dfbbf3ae 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -6,8 +6,8 @@ activityCompose = "1.13.0" espressoCore = "3.7.0" junit = "4.13.2" junitVersion = "1.3.0" -kotlin = "2.3.10" -kotlinxCoroutinesAndroid = "1.10.2" +kotlin = "2.3.21" +kotlinxCoroutinesAndroid = "1.11.0" lifecycle = "2.10.0" window = "1.5.1" diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index a9c5d7158..e1bc05151 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -88,7 +88,7 @@ android { } dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0" implementation "com.google.android.libraries.maps:maps:3.1.0-beta" implementation "com.google.maps.android:maps-v3-ktx:3.4.0" constraints { @@ -121,7 +121,7 @@ dependencies { implementation "com.google.dagger:hilt-android:2.59.2" ksp "com.google.dagger:hilt-compiler:2.59.2" - ksp "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10" + ksp "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.21" implementation "io.coil-kt:coil-compose:2.7.0" @@ -131,9 +131,9 @@ dependencies { androidTestImplementation "androidx.test:rules:1.7.0" androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0" androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0" - androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2" + androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.11.0" androidTestImplementation "com.google.dagger:hilt-android:2.59.2" androidTestImplementation "com.google.dagger:hilt-android-testing:2.59.2" kspAndroidTest "com.google.dagger:hilt-compiler:2.59.2" - kspAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10" + kspAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.21" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index b2b087e9c..2b8d06cb2 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:9.2.1" classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.2" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21" classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.7" } } diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 48923985d..cce4d6e95 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:9.2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 591828d62..5eccfd149 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:9.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21" } } diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index 622136981..fd1381e52 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:9.2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21" } } diff --git a/BasicsCodelab/gradle/libs.versions.toml b/BasicsCodelab/gradle/libs.versions.toml index da6960340..53bc08d93 100644 --- a/BasicsCodelab/gradle/libs.versions.toml +++ b/BasicsCodelab/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "9.2.1" -kotlin = "2.3.10" +kotlin = "2.3.21" coreKtx = "1.18.0" junit = "4.13.2" androidxJunit = "1.3.0" diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 0aefe511a..39cc3201b 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -79,8 +79,8 @@ dependencies { implementation "com.github.bumptech.glide:glide:5.0.7" implementation "com.google.android.material:material:1.13.0" implementation "com.google.code.gson:gson:2.14.0" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0" // Compose implementation "androidx.compose.runtime:runtime" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 6fc740c99..c4697fdda 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,9 +22,9 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:9.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.8" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21" } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 7220a532e..68fc6baaf 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:9.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21" } } diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 6974e3d17..2aafbc059 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -2,11 +2,11 @@ coil = "2.7.0" com-android-application = "9.2.1" desugar_jdk_libs = "2.1.5" -kotlinx-datetime = "0.7.1-0.6.x-compat" +kotlinx-datetime = "0.8.0-0.6.x-compat" lifecycle-viewmodel-compose = "2.10.0" material-icons-core = "1.7.8" media3 = "1.10.1" -org-jetbrains-kotlin-android = "2.3.10" +org-jetbrains-kotlin-android = "2.3.21" core-ktx = "1.18.0" junit = "4.13.2" androidx-test-ext-junit = "1.3.0" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 40f546002..584a05d18 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:9.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21" } } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 7a390e171..a598ea1b4 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -106,7 +106,7 @@ dependencies { androidTestImplementation "androidx.compose.ui:ui-test" androidTestImplementation "androidx.compose.ui:ui-test-junit4" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0" implementation 'androidx.appcompat:appcompat:1.7.1' implementation 'androidx.activity:activity-ktx:1.13.0' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 6049b3f6c..287f6cac2 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:9.2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21" } } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index b0b7f5b6a..9539ed7b9 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:9.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21" } }