From e34d0b70b45efa812a806ac69bdcc7576fc86165 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Jul 2025 22:21:41 +0000 Subject: [PATCH] Update Kotlin Dependencies --- AccessibilityCodelab/build.gradle | 4 ++-- AdaptiveUiCodelab/gradle/libs.versions.toml | 2 +- AdvancedStateAndSideEffectsCodelab/build.gradle | 4 ++-- AnimationCodelab/build.gradle | 4 ++-- BasicLayoutsCodelab/build.gradle | 4 ++-- BasicStateCodelab/build.gradle | 4 ++-- BasicsCodelab/build.gradle.kts | 4 ++-- MigrationCodelab/build.gradle | 4 ++-- NavigationCodelab/build.gradle | 4 ++-- PerformanceCodelab/gradle/libs.versions.toml | 4 ++-- TestingCodelab/build.gradle | 4 ++-- ThemingCodelab/build.gradle | 4 ++-- ThemingCodelabM2/build.gradle | 4 ++-- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index fc0f43708..c75d47bb8 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 bf173ad12..78f2e7976 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" window = "1.4.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/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 47b60be49..a5496cd6a 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -21,8 +21,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/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index d751fa596..7e963ad20 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -21,8 +21,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/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index 89b5eddfd..348ec49cb 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -21,8 +21,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/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts index 1a5377dca..1bcf82a96 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.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.0" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.2.0" apply false } 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 e9bbeb7c7..305bc9a2b 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/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/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" } } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 204f8bbe1..4e02f4ad2 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -21,8 +21,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" } }