From b49b5c80dc638da5c35fbebcd42fc194f6a1c9ec Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 15:01:22 +0000 Subject: [PATCH 1/3] Update Kotlin Dependencies to v1.9.22 --- AccessibilityCodelab/build.gradle | 2 +- AdaptiveUiCodelab/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/build.gradle | 2 +- BasicLayoutsCodelab/build.gradle | 2 +- MigrationCodelab/app/build.gradle | 2 +- MigrationCodelab/build.gradle | 2 +- NavigationCodelab/build.gradle | 2 +- TestingCodelab/build.gradle | 2 +- ThemingCodelab/build.gradle | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 04cfdc031..d9fba3b5a 100644 --- 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.22" } } diff --git a/AdaptiveUiCodelab/build.gradle b/AdaptiveUiCodelab/build.gradle index 7870b4a13..f10e849b9 100644 --- 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.22" } } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 17fe254d2..3ea1a002a 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -96,7 +96,7 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22" 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 index 28c40ba34..b9e77bec5 100644 --- 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.22" classpath "com.google.dagger:hilt-android-gradle-plugin:2.48.1" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 5a95beb8b..2fff4c839 100644 --- 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.22" } } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 7f9b4a373..d577e5c31 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -83,7 +83,7 @@ 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.kotlin:kotlin-stdlib-jdk8:1.9.22" 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 index 40290a17f..cb747952b 100644 --- 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.22" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.5" } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index a4a7cfe3d..845db6b9d 100644 --- 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.22" } } diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index b8f27768c..87eae078c 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -31,7 +31,7 @@ buildscript { espressoVersion = '3.5.1' fragmentVersion = '1.6.2' junitVersion = '4.13.1' - kotlinVersion = '1.9.20' + kotlinVersion = '1.9.22' ktlintVersion = '0.48.2' ktxVersion = '1.12.0' lifecycleVersion = '2.3.0' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 18cd404e2..b98cdf454 100644 --- 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.22" } } From 8c8c5a348b108b60cf6e5f191459a5c89d7f3a82 Mon Sep 17 00:00:00 2001 From: Meghan Date: Fri, 5 Jan 2024 13:17:50 -0500 Subject: [PATCH 2/3] Update kotlin gradle plugin version and kotlinComposeExtenstionVersion --- AccessibilityCodelab/app/build.gradle | 2 +- AccessibilityCodelab/build.gradle | 2 +- AdaptiveUiCodelab/app/build.gradle | 2 +- AdaptiveUiCodelab/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/build.gradle | 2 +- BasicLayoutsCodelab/app/build.gradle | 2 +- BasicLayoutsCodelab/build.gradle | 2 +- MigrationCodelab/app/build.gradle | 2 +- MigrationCodelab/build.gradle | 2 +- NavigationCodelab/app/build.gradle | 2 +- NavigationCodelab/build.gradle | 2 +- TestingCodelab/build.gradle | 4 ++-- ThemingCodelab/app/build.gradle | 2 +- ThemingCodelab/build.gradle | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 4d1f4415f..20aeb6993 100644 --- 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 index d9fba3b5a..66e8c7623 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle index 8f6306476..22f97cff7 100644 --- 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 index f10e849b9..bc2ba7eca 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 3ea1a002a..2dad4ed87 100644 --- 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 { diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index b9e77bec5..58e484649 100644 --- 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.22" + 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 index 47a109023..b087e2af3 100644 --- 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 index 2fff4c839..2783f4a4c 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index d577e5c31..aac67c378 100644 --- 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 diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index cb747952b..af1c75f7f 100644 --- 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.22" + 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 index c584a68fe..4d16b793c 100644 --- 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 index 845db6b9d..5d6f61e0d 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 87eae078c..24e52c540 100644 --- 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.22' + 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 index e769760b1..cc0b19a96 100644 --- 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 index b98cdf454..9fbfbbc8c 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } From 369975e92934ac75fbbd6361fd63ca28bcbb488c Mon Sep 17 00:00:00 2001 From: Meghan Date: Fri, 5 Jan 2024 16:02:58 -0500 Subject: [PATCH 3/3] remove kotlin-stdlib dependency --- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 1 - MigrationCodelab/app/build.gradle | 1 - 2 files changed, 2 deletions(-) diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 2dad4ed87..ba89f3f9f 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -96,7 +96,6 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22" 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/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index aac67c378..88be7e42c 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -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.22" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"