diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 7135286f7..78191844b 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,13 +22,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.10.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0" } } plugins { id 'com.diffplug.spotless' version '7.0.4' - id 'org.jetbrains.kotlin.plugin.compose' version "2.1.21" apply false + id 'org.jetbrains.kotlin.plugin.compose' version "2.2.0" apply false } subprojects { diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 32a7ea599..0bfd1ea3a 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -6,7 +6,7 @@ activityCompose = "1.10.1" espressoCore = "3.6.1" junit = "4.13.2" junitVersion = "1.2.1" -kotlin = "2.1.21" +kotlin = "2.2.0" kotlinxCoroutinesAndroid = "1.10.2" lifecycle = "2.9.1" material3Adaptive = "1.1.0" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index b32674ea8..22de8b203 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.10.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0" classpath "com.google.dagger:hilt-android-gradle-plugin:2.56.2" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.0" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index bc450897f..4f06a3e7b 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.10.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.0" } } diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index d1053a8c8..7002750f3 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,9 +22,9 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.10.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.0" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.0" } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index e74dfd91d..f3264e2c9 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.10.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.0" } } diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 67964b79d..1e42b5a55 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.1" desugar_jdk_libs = "2.1.5" -kotlinx-datetime = "0.6.2" +kotlinx-datetime = "0.7.1-0.6.x-compat" lifecycle-viewmodel-compose = "2.9.1" material-icons-core = "1.7.8" media3 = "1.7.1" -org-jetbrains-kotlin-android = "2.1.21" +org-jetbrains-kotlin-android = "2.2.0" 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 3e5860073..0c51c9080 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -30,7 +30,7 @@ buildscript { espressoVersion = '3.6.1' fragmentVersion = '1.8.8' junitVersion = '4.13.1' - kotlinVersion = '2.1.21' + kotlinVersion = '2.2.0' ktlintVersion = '0.48.2' ktxVersion = '1.16.0' lifecycleVersion = '2.3.0' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 42a0527af..3732d5333 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.10.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.0" } }