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

Update Kotlin Dependencies (end)
android · Jul 25, 2023 · 1e0189c · 1e0189c
2 parents 3f9e18b + e86f681
commit 1e0189c
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 29 deletions.
diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle
@@ -63,7 +63,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.6'
+        kotlinCompilerExtensionVersion '1.4.8'
     }
 
     packagingOptions {
@@ -100,7 +100,7 @@ dependencies {
 
     implementation "com.google.android.material:material:1.9.0"
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.activity:activity-ktx:1.7.1'

diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.0.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
     }
 }
 

diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle
@@ -53,7 +53,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.6'
+        kotlinCompilerExtensionVersion '1.4.8'
     }
     packagingOptions {
         resources {
@@ -81,10 +81,10 @@ dependencies {
     implementation 'androidx.activity:activity-compose:1.7.1'
     implementation 'androidx.core:core-ktx:1.10.1'
     implementation "androidx.window:window:1.0.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
     implementation "androidx.compose.material3:material3-window-size-class:1.2.0-alpha01"
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-}
+}
diff --git a/AdaptiveUiCodelab/build.gradle b/AdaptiveUiCodelab/build.gradle
@@ -17,7 +17,7 @@
 plugins {
     id 'com.android.application' version "8.0.1" apply false
     id 'com.android.library' version "8.0.1" apply false
-    id 'org.jetbrains.kotlin.android' version "1.8.20" apply false
+    id 'org.jetbrains.kotlin.android' version "1.8.22" apply false
 }
 
 task clean(type: Delete) {

diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
@@ -84,7 +84,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.6"
+        kotlinCompilerExtensionVersion '1.4.8'
     }
 
     packagingOptions {
@@ -96,8 +96,8 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
     implementation "com.google.android.libraries.maps:maps:3.1.0-beta"
     implementation "com.google.maps.android:maps-v3-ktx:3.4.0"
     constraints {
@@ -139,7 +139,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.6.4"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1"
     androidTestImplementation "com.google.dagger:hilt-android:2.46"
     androidTestImplementation "com.google.dagger:hilt-android-testing:2.46"
     kaptAndroidTest "com.google.dagger:hilt-compiler:2.46"

diff --git a/...deEffectsCodelab/app/src/androidTest/java/androidx/compose/samples/crane/home/HomeTest.kt b/...deEffectsCodelab/app/src/androidTest/java/androidx/compose/samples/crane/home/HomeTest.kt
@@ -39,7 +39,7 @@ class HomeTest {
     @Test
     fun home_navigatesToAllScreens() {
         // Waits until loading is finished
-        composeTestRule.waitUntil(timeoutMillis = 4000L) {
+        composeTestRule.waitUntil(timeoutMillis = 10_000L) {
             composeTestRule
                 .onAllNodesWithText("Explore Flights by Destination")
                 .fetchSemanticsNodes().size == 1

diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.0.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.46"
     }
 }

diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle
@@ -53,7 +53,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.6'
+        kotlinCompilerExtensionVersion '1.4.8'
     }
     packagingOptions {
         resources {
@@ -80,4 +80,4 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4"
     debugImplementation "androidx.compose.ui:ui-tooling"
-}
+}
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
@@ -17,7 +17,7 @@
 plugins {
     id 'com.android.application' version '8.0.1' apply false
     id 'com.android.library' version '8.0.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
     id 'com.diffplug.spotless' version '6.18.0'
 }
 

diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle
@@ -50,7 +50,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.6'
+        kotlinCompilerExtensionVersion '1.4.8'
     }
     packagingOptions {
         // Multiple dependency bring these files in. Exclude them to enable
@@ -83,9 +83,9 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:4.15.1"
     implementation "com.google.android.material:material:1.9.0"
     implementation "com.google.code.gson:gson:2.10.1"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
 
     // Compose
     implementation "androidx.compose.runtime:runtime"
@@ -110,4 +110,4 @@ dependencies {
     androidTestImplementation "com.google.truth:truth:1.1.3"
     androidTestImplementation "androidx.compose.ui:ui-test-junit4"
     testImplementation "junit:junit:4.13.2"
-}
+}
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.0.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
     }
 }

diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle
@@ -69,7 +69,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.6"
+        kotlinCompilerExtensionVersion '1.4.8'
     }
 
     packagingOptions {

diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.0.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
     }
 }
 

diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
@@ -25,13 +25,13 @@ buildscript {
         // App dependencies
         appCompatVersion = '1.6.1'
         activityComposeVersion = '1.7.1'
-        composeCompilerVersion = '1.4.6'
+        composeCompilerVersion = '1.4.8'
         coreTestingVersion = '2.2.0'
         coroutinesVersion = "1.5.2"
         espressoVersion = '3.5.1'
         fragmentVersion = '1.5.7'
         junitVersion = '4.13.1'
-        kotlinVersion = '1.8.20'
+        kotlinVersion = '1.8.22'
         ktlintVersion = '0.48.2'
         ktxVersion = '1.10.1'
         lifecycleVersion = '2.3.0'

diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle
@@ -80,7 +80,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.6'
+        kotlinCompilerExtensionVersion '1.4.8'
     }
 
     packagingOptions {
@@ -110,7 +110,7 @@ dependencies {
     androidTestImplementation "androidx.compose.ui:ui-test"
     androidTestImplementation "androidx.compose.ui:ui-test-junit4"
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.activity:activity-ktx:1.7.1'

diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.0.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
     }
 }