diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 967a2ac23..7d0628383 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,13 +22,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.5.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" } } plugins { id 'com.diffplug.spotless' version '6.25.0' - id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" apply false + id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20" apply false } subprojects { diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index d8417414d..ec94b128e 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -6,7 +6,7 @@ activityCompose = "1.9.0" espressoCore = "3.6.0" junit = "4.13.2" junitVersion = "1.2.0" -kotlin = "2.0.0" +kotlin = "2.0.20" kotlinxCoroutinesAndroid = "1.8.1" lifecycle = "2.8.2" material3Adaptive = "1.0.0-beta03" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 01d431de9..ba2da4863 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.5.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 23b10dd79..bd072ba46 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.5.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } } diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index f81af428a..f20103af5 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,9 +22,9 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.5.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } } diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 561fdd540..1c672363f 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -70,7 +70,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.14' + kotlinCompilerExtensionVersion '1.5.15' } packagingOptions { diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 150214b4c..c152d13e6 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.5.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } } diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index e17b6a537..f2d2f3433 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -2,11 +2,11 @@ coil = "2.6.0" com-android-application = "8.5.0" desugar_jdk_libs = "2.0.4" -kotlinx-datetime = "0.6.0" +kotlinx-datetime = "0.6.1" lifecycle-viewmodel-compose = "2.8.2" material-icons-core = "1.6.8" media3 = "1.3.1" -org-jetbrains-kotlin-android = "2.0.0" +org-jetbrains-kotlin-android = "2.0.20" core-ktx = "1.13.1" junit = "4.13.2" androidx-test-ext-junit = "1.2.0" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index e6cb3cc47..e1c829f7f 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -30,7 +30,7 @@ buildscript { espressoVersion = '3.6.0' fragmentVersion = '1.8.0' junitVersion = '4.13.1' - kotlinVersion = '2.0.0' + kotlinVersion = '2.0.20' ktlintVersion = '0.48.2' ktxVersion = '1.13.1' lifecycleVersion = '2.3.0' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index dacd45f86..b4daa2604 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.5.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } }