Merge pull request #396 from android/renovate/end-kotlin-dependencies

MagicalMeghan · web-flow · commit 68a907935ba6 · 2024-01-05T16:41:11.000-05:00
Update Kotlin Dependencies to v1.9.22 (end)
diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle
@@ -63,7 +63,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
@@ -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/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/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
@@ -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/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/build.gradle b/TestingCodelab/build.gradle
@@ -25,13 +25,13 @@ buildscript {
         // App dependencies
         appCompatVersion = '1.6.1'
         activityComposeVersion = '1.8.1'
-        composeCompilerVersion = '1.5.4'
+        composeCompilerVersion = '1.5.7'
         coreTestingVersion = '2.2.0'
         coroutinesVersion = "1.5.2"
         espressoVersion = '3.5.1'
         fragmentVersion = '1.6.2'
         junitVersion = '4.13.1'
-        kotlinVersion = '1.9.20'
+        kotlinVersion = '1.9.21'
         ktlintVersion = '0.48.2'
         ktxVersion = '1.12.0'
         lifecycleVersion = '2.3.0'
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"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ android {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`composeOptions {`
`66`		`- kotlinCompilerExtensionVersion '1.5.4'`
	`66`	`+ kotlinCompilerExtensionVersion '1.5.7'`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`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
`@@ -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`	`}`
`26`	`26`	`}`
`27`	`27`
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
`@@ -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`