Merge pull request #1722 from android/revert-1630-dependabot/gradle/protobuf-4.28.2

Revert "Bump protobuf from 4.26.1 to 4.28.2"
2 weeks ago · b21835909c
parent 047b44dc68 729681b79a
commit b21835909c
128 changed files with 3 additions and 3 deletions
--- a/app/dependencies/prodReleaseRuntimeClasspath.txt
+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt
@ -194,8 +194,8 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:31.1-android
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.protobuf:protobuf-javalite:4.28.2
+com.google.protobuf:protobuf-javalite:4.26.1
-com.google.protobuf:protobuf-kotlin-lite:4.28.2
+com.google.protobuf:protobuf-kotlin-lite:4.26.1
 com.squareup.okhttp3:logging-interceptor:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.0
--- a/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png
+++ b/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png
--- a/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png
+++ b/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png
--- a/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png
+++ b/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png
--- a/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png
+++ b/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png
--- a/app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png
+++ b/app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png
--- a/app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png
+++ b/app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png
--- a/app/src/testDemo/screenshots/insets_snackbar_compact_medium.png
+++ b/app/src/testDemo/screenshots/insets_snackbar_compact_medium.png
--- a/app/src/testDemo/screenshots/insets_snackbar_compact_medium_noSnackbar.png
+++ b/app/src/testDemo/screenshots/insets_snackbar_compact_medium_noSnackbar.png
--- a/app/src/testDemo/screenshots/insets_snackbar_expanded_expanded.png
+++ b/app/src/testDemo/screenshots/insets_snackbar_expanded_expanded.png
--- a/app/src/testDemo/screenshots/insets_snackbar_medium_medium.png
+++ b/app/src/testDemo/screenshots/insets_snackbar_medium_medium.png
--- a/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png
+++ b/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png
--- a/app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png
+++ b/app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png
--- a/app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png
+++ b/app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png
--- a/app/src/testDemo/screenshots/snackbar_compact_medium.png
+++ b/app/src/testDemo/screenshots/snackbar_compact_medium.png
--- a/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png
+++ b/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png
--- a/app/src/testDemo/screenshots/snackbar_expanded_expanded.png
+++ b/app/src/testDemo/screenshots/snackbar_expanded_expanded.png
--- a/app/src/testDemo/screenshots/snackbar_medium_medium.png
+++ b/app/src/testDemo/screenshots/snackbar_medium_medium.png
--- a/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Background/Background_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/Background_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/Button_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_fontScale2.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_fontScale2.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_1000.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_1000.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_115.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_115.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_20.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_20.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_724.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_animation_724.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png
+++ b/core/designsystem/src/test/screenshots/Navigation/Navigation_fontScale2.png
--- a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Tabs/Tabs_fontScale2.png
+++ b/core/designsystem/src/test/screenshots/Tabs/Tabs_fontScale2.png
--- a/core/designsystem/src/test/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png
+++ b/core/designsystem/src/test/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png
--- a/core/designsystem/src/test/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png
--- a/core/designsystem/src/test/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png
+++ b/core/designsystem/src/test/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png
--- a/Show More
+++ b/Show More