From edb5abd7809dda277c95e58ff99c3b8fce888dc2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 15:03:04 +0000 Subject: [PATCH 1/4] Update Kotlin Dependencies to v1.9.22 --- AccessibilityCodelab/build.gradle | 2 +- AdaptiveUICodelab/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/build.gradle | 2 +- AnimationCodelab/build.gradle | 2 +- BasicLayoutsCodelab/build.gradle | 2 +- BasicStateCodelab/build.gradle | 2 +- BasicsCodelab/build.gradle.kts | 2 +- MigrationCodelab/app/build.gradle | 2 +- MigrationCodelab/build.gradle | 2 +- NavigationCodelab/build.gradle | 2 +- TestingCodelab/app/build.gradle | 2 +- TestingCodelab/build.gradle | 2 +- ThemingCodelab/build.gradle | 2 +- ThemingCodelabM2/build.gradle | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 66342a794..3702eae5a 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 61cf29d46..74d6891da 100644 --- 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.22" } } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 44917d455..953735b8c 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/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 7df66fc42..3a5cc7c5a 100644 --- 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.22" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 7f37d4e56..dbb8afc90 100644 --- 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.22" } } diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index fcb3b9a86..44050138e 100644 --- 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.22" } } diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts index 9cbe522f7..a579adf7b 100644 --- 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.22" apply false } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 01814dc30..925463397 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/app/build.gradle b/TestingCodelab/app/build.gradle index 29ff6555a..6f530265b 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -95,7 +95,7 @@ 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" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22" // Compose implementation "androidx.compose.runtime:runtime" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 0c15304d2..e7910c05f 100644 --- 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.22" } } 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" } } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 78903d19a..bfd516d3d 100644 --- 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.22" } } From 386a474907658425b3d6a070ac1c7a33d9d0fbb7 Mon Sep 17 00:00:00 2001 From: Meghan Date: Fri, 5 Jan 2024 14:58:00 -0500 Subject: [PATCH 2/4] 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 +- AnimationCodelab/build.gradle | 2 +- AnimationCodelab/finished/build.gradle | 2 +- AnimationCodelab/start/build.gradle | 2 +- BasicLayoutsCodelab/app/build.gradle | 2 +- BasicLayoutsCodelab/build.gradle | 2 +- BasicStateCodelab/app/build.gradle.kts | 2 +- BasicStateCodelab/build.gradle | 2 +- BasicsCodelab/app/build.gradle.kts | 2 +- BasicsCodelab/build.gradle.kts | 2 +- MigrationCodelab/app/build.gradle | 2 +- MigrationCodelab/build.gradle | 2 +- NavigationCodelab/app/build.gradle | 2 +- NavigationCodelab/build.gradle | 2 +- TestingCodelab/app/build.gradle | 2 +- TestingCodelab/build.gradle | 2 +- ThemingCodelab/app/build.gradle | 2 +- ThemingCodelab/build.gradle | 2 +- ThemingCodelabM2/app/build.gradle | 2 +- ThemingCodelabM2/build.gradle | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 8fb03b2a8..946ed3254 100644 --- 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 index 3702eae5a..618ed50bd 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 b462ab1b3..568bdc6c7 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 74d6891da..19c4903e1 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 953735b8c..4b579d167 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/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 3a5cc7c5a..382b0ca1e 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index f59ad5422..c88158656 100644 --- 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 index f59ad5422..c88158656 100644 --- 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 index 8023348fd..defd60e72 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 dbb8afc90..c9f485e36 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index c488bccad..39a510f2f 100644 --- 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 index 44050138e..df76d574c 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts index b4fcaafd2..02d755f34 100644 --- 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 index a579adf7b..38eb61081 100644 --- 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.22" 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 index 925463397..aab8ec1a3 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 ef1db4179..61f3f483d 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/app/build.gradle b/TestingCodelab/app/build.gradle index 6f530265b..6c2082142 100644 --- 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 { diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index e7910c05f..01bfd9254 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 672dce5c1..5cb7baf01 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" } } diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index f2c0fdbf0..f811a21c2 100644 --- 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 index bfd516d3d..37c49c311 100644 --- 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.22" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" } } From 3b798f82457950192ccff1943c8b35cae98a2fd6 Mon Sep 17 00:00:00 2001 From: Meghan Date: Fri, 5 Jan 2024 15:59:48 -0500 Subject: [PATCH 3/4] 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 4b579d167..fb6b5d1d4 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 aab8ec1a3..76ec56845 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" From edd2f514baa9342b050162ca42d26a0fca07a10f Mon Sep 17 00:00:00 2001 From: Meghan Date: Fri, 5 Jan 2024 16:05:53 -0500 Subject: [PATCH 4/4] remove kotlin-stdlib dependency --- TestingCodelab/app/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 6c2082142..e82920af8 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -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.22" // Compose implementation "androidx.compose.runtime:runtime"