Merge pull request #503 from android/renovate/main-kotlin-dependencies

riggaroo · web-flow · commit f486b3b3384d · 2024-12-19T14:12:08.000Z
Update Kotlin Dependencies to v2.1.0 (main)
diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
@@ -22,13 +22,13 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.7.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
     }
 }
 
 plugins {
     id 'com.diffplug.spotless' version '6.25.0'
-    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.21" apply false
+    id 'org.jetbrains.kotlin.plugin.compose' version "2.1.0" apply false
 }
 
 subprojects {
diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ activityCompose = "1.9.3"
 espressoCore = "3.6.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 kotlinxCoroutinesAndroid = "1.9.0"
 lifecycle = "2.8.7"
 window = "1.3.0"
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -21,9 +21,9 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.7.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.53.1"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle
@@ -21,8 +21,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.7.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
@@ -21,8 +21,8 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.7.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
@@ -21,8 +21,8 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.7.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
diff --git 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.7.3" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.21" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false
 }
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
@@ -22,9 +22,9 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.7.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.5"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
@@ -22,8 +22,8 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.7.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ kotlinx-datetime = "0.6.1"
 lifecycle-viewmodel-compose = "2.8.7"
 material-icons-core = "1.7.6"
 media3 = "1.5.0"
-org-jetbrains-kotlin-android = "2.0.21"
+org-jetbrains-kotlin-android = "2.1.0"
 core-ktx = "1.15.0"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.2.1"
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
@@ -22,8 +22,8 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.7.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
@@ -22,8 +22,8 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.7.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 
diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle
@@ -21,8 +21,8 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.7.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@ buildscript {`
`22`	`22`
`23`	`23`	`dependencies {`
`24`	`24`	`classpath 'com.android.tools.build:gradle:8.7.3'`
`25`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"`
	`25`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`plugins {`
`30`	`30`	`id 'com.diffplug.spotless' version '6.25.0'`
`31`		`- id 'org.jetbrains.kotlin.plugin.compose' version "2.0.21" apply false`
	`31`	`+ id 'org.jetbrains.kotlin.plugin.compose' version "2.1.0" apply false`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ buildscript {`
`21`	`21`	`}`
`22`	`22`	`dependencies {`
`23`	`23`	`classpath "com.android.tools.build:gradle:8.7.3"`
`24`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"`
	`24`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"`
`25`	`25`	`classpath "com.google.dagger:hilt-android-gradle-plugin:2.53.1"`
`26`		`- classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"`
	`26`	`+ classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ buildscript {`
`21`	`21`	`}`
`22`	`22`	`dependencies {`
`23`	`23`	`classpath 'com.android.tools.build:gradle:8.7.3'`
`24`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"`
`25`		`- classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"`
	`24`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"`
	`25`	`+ classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@`
`17`	`17`	`// Top-level build file where you can add configuration options common to all sub-projects/modules.`
`18`	`18`	`plugins {`
`19`	`19`	`id("com.android.application") version "8.7.3" apply false`
`20`		`- id("org.jetbrains.kotlin.android") version "2.0.21" apply false`
`21`		`- id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false`
	`20`	`+ id("org.jetbrains.kotlin.android") version "2.1.0" apply false`
	`21`	`+ id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ buildscript {`
`22`	`22`
`23`	`23`	`dependencies {`
`24`	`24`	`classpath "com.android.tools.build:gradle:8.7.3"`
`25`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"`
	`25`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"`
`26`	`26`	`classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.5"`
`27`		`- classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"`
	`27`	`+ classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ buildscript {`
`22`	`22`
`23`	`23`	`dependencies {`
`24`	`24`	`classpath "com.android.tools.build:gradle:8.7.3"`
`25`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"`
`26`		`- classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"`
	`25`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"`
	`26`	`+ classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0"`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`