From be221b20259398c941666b3d2e3a9a88bbf0cf27 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 13:12:55 +0000 Subject: [PATCH 1/3] Update Kotlin Dependencies --- AccessibilityCodelab/app/build.gradle | 2 +- AccessibilityCodelab/build.gradle | 4 ++-- AdaptiveUiCodelab/gradle/libs.versions.toml | 4 ++-- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 4 ++-- AdvancedStateAndSideEffectsCodelab/build.gradle | 4 ++-- AnimationCodelab/build.gradle | 4 ++-- BasicLayoutsCodelab/build.gradle | 4 ++-- BasicStateCodelab/build.gradle | 4 ++-- BasicsCodelab/build.gradle.kts | 4 ++-- MigrationCodelab/app/build.gradle | 4 ++-- MigrationCodelab/build.gradle | 4 ++-- NavigationCodelab/build.gradle | 4 ++-- PerformanceCodelab/gradle/libs.versions.toml | 2 +- TestingCodelab/build.gradle | 4 ++-- ThemingCodelab/app/build.gradle | 2 +- ThemingCodelab/build.gradle | 4 ++-- ThemingCodelabM2/build.gradle | 4 ++-- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 31aa0840..2b1ebc8a 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -111,7 +111,7 @@ dependencies { implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version" implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-ktx:1.9.3' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 86d50fe7..926186a5 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,13 +22,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.7.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" } } plugins { id 'com.diffplug.spotless' version '6.25.0' - id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20" apply false + id 'org.jetbrains.kotlin.plugin.compose' version "2.0.21" apply false } subprojects { diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index a297d537..2e6f0c49 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -6,8 +6,8 @@ activityCompose = "1.9.3" espressoCore = "3.6.1" junit = "4.13.2" junitVersion = "1.2.1" -kotlin = "2.0.20" -kotlinxCoroutinesAndroid = "1.8.1" +kotlin = "2.0.21" +kotlinxCoroutinesAndroid = "1.9.0" lifecycle = "2.8.7" window = "1.3.0" diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 42a6422e..0967d7b6 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -93,7 +93,7 @@ android { } dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" implementation "com.google.android.libraries.maps:maps:3.1.0-beta" implementation "com.google.maps.android:maps-v3-ktx:3.4.0" constraints { @@ -134,7 +134,7 @@ dependencies { androidTestImplementation "androidx.test:rules:1.6.1" androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1" androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1" - androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1" + androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0" androidTestImplementation "com.google.dagger:hilt-android:2.52" androidTestImplementation "com.google.dagger:hilt-android-testing:2.52" kaptAndroidTest "com.google.dagger:hilt-compiler:2.52" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 38222c52..2a35b0d5 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" classpath "com.google.dagger:hilt-android-gradle-plugin:2.52" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 8c2dea9b..7349272b 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:8.7.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 8da09f90..47830483 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index c66b26b4..8e09fb54 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.7.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts index 61f89805..b1ead499 100644 --- a/BasicsCodelab/build.gradle.kts +++ b/BasicsCodelab/build.gradle.kts @@ -17,6 +17,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id("com.android.application") version "8.7.2" apply false - id("org.jetbrains.kotlin.android") version "2.0.20" apply false - id("org.jetbrains.kotlin.plugin.compose") version "2.0.20" apply false + id("org.jetbrains.kotlin.android") version "2.0.21" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 6d9adb57..62a77078 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -83,8 +83,8 @@ dependencies { implementation "com.github.bumptech.glide:glide:4.16.0" implementation "com.google.android.material:material:1.12.0" implementation "com.google.code.gson:gson:2.11.0" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0" // Compose implementation "androidx.compose.runtime:runtime" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 0ee92b29..02c4e350 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,9 +22,9 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.3" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 91309a0d..d0e90cfe 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 8bcc2f56..a6606e97 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -6,7 +6,7 @@ kotlinx-datetime = "0.6.1" lifecycle-viewmodel-compose = "2.8.7" material-icons-core = "1.7.5" media3 = "1.4.1" -org-jetbrains-kotlin-android = "2.0.20" +org-jetbrains-kotlin-android = "2.0.21" core-ktx = "1.15.0" junit = "4.13.2" androidx-test-ext-junit = "1.2.1" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 404257a6..55c42aca 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 42f0323f..2e580ccc 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -107,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.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-ktx:1.9.3' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 72a42dee..cb1ee007 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.7.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index a9eaf106..95cf3f22 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } From be7f8c805c8c72db23bd44460c5ae2dc2925ff6b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 15:51:18 +0000 Subject: [PATCH 2/3] Update Kotlin Dependencies --- AccessibilityCodelab/app/build.gradle | 2 +- AccessibilityCodelab/build.gradle | 4 ++-- AdaptiveUiCodelab/gradle/libs.versions.toml | 4 ++-- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 4 ++-- AdvancedStateAndSideEffectsCodelab/build.gradle | 4 ++-- AnimationCodelab/build.gradle | 4 ++-- BasicLayoutsCodelab/build.gradle | 4 ++-- BasicStateCodelab/build.gradle | 4 ++-- BasicsCodelab/build.gradle.kts | 4 ++-- MigrationCodelab/app/build.gradle | 4 ++-- MigrationCodelab/build.gradle | 4 ++-- NavigationCodelab/build.gradle | 4 ++-- PerformanceCodelab/gradle/libs.versions.toml | 2 +- TestingCodelab/build.gradle | 4 ++-- ThemingCodelab/app/build.gradle | 2 +- ThemingCodelab/build.gradle | 4 ++-- ThemingCodelabM2/build.gradle | 4 ++-- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 31aa0840..2b1ebc8a 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -111,7 +111,7 @@ dependencies { implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version" implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-ktx:1.9.3' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 86d50fe7..926186a5 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,13 +22,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.7.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" } } plugins { id 'com.diffplug.spotless' version '6.25.0' - id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20" apply false + id 'org.jetbrains.kotlin.plugin.compose' version "2.0.21" apply false } subprojects { diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index a297d537..2e6f0c49 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -6,8 +6,8 @@ activityCompose = "1.9.3" espressoCore = "3.6.1" junit = "4.13.2" junitVersion = "1.2.1" -kotlin = "2.0.20" -kotlinxCoroutinesAndroid = "1.8.1" +kotlin = "2.0.21" +kotlinxCoroutinesAndroid = "1.9.0" lifecycle = "2.8.7" window = "1.3.0" diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 42a6422e..0967d7b6 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -93,7 +93,7 @@ android { } dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" implementation "com.google.android.libraries.maps:maps:3.1.0-beta" implementation "com.google.maps.android:maps-v3-ktx:3.4.0" constraints { @@ -134,7 +134,7 @@ dependencies { androidTestImplementation "androidx.test:rules:1.6.1" androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1" androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1" - androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1" + androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0" androidTestImplementation "com.google.dagger:hilt-android:2.52" androidTestImplementation "com.google.dagger:hilt-android-testing:2.52" kaptAndroidTest "com.google.dagger:hilt-compiler:2.52" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 38222c52..2a35b0d5 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" classpath "com.google.dagger:hilt-android-gradle-plugin:2.52" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 8c2dea9b..7349272b 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:8.7.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 8da09f90..47830483 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index c66b26b4..8e09fb54 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -21,8 +21,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.7.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts index 61f89805..b1ead499 100644 --- a/BasicsCodelab/build.gradle.kts +++ b/BasicsCodelab/build.gradle.kts @@ -17,6 +17,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id("com.android.application") version "8.7.2" apply false - id("org.jetbrains.kotlin.android") version "2.0.20" apply false - id("org.jetbrains.kotlin.plugin.compose") version "2.0.20" apply false + id("org.jetbrains.kotlin.android") version "2.0.21" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false } diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 6d9adb57..62a77078 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -83,8 +83,8 @@ dependencies { implementation "com.github.bumptech.glide:glide:4.16.0" implementation "com.google.android.material:material:1.12.0" implementation "com.google.code.gson:gson:2.11.0" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0" // Compose implementation "androidx.compose.runtime:runtime" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 0ee92b29..02c4e350 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,9 +22,9 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.3" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 91309a0d..d0e90cfe 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 8bcc2f56..a6606e97 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -6,7 +6,7 @@ kotlinx-datetime = "0.6.1" lifecycle-viewmodel-compose = "2.8.7" material-icons-core = "1.7.5" media3 = "1.4.1" -org-jetbrains-kotlin-android = "2.0.20" +org-jetbrains-kotlin-android = "2.0.21" core-ktx = "1.15.0" junit = "4.13.2" androidx-test-ext-junit = "1.2.1" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 404257a6..55c42aca 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 42f0323f..2e580ccc 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -107,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.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0" implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-ktx:1.9.3' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 72a42dee..cb1ee007 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.7.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index a9eaf106..95cf3f22 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.7.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21" } } From 3b2599f64dbcb56170bd2b89ef2078f381d351e6 Mon Sep 17 00:00:00 2001 From: Jolanda Verhoef Date: Wed, 6 Nov 2024 16:33:55 +0000 Subject: [PATCH 3/3] Remove unused test rule that was giving deprecation error --- .../samples/crane/CoroutinesTestRule.kt | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 AdvancedStateAndSideEffectsCodelab/app/src/androidTest/java/androidx/compose/samples/crane/CoroutinesTestRule.kt diff --git a/AdvancedStateAndSideEffectsCodelab/app/src/androidTest/java/androidx/compose/samples/crane/CoroutinesTestRule.kt b/AdvancedStateAndSideEffectsCodelab/app/src/androidTest/java/androidx/compose/samples/crane/CoroutinesTestRule.kt deleted file mode 100644 index b3e3d7df..00000000 --- a/AdvancedStateAndSideEffectsCodelab/app/src/androidTest/java/androidx/compose/samples/crane/CoroutinesTestRule.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.compose.samples.crane - -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.test.TestCoroutineDispatcher -import kotlinx.coroutines.test.resetMain -import kotlinx.coroutines.test.setMain -import org.junit.rules.TestWatcher -import org.junit.runner.Description - -@OptIn(ExperimentalCoroutinesApi::class) -class CoroutinesTestRule constructor( - val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher() -) : TestWatcher() { - - override fun starting(description: Description?) { - super.starting(description) - Dispatchers.setMain(testDispatcher) - } - - override fun finished(description: Description?) { - super.finished(description) - Dispatchers.resetMain() - testDispatcher.cleanupTestCoroutines() - } -}