From ab821d64c93572aab3dd2d15f6251bfa9a06d546 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:08:11 +0000 Subject: [PATCH 1/2] Update all dependencies --- AccessibilityCodelab/app/build.gradle | 4 ++-- AdaptiveUiCodelab/gradle/libs.versions.toml | 4 ++-- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 10 +++++----- BasicLayoutsCodelab/app/build.gradle | 4 ++-- BasicStateCodelab/app/build.gradle.kts | 4 ++-- BasicsCodelab/app/build.gradle.kts | 4 ++-- MigrationCodelab/app/build.gradle | 8 ++++---- NavigationCodelab/app/build.gradle | 4 ++-- PerformanceCodelab/gradle/libs.versions.toml | 4 ++-- TestingCodelab/app/build.gradle | 4 ++-- ThemingCodelab/app/build.gradle | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index df0eceac2..6eac746d6 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -125,8 +125,8 @@ dependencies { implementation 'androidx.navigation:navigation-compose:2.7.7' - androidTestImplementation 'androidx.test:rules:1.5.0' - androidTestImplementation 'androidx.test:runner:1.5.2' + androidTestImplementation 'androidx.test:rules:1.6.0' + androidTestImplementation 'androidx.test:runner:1.6.0' // TODO: Bump to latest after Espresso 3.5.0 goes stable // (due to https://github.com/robolectric/robolectric/issues/6593) diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 97087f2c7..7a1fe8855 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -3,9 +3,9 @@ androidGradlePlugin = "8.5.0" composeBom = "2024.06.00" coreKtx = "1.13.1" activityCompose = "1.9.0" -espressoCore = "3.5.1" +espressoCore = "3.6.0" junit = "4.13.2" -junitVersion = "1.1.5" +junitVersion = "1.2.0" kotlin = "2.0.0" kotlinxCoroutinesAndroid = "1.8.1" lifecycle = "2.8.2" diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 5e20e33fb..b7981206e 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -128,11 +128,11 @@ dependencies { implementation "io.coil-kt:coil-compose:2.6.0" androidTestImplementation "junit:junit:4.13.2" - androidTestImplementation "androidx.test:core:1.5.0" - androidTestImplementation "androidx.test:runner:1.5.2" - 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 "androidx.test:core:1.6.0" + androidTestImplementation "androidx.test:runner:1.6.0" + androidTestImplementation "androidx.test:rules:1.6.0" + androidTestImplementation "androidx.test.espresso:espresso-core:3.6.0" + androidTestImplementation "androidx.test.ext:junit-ktx:1.2.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" diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 67a83ea34..985a24b41 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -75,8 +75,8 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.2' implementation 'androidx.activity:activity-compose:1.9.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0' androidTestImplementation "androidx.compose.ui:ui-test-junit4" debugImplementation "androidx.compose.ui:ui-tooling" } diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index 87a78158b..2c3dced2f 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -74,8 +74,8 @@ dependencies { implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.material3:material3") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation("androidx.test.ext:junit:1.2.0") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.0") androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts index a9666e6a1..b5a70bf12 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -74,8 +74,8 @@ dependencies { implementation("androidx.compose.material3:material3") implementation("androidx.compose.material:material-icons-extended") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation("androidx.test.ext:junit:1.2.0") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.0") androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index e0442b9f3..52c966dc4 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -97,10 +97,10 @@ dependencies { // Testing dependencies androidTestImplementation "androidx.arch.core:core-testing:2.2.0" - androidTestImplementation "androidx.test.espresso:espresso-contrib:3.5.1" - androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1" - androidTestImplementation "androidx.test.espresso:espresso-intents:3.5.1" - androidTestImplementation "androidx.test.ext:junit:1.1.5" + androidTestImplementation "androidx.test.espresso:espresso-contrib:3.6.0" + androidTestImplementation "androidx.test.espresso:espresso-core:3.6.0" + androidTestImplementation "androidx.test.espresso:espresso-intents:3.6.0" + androidTestImplementation "androidx.test.ext:junit:1.2.0" androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0" androidTestImplementation "androidx.work:work-testing:2.9.0" androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1" diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 8aa35f576..7a01f3cf3 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -100,8 +100,8 @@ dependencies { // Testing dependencies androidTestImplementation "androidx.arch.core:core-testing:2.2.0" - androidTestImplementation "androidx.test.espresso:espresso-contrib:3.5.1" - androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1" + androidTestImplementation "androidx.test.espresso:espresso-contrib:3.6.0" + androidTestImplementation "androidx.test.espresso:espresso-core:3.6.0" // Compose testing dependencies androidTestImplementation "androidx.compose.ui:ui-test-junit4" diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 804c8b2ce..e17b6a537 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -9,8 +9,8 @@ media3 = "1.3.1" org-jetbrains-kotlin-android = "2.0.0" core-ktx = "1.13.1" junit = "4.13.2" -androidx-test-ext-junit = "1.1.5" -espresso-core = "3.5.1" +androidx-test-ext-junit = "1.2.0" +espresso-core = "3.6.0" lifecycle-runtime-ktx = "2.8.2" activity-compose = "1.9.0" compose-bom = "2024.06.00" diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 37d7d67c9..04729faa6 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -108,8 +108,8 @@ dependencies { // Testing dependencies androidTestImplementation "androidx.arch.core:core-testing:2.2.0" - androidTestImplementation "androidx.test.espresso:espresso-contrib:3.5.1" - androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1" + androidTestImplementation "androidx.test.espresso:espresso-contrib:3.6.0" + androidTestImplementation "androidx.test.espresso:espresso-core:3.6.0" // Compose testing dependencies androidTestImplementation "androidx.compose.ui:ui-test" diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 29847618c..b8b7f70a3 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -119,8 +119,8 @@ dependencies { implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2" - androidTestImplementation 'androidx.test:rules:1.5.0' - androidTestImplementation 'androidx.test:runner:1.5.2' + androidTestImplementation 'androidx.test:rules:1.6.0' + androidTestImplementation 'androidx.test:runner:1.6.0' } From 37f0bc0d3d3e0160d2f203530bf7c658cf4501aa Mon Sep 17 00:00:00 2001 From: Jonathan Koren Date: Tue, 25 Jun 2024 09:50:45 -0700 Subject: [PATCH 2/2] Fix 'No static method forceEnableAppTracing' error --- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 1 + MigrationCodelab/app/build.gradle | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index b7981206e..707407661 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -105,6 +105,7 @@ dependencies { implementation "androidx.activity:activity-compose:1.9.0" implementation "androidx.appcompat:appcompat:1.7.0" + implementation "androidx.tracing:tracing:1.2.0" def composeBom = platform('androidx.compose:compose-bom:2024.06.00') implementation(composeBom) diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 52c966dc4..c4034a4bc 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -77,6 +77,7 @@ dependencies { implementation "androidx.recyclerview:recyclerview:1.3.2" implementation "androidx.room:room-runtime:2.6.1" implementation "androidx.room:room-ktx:2.6.1" + implementation "androidx.tracing:tracing:1.2.0" implementation "androidx.viewpager2:viewpager2:1.1.0" implementation "androidx.work:work-runtime-ktx:2.9.0" implementation "com.github.bumptech.glide:glide:4.16.0" @@ -107,4 +108,4 @@ dependencies { androidTestImplementation "com.google.truth:truth:1.4.2" androidTestImplementation "androidx.compose.ui:ui-test-junit4" testImplementation "junit:junit:4.13.2" -} \ No newline at end of file +}