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

MagicalMeghan · web-flow · commit cb1c1fedbad4 · 2024-01-05T16:40:58.000-05:00
Update Kotlin Dependencies to v1.9.22 (main)
diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle
@@ -80,7 +80,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 
     packagingOptions {
diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.1.4'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
 
diff --git a/AdaptiveUICodelab/app/build.gradle b/AdaptiveUICodelab/app/build.gradle
@@ -53,7 +53,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
     packagingOptions {
         resources {
diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.1.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
 
diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
@@ -84,7 +84,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 
     packagingOptions {
@@ -96,7 +96,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
     implementation "com.google.android.libraries.maps:maps:3.1.0-beta"
     implementation "com.google.maps.android:maps-v3-ktx:3.4.0"
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.1.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.48.1"
     }
 }
diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.1.4'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
 
diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle
@@ -40,7 +40,7 @@ android {
         jvmTarget = '1.8'
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 }
 
diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle
@@ -40,7 +40,7 @@ android {
         jvmTarget = '1.8'
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 }
 
diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle
@@ -53,7 +53,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
     packagingOptions {
         resources {
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.1.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
 
diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts
@@ -56,7 +56,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.4"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     packaging {
         resources {
diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.1.4'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
 
diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts
@@ -56,7 +56,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.4"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     packaging {
         resources {
diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts
@@ -17,5 +17,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id("com.android.application") version "8.1.4" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.20" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.21" apply false
 }
diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle
@@ -50,7 +50,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
     packagingOptions {
         // Multiple dependency bring these files in. Exclude them to enable
@@ -83,7 +83,6 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:4.16.0"
     implementation "com.google.android.material:material:1.10.0"
     implementation "com.google.code.gson:gson:2.10.1"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
 
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.1.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.5"
     }
 }
diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle
@@ -69,7 +69,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 
     packagingOptions {
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.1.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
 
diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle
@@ -76,7 +76,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 
     packagingOptions {
@@ -95,7 +95,6 @@ dependencies {
     implementation "androidx.core:core-ktx:1.12.0"
     implementation "com.google.android.material:material:1.10.0"
     implementation "androidx.fragment:fragment-ktx:1.6.2"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20"
 
     // Compose
     implementation "androidx.compose.runtime:runtime"
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.1.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
 
diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle
@@ -80,7 +80,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 
     packagingOptions {
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.1.4'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
 
diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle
@@ -41,7 +41,7 @@ android {
          compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.4'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 }
 
diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.1.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ android {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`composeOptions {`
`83`		`- kotlinCompilerExtensionVersion '1.5.4'`
	`83`	`+ kotlinCompilerExtensionVersion '1.5.7'`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`packagingOptions {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ buildscript {`
`22`	`22`
`23`	`23`	`dependencies {`
`24`	`24`	`classpath 'com.android.tools.build:gradle:8.1.4'`
`25`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"`
	`25`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ android {`
`53`	`53`	`compose true`
`54`	`54`	`}`
`55`	`55`	`composeOptions {`
`56`		`- kotlinCompilerExtensionVersion '1.5.4'`
	`56`	`+ kotlinCompilerExtensionVersion '1.5.7'`
`57`	`57`	`}`
`58`	`58`	`packagingOptions {`
`59`	`59`	`resources {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ buildscript {`
`20`	`20`	`}`
`21`	`21`	`dependencies {`
`22`	`22`	`classpath "com.android.tools.build:gradle:8.1.4"`
`23`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"`
	`23`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ android {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`composeOptions {`
`87`		`- kotlinCompilerExtensionVersion '1.5.4'`
	`87`	`+ kotlinCompilerExtensionVersion '1.5.7'`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`packagingOptions {`
`@@ -96,7 +96,6 @@ android {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`dependencies {`
`99`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20"`
`100`	`99`	`implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"`
`101`	`100`	`implementation "com.google.android.libraries.maps:maps:3.1.0-beta"`
`102`	`101`	`implementation "com.google.maps.android:maps-v3-ktx:3.4.0"`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ buildscript {`
`21`	`21`	`}`
`22`	`22`	`dependencies {`
`23`	`23`	`classpath "com.android.tools.build:gradle:8.1.4"`
`24`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"`
	`24`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"`
`25`	`25`	`classpath "com.google.dagger:hilt-android-gradle-plugin:2.48.1"`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ android {`
`40`	`40`	`jvmTarget = '1.8'`
`41`	`41`	`}`
`42`	`42`	`composeOptions {`
`43`		`- kotlinCompilerExtensionVersion '1.5.4'`
	`43`	`+ kotlinCompilerExtensionVersion '1.5.7'`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`