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

mlykotom · web-flow · commit 6603c7b07d8e · 2024-06-14T11:44:36.000+02:00
Update Kotlin Dependencies (end)
diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -62,10 +63,6 @@ android {
         compose true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.13'
-    }
-
     packagingOptions {
         excludes += "/META-INF/AL2.0"
         excludes += "/META-INF/LGPL2.1"
@@ -99,7 +96,7 @@ dependencies {
 
     implementation "com.google.android.material:material:1.11.0"
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.activity:activity-ktx:1.9.0'
diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
@@ -22,12 +22,13 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.4.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
     }
 }
 
 plugins {
     id 'com.diffplug.spotless' version '6.25.0'
+    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" apply false
 }
 
 subprojects {
diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -52,9 +53,6 @@ android {
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.13'
-    }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
@@ -81,7 +79,7 @@ dependencies {
     implementation 'androidx.activity:activity-compose:1.9.0'
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation "androidx.window:window:1.2.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
     implementation "androidx.compose.material3:material3-window-size-class:1.2.1"
 
     testImplementation 'junit:junit:4.13.2'
diff --git a/AdaptiveUiCodelab/build.gradle b/AdaptiveUiCodelab/build.gradle
@@ -21,7 +21,8 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.4.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
@@ -19,6 +19,7 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 // Reads the Google maps key that is used in the AndroidManifest
@@ -83,10 +84,6 @@ android {
         shaders false
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.13'
-    }
-
     packagingOptions {
         // Multiple dependency bring these files in. Exclude them to enable
         // our test APK to build (has no effect on our AARs)
@@ -96,7 +93,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
     implementation "com.google.android.libraries.maps:maps:3.1.0-beta"
     implementation "com.google.maps.android:maps-v3-ktx:3.4.0"
     constraints {
@@ -138,7 +135,7 @@ dependencies {
     androidTestImplementation "androidx.test:rules:1.5.0"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
     androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
-    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1"
     androidTestImplementation "com.google.dagger:hilt-android:2.51.1"
     androidTestImplementation "com.google.dagger:hilt-android-testing:2.51.1"
     kaptAndroidTest "com.google.dagger:hilt-compiler:2.51.1"
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -21,8 +21,9 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.4.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -52,9 +53,6 @@ android {
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.13'
-    }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
@@ -20,7 +20,8 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.4.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle
@@ -18,6 +18,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
+apply plugin: 'org.jetbrains.kotlin.plugin.compose'
+
 
 android {
     compileSdkVersion 34
@@ -49,9 +51,6 @@ android {
         dataBinding true
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.13'
-    }
     packagingOptions {
         // Multiple dependency bring these files in. Exclude them to enable
         // our test APK to build (has no effect on our AARs)
@@ -83,8 +82,8 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:4.16.0"
     implementation "com.google.android.material:material:1.11.0"
     implementation "com.google.code.gson:gson:2.10.1"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
 
     // Compose
     implementation "androidx.compose.runtime:runtime"
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
@@ -22,8 +22,9 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.4.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -69,7 +70,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.13'
+        kotlinCompilerExtensionVersion '1.5.14'
     }
 
     packagingOptions {
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
@@ -22,7 +22,8 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.4.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml
@@ -2,11 +2,11 @@
 coil = "2.6.0"
 com-android-application = "8.3.2"
 desugar_jdk_libs = "2.0.4"
-kotlinx-datetime = "0.5.0"
+kotlinx-datetime = "0.6.0"
 lifecycle-viewmodel-compose = "2.7.0"
 material-icons-core = "1.6.6"
 media3 = "1.3.1"
-org-jetbrains-kotlin-android = "2.0.0-RC2"
+org-jetbrains-kotlin-android = "2.0.0"
 core-ktx = "1.13.0"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.1.5"
diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue May 16 11:33:31 AEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -75,10 +76,6 @@ android {
         shaders false
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion rootProject.composeCompilerVersion
-    }
-
     packagingOptions {
         exclude "META-INF/licenses/**"
         exclude "META-INF/AL2.0"
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
@@ -25,13 +25,12 @@ buildscript {
         // App dependencies
         appCompatVersion = '1.6.1'
         activityComposeVersion = '1.9.0'
-        composeCompilerVersion = '1.5.13'
         coreTestingVersion = '2.2.0'
         coroutinesVersion = "1.5.2"
         espressoVersion = '3.5.1'
         fragmentVersion = '1.7.0'
         junitVersion = '4.13.1'
-        kotlinVersion = '1.9.23'
+        kotlinVersion = '2.0.0'
         ktlintVersion = '0.48.2'
         ktxVersion = '1.13.1'
         lifecycleVersion = '2.3.0'
@@ -51,6 +50,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion"
     }
 }
 
diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -79,10 +80,6 @@ android {
         compose true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.13'
-    }
-
     packagingOptions {
         excludes += "/META-INF/AL2.0"
         excludes += "/META-INF/LGPL2.1"
@@ -110,7 +107,7 @@ dependencies {
     androidTestImplementation "androidx.compose.ui:ui-test"
     androidTestImplementation "androidx.compose.ui:ui-test-junit4"
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.activity:activity-ktx:1.9.0'
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
@@ -22,7 +22,8 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.4.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,13 @@ buildscript {`
`22`	`22`
`23`	`23`	`dependencies {`
`24`	`24`	`classpath 'com.android.tools.build:gradle:8.4.0'`
`25`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"`
	`25`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.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.0" apply false`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ buildscript {`
`21`	`21`	`}`
`22`	`22`	`dependencies {`
`23`	`23`	`classpath "com.android.tools.build:gradle:8.4.0"`
`24`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"`
	`24`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"`
	`25`	`+ classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@ buildscript {`
`21`	`21`	`}`
`22`	`22`	`dependencies {`
`23`	`23`	`classpath "com.android.tools.build:gradle:8.4.0"`
`24`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"`
	`24`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"`
`25`	`25`	`classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"`
	`26`	`+ classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`