From 1eaf824654b688d88b8163c3c59db84d3c511948 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 21:16:49 +0000 Subject: [PATCH 1/2] Update all dependencies --- AccessibilityCodelab/app/build.gradle | 2 +- AccessibilityCodelab/build.gradle | 2 +- AdaptiveUICodelab/app/build.gradle | 2 +- AdaptiveUICodelab/build.gradle | 2 +- .../app/build.gradle | 14 +++++++------- AdvancedStateAndSideEffectsCodelab/build.gradle | 4 ++-- AnimationCodelab/build.gradle | 2 +- AnimationCodelab/finished/build.gradle | 2 +- AnimationCodelab/start/build.gradle | 2 +- BasicLayoutsCodelab/app/build.gradle | 4 ++-- BasicLayoutsCodelab/build.gradle | 2 +- BasicStateCodelab/app/build.gradle.kts | 4 ++-- BasicStateCodelab/build.gradle | 2 +- BasicsCodelab/app/build.gradle.kts | 4 ++-- BasicsCodelab/build.gradle.kts | 2 +- MigrationCodelab/app/build.gradle | 4 ++-- 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, 36 insertions(+), 36 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index b44983f9b..3a2679312 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -90,7 +90,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 0af99b325..9902f9e99 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.2' + classpath 'com.android.tools.build:gradle:8.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/AdaptiveUICodelab/app/build.gradle b/AdaptiveUICodelab/app/build.gradle index 23334af8a..f62696bde 100644 --- a/AdaptiveUICodelab/app/build.gradle +++ b/AdaptiveUICodelab/app/build.gradle @@ -65,7 +65,7 @@ android { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle index f996e7f0b..34827c4aa 100644 --- a/AdaptiveUICodelab/build.gradle +++ b/AdaptiveUICodelab/build.gradle @@ -19,7 +19,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.2.2" + classpath "com.android.tools.build:gradle:8.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 5f0611c34..e5959dcf8 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -109,7 +109,7 @@ dependencies { implementation "androidx.activity:activity-compose:1.8.2" implementation "androidx.appcompat:appcompat:1.6.1" - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -125,10 +125,10 @@ dependencies { def lifecycle_version = "2.7.0" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "com.google.dagger:hilt-android:2.50" - kapt "com.google.dagger:hilt-compiler:2.50" + implementation "com.google.dagger:hilt-android:2.51" + kapt "com.google.dagger:hilt-compiler:2.51" - implementation "io.coil-kt:coil-compose:2.5.0" + implementation "io.coil-kt:coil-compose:2.6.0" androidTestImplementation "junit:junit:4.13.2" androidTestImplementation "androidx.test:core:1.5.0" @@ -137,7 +137,7 @@ dependencies { 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.8.0" - androidTestImplementation "com.google.dagger:hilt-android:2.50" - androidTestImplementation "com.google.dagger:hilt-android-testing:2.50" - kaptAndroidTest "com.google.dagger:hilt-compiler:2.50" + androidTestImplementation "com.google.dagger:hilt-android:2.51" + androidTestImplementation "com.google.dagger:hilt-android-testing:2.51" + kaptAndroidTest "com.google.dagger:hilt-compiler:2.51" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index d91b5a2c0..2ab84c0d6 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,9 +20,9 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.2.2" + classpath "com.android.tools.build:gradle:8.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" - classpath "com.google.dagger:hilt-android-gradle-plugin:2.50" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.51" } } diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index f301cc2a5..d470d6699 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.2.2' + classpath 'com.android.tools.build:gradle:8.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index 2d01355dc..2bf970876 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -45,7 +45,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.8.2' diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index 2d01355dc..2bf970876 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -45,7 +45,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) implementation 'androidx.activity:activity-compose:1.8.2' diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 51156bc10..3f2beeb11 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -63,14 +63,14 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) androidTestImplementation(composeBom) implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.compose.ui:ui" implementation 'androidx.compose.material3:material3' - implementation 'androidx.compose.material3:material3-window-size-class:1.2.0' + implementation 'androidx.compose.material3:material3-window-size-class:1.2.1' implementation "androidx.compose.material:material-icons-extended" implementation "androidx.compose.ui:ui-tooling-preview" implementation "com.google.android.material:material:1.11.0" diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index ec4b58ecb..e0ff2ff2a 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.2.2" + classpath "com.android.tools.build:gradle:8.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index c429e60ae..a1ec2943b 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -70,7 +70,7 @@ dependencies { implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0") implementation("androidx.activity:activity-compose:1.8.2") - implementation(platform("androidx.compose:compose-bom:2024.02.01")) + implementation(platform("androidx.compose:compose-bom:2024.02.02")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -78,7 +78,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.01")) + androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.02")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index 0f36d4e8a..76c43f78b 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.2' + classpath 'com.android.tools.build:gradle:8.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts index e240ca96b..b551cc544 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -69,7 +69,7 @@ dependencies { implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") implementation("androidx.activity:activity-compose:1.8.2") - implementation(platform("androidx.compose:compose-bom:2024.02.01")) + implementation(platform("androidx.compose:compose-bom:2024.02.02")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -78,7 +78,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.01")) + androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.02")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts index 9a745d86c..fb591ff86 100644 --- a/BasicsCodelab/build.gradle.kts +++ b/BasicsCodelab/build.gradle.kts @@ -16,6 +16,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.2" apply false + id("com.android.application") version "8.3.0" 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 8d0328b07..c3d1a9833 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -61,7 +61,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) androidTestImplementation(composeBom) @@ -105,7 +105,7 @@ dependencies { 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.0" - androidTestImplementation "com.google.truth:truth:1.4.1" + 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 diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 9eaead590..ed17aeee2 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.2.2" + classpath "com.android.tools.build:gradle:8.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7" } diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 88a96323b..668cb61b7 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index c891a35e6..766815c37 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.2.2" + classpath "com.android.tools.build:gradle:8.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index b8bb95975..4798a4be4 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 8575d4eb1..a176262a7 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.2.2" + classpath "com.android.tools.build:gradle:8.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index fd4877143..8f4491b9e 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -90,7 +90,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 499dd914f..58e110173 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.2' + classpath 'com.android.tools.build:gradle:8.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index 1d145e911..7b9962c13 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -46,7 +46,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.02.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation(composeBom) implementation 'androidx.core:core-ktx:1.12.0' diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 5fdfa0d7b..655ecc1c3 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.2.2" + classpath "com.android.tools.build:gradle:8.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } From 6bea606f588fa83e7e0725d29659d7c43eb2a040 Mon Sep 17 00:00:00 2001 From: Chris Arriola Date: Wed, 6 Mar 2024 13:36:41 -0800 Subject: [PATCH 2/2] Use @SdkSuppress instead of @RequiresApi in test --- .../example/compose/rally/AssertScreenshotMatchesGolden.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TestingCodelab/app/src/androidTest/java/com/example/compose/rally/AssertScreenshotMatchesGolden.kt b/TestingCodelab/app/src/androidTest/java/com/example/compose/rally/AssertScreenshotMatchesGolden.kt index 5bfd3f5d6..a7516640f 100644 --- a/TestingCodelab/app/src/androidTest/java/com/example/compose/rally/AssertScreenshotMatchesGolden.kt +++ b/TestingCodelab/app/src/androidTest/java/com/example/compose/rally/AssertScreenshotMatchesGolden.kt @@ -19,10 +19,10 @@ package com.example.compose.rally import android.graphics.Bitmap import android.graphics.BitmapFactory import android.os.Build -import androidx.annotation.RequiresApi import androidx.compose.ui.graphics.asAndroidBitmap import androidx.compose.ui.test.SemanticsNodeInteraction import androidx.compose.ui.test.captureToImage +import androidx.test.filters.SdkSuppress import androidx.test.platform.app.InstrumentationRegistry import java.io.FileOutputStream @@ -35,7 +35,7 @@ import java.io.FileOutputStream * * Screenshots are saved on device in `/data/data/{package}/files`. */ -@RequiresApi(Build.VERSION_CODES.O) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O) fun assertScreenshotMatchesGolden( goldenName: String, node: SemanticsNodeInteraction