diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index a33747d30..f592214f6 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,13 +22,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.12.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20" } } plugins { id 'com.diffplug.spotless' version '7.2.1' - id 'org.jetbrains.kotlin.plugin.compose' version "2.1.21" apply false + id 'org.jetbrains.kotlin.plugin.compose' version "2.2.20" apply false } subprojects { diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 142b663fa..7fbc84391 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -6,7 +6,7 @@ activityCompose = "1.10.1" espressoCore = "3.7.0" junit = "4.13.2" junitVersion = "1.3.0" -kotlin = "2.1.21" +kotlin = "2.2.20" kotlinxCoroutinesAndroid = "1.10.2" lifecycle = "2.9.2" window = "1.4.0" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 7941c22a8..09fba777e 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.12.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20" classpath "com.google.dagger:hilt-android-gradle-plugin:2.57" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 10ca6fb49..bfa0c9a8a 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:8.12.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.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index f8c44f995..6cac83bef 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.12.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.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index 911548d1b..0c7dbd27e 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.12.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.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts index 14784a39b..629190786 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.12.1" 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 + id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false } diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 22c918388..bfe5114bc 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,9 +22,9 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.12.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.3" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index bf84af9d6..4dd7132f4 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.12.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.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 75b87afb0..85d325614 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.12.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.2" material-icons-core = "1.7.8" media3 = "1.8.0" -org-jetbrains-kotlin-android = "2.1.21" +org-jetbrains-kotlin-android = "2.2.20" core-ktx = "1.17.0" junit = "4.13.2" androidx-test-ext-junit = "1.3.0" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 5fb6ee86a..f5553ee13 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.12.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.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index ad4d00724..8aaa1f24e 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.12.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.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 7325f0092..781cfacb7 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.12.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.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20" } }