From 471dafb913c7539b1fd55086c7c89fd688e0a179 Mon Sep 17 00:00:00 2001 From: Olivier Robin Date: Mon, 27 Jun 2022 10:06:02 +0000 Subject: [PATCH] Roll src/ios/third_party/material_components_ios/src/ 3a4ccf8e3..72287f831 (5 commits) https://chromium.googlesource.com/external/github.com/material-components/material-components-ios.git/+log/3a4ccf8e3c9a..72287f8311a8 $ git log 3a4ccf8e3..72287f831 --date=short --no-merges --format='%ad %ae %s' 2022-06-22 wenyuz [Material iOS] Annotate "deprecated" symbols for Tab related components. 2022-06-22 objc Mark symbols to be deprecated 2022-06-21 milagreen Mark symbols to be deprecated 2022-06-21 objc Mark symbols to be deprecated 2022-06-21 objc Mark symbols to be deprecated Created with: roll-dep src/ios/third_party/material_components_ios/src Disable availability warning (see crbug/1339746) Change-Id: I47344a01d048acb99309e069ba1242ae2c54d8fd Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3721014 Auto-Submit: Olivier Robin Reviewed-by: Sylvain Defresne Commit-Queue: Sylvain Defresne Cr-Commit-Position: refs/heads/main@{#1018157} --- DEPS | 2 +- .../chrome_internal_dynamic_framework.ios.zip.sha1 | 2 +- ..._internal_dynamic_framework.iossimulator.zip.sha1 | 2 +- ...hrome_sso_internal_dynamic_framework.ios.zip.sha1 | 2 +- ..._internal_dynamic_framework.iossimulator.zip.sha1 | 2 +- ...g_dogfood_internal_dynamic_framework.ios.zip.sha1 | 2 +- ..._internal_dynamic_framework.iossimulator.zip.sha1 | 2 +- .../remoting_internal_dynamic_framework.ios.zip.sha1 | 2 +- ..._internal_dynamic_framework.iossimulator.zip.sha1 | 2 +- ...iew_shell_internal_dynamic_framework.ios.zip.sha1 | 2 +- ..._internal_dynamic_framework.iossimulator.zip.sha1 | 2 +- ios/third_party/material_components_ios/BUILD.gn | 12 ++++++++++++ 12 files changed, 23 insertions(+), 11 deletions(-) diff --git a/DEPS b/DEPS index b3baf81dedaff8..195c503fe7c769 100644 --- a/DEPS +++ b/DEPS @@ -780,7 +780,7 @@ deps = { }, 'src/ios/third_party/material_components_ios/src': { - 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '3a4ccf8e3c9a4422efe6b9af0c641e09b4afae2c', + 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '72287f8311a8a6afda482d451bfc9dbfb9f6c3f4', 'condition': 'checkout_ios', }, diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 index 3d42dd32172e7b..a8bd167cdc5f68 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -3918c58906f3b29b2f039c5ad1261a61cc812850 \ No newline at end of file +b3be12d1dc7687a0918c420e60105a939d810323 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 index 389cd021c39385..8bc33cd65dea3e 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -05585db86d7ebdccf0b37e769d159d618154fa3d \ No newline at end of file +0c641280e4efe1b832246f1c058acfedf4dfde21 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 index cd5a504a198f56..38857e9de9e9e3 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -43ca43eaf2bfb0d54475136fdfac95405d0be29a \ No newline at end of file +f7cafb609bfda98f82fa3c7ff08a01f7be9cde41 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 index 26dd7d84e2cc0c..33f4cd468d17de 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -a44812257a33aa9cfbd0c60c3cfc78043c104369 \ No newline at end of file +730abc018dfb9e451c6d0ecc86b5c373a810116e \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 index 054f6f5b91eca7..59030372e2a7ec 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -401ee5a99d4a5f25a8187981f3aa3460fd1e2d21 \ No newline at end of file +bd7ec7ed6038a31d6d2ccd4e65e437996f56be76 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 index 85d95dacfce159..48dbbe2ce6e4eb 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -7a2f7c208252e8f106e06d8f7420877197c72c3d \ No newline at end of file +d3505cc5cf770c62c0c05fae40a7cba3917efbd1 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 index 49cd85dfc642d2..f9c0a3e93e85e2 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -a698e963e21147ecec98633d9130799e83533308 \ No newline at end of file +7dd7eba0aaf693ec6671807d36cedb1f2f93eee1 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 index d6c7bddc73ca2e..c0d370a5677d6a 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -48049c7a0102cd1894636629087e257f1c7a02b0 \ No newline at end of file +57fd4ef18bda74e8627dd7fbcf26e7574a56689b \ No newline at end of file diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 index ad4557ac92f0eb..b6c9b8544d1ca0 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -474fc1622c4ea789ee2a1a8ad2a8f2ee1b90ad85 \ No newline at end of file +8dcee02f88c8aa2eb7d30ac1626f25d0f7a4ad1a \ No newline at end of file diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 index e107289616cd8e..65cf4e4e3b2972 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -e435132e3288565833d3ad03e780c7236aa829be \ No newline at end of file +e881e266d8d0ad69fbc17c28e7d211ad3b32caf1 \ No newline at end of file diff --git a/ios/third_party/material_components_ios/BUILD.gn b/ios/third_party/material_components_ios/BUILD.gn index 43a6e64605aff1..27faa8a6a330fc 100644 --- a/ios/third_party/material_components_ios/BUILD.gn +++ b/ios/third_party/material_components_ios/BUILD.gn @@ -1598,6 +1598,13 @@ config("disable_nullability_completeness") { cflags = [ "-Wno-nullability-completeness" ] } +# TODO(crbug.com/1339746): MDCNavigationBar.h has conflicting deprecation +# specification, causing compilation to fail. Disable the warning until this +# is fixed in MDC. Remove this once fixed. +config("disable_availability") { + cflags = [ "-Wno-availability" ] +} + ios_framework_bundle("material_components_ios") { sources = _mdc_sources @@ -1640,6 +1647,11 @@ ios_framework_bundle("material_components_ios") { # nullability specification, causing compilation to fail. Disable # the warning until this is fixed in MDC. Remove this once fixed. ":disable_nullability_completeness", + + # TODO(crbug.com/1339746): MDCNavigationBar.h has conflicting deprecation + # specification, causing compilation to fail. Disable the warning until this + # is fixed in MDC. Remove this once fixed. + ":disable_availability", ] }