Commit 5afd5ef8 authored by Peter K. Lee's avatar Peter K. Lee Committed by Commit Bot

Manual MDC Roll

Rolling both material_components_ios and material_internationalization_ios

TBR=javierrobles@chromium.org

Bug: 873293
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I2ccf4f69418002585d13261f35c9a28396261478
Reviewed-on: https://chromium-review.googlesource.com/1173719Reviewed-by: default avatarPeter Lee <pkl@chromium.org>
Commit-Queue: Peter Lee <pkl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582830}
parent 8399dbae
...@@ -286,7 +286,7 @@ deps = { ...@@ -286,7 +286,7 @@ deps = {
}, },
'src/ios/third_party/material_components_ios/src': { 'src/ios/third_party/material_components_ios/src': {
'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '3a50c7a3b2f4ec760d2d2405b6b9787e5493c049', 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '3988e00ce10ad570929792aa5bbfa48e25d37e83',
'condition': 'checkout_ios', 'condition': 'checkout_ios',
}, },
...@@ -296,7 +296,7 @@ deps = { ...@@ -296,7 +296,7 @@ deps = {
}, },
'src/ios/third_party/material_internationalization_ios/src': { 'src/ios/third_party/material_internationalization_ios/src': {
'url': Var('chromium_git') + '/external/github.com/material-foundation/material-internationalization-ios.git' + '@' + '8f28a55c7f35b95a587bba01a8467ea470647873', 'url': Var('chromium_git') + '/external/github.com/material-foundation/material-internationalization-ios.git' + '@' + 'c62f2cacaba48f8901ad811f23c2cbc9581364aa',
'condition': 'checkout_ios', 'condition': 'checkout_ios',
}, },
......
...@@ -68,9 +68,10 @@ source_set("material_components_ios") { ...@@ -68,9 +68,10 @@ source_set("material_components_ios") {
"src/components/AnimationTiming/src/UIView+MDCTimingFunction.h", "src/components/AnimationTiming/src/UIView+MDCTimingFunction.h",
"src/components/AnimationTiming/src/UIView+MDCTimingFunction.m", "src/components/AnimationTiming/src/UIView+MDCTimingFunction.m",
"src/components/AppBar/src/MDCAppBar.h", "src/components/AppBar/src/MDCAppBar.h",
"src/components/AppBar/src/MDCAppBar.m",
"src/components/AppBar/src/MDCAppBarContainerViewController.h", "src/components/AppBar/src/MDCAppBarContainerViewController.h",
"src/components/AppBar/src/MDCAppBarContainerViewController.m", "src/components/AppBar/src/MDCAppBarContainerViewController.m",
"src/components/AppBar/src/MDCAppBarViewController.h",
"src/components/AppBar/src/MDCAppBarViewController.m",
"src/components/AppBar/src/MaterialAppBar.h", "src/components/AppBar/src/MaterialAppBar.h",
"src/components/BottomSheet/src/MDCBottomSheetController.h", "src/components/BottomSheet/src/MDCBottomSheetController.h",
"src/components/BottomSheet/src/MDCBottomSheetController.m", "src/components/BottomSheet/src/MDCBottomSheetController.m",
...@@ -97,6 +98,12 @@ source_set("material_components_ios") { ...@@ -97,6 +98,12 @@ source_set("material_components_ios") {
"src/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.h", "src/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.h",
"src/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m", "src/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m",
"src/components/ButtonBar/src/private/MDCButtonBarButton.m", "src/components/ButtonBar/src/private/MDCButtonBarButton.m",
"src/components/Buttons/src/ButtonThemer/MDCButtonScheme.h",
"src/components/Buttons/src/ButtonThemer/MDCButtonScheme.m",
"src/components/Buttons/src/ButtonThemer/MDCTextButtonThemer.h",
"src/components/Buttons/src/ButtonThemer/MDCTextButtonThemer.m",
"src/components/Buttons/src/ColorThemer/MDCTextButtonColorThemer.h",
"src/components/Buttons/src/ColorThemer/MDCTextButtonColorThemer.m",
"src/components/Buttons/src/MDCButton.h", "src/components/Buttons/src/MDCButton.h",
"src/components/Buttons/src/MDCButton.m", "src/components/Buttons/src/MDCButton.m",
"src/components/Buttons/src/MDCFlatButton.h", "src/components/Buttons/src/MDCFlatButton.h",
...@@ -106,6 +113,8 @@ source_set("material_components_ios") { ...@@ -106,6 +113,8 @@ source_set("material_components_ios") {
"src/components/Buttons/src/MDCRaisedButton.h", "src/components/Buttons/src/MDCRaisedButton.h",
"src/components/Buttons/src/MDCRaisedButton.m", "src/components/Buttons/src/MDCRaisedButton.m",
"src/components/Buttons/src/MaterialButtons.h", "src/components/Buttons/src/MaterialButtons.h",
"src/components/Buttons/src/TypographyThemer/MDCButtonTypographyThemer.h",
"src/components/Buttons/src/TypographyThemer/MDCButtonTypographyThemer.m",
"src/components/Buttons/src/private/MDCButton+Subclassing.h", "src/components/Buttons/src/private/MDCButton+Subclassing.h",
"src/components/CollectionCells/src/MDCCollectionViewCell.h", "src/components/CollectionCells/src/MDCCollectionViewCell.h",
"src/components/CollectionCells/src/MDCCollectionViewCell.m", "src/components/CollectionCells/src/MDCCollectionViewCell.m",
...@@ -302,6 +311,9 @@ source_set("material_components_ios") { ...@@ -302,6 +311,9 @@ source_set("material_components_ios") {
"src/components/AppBar/src", "src/components/AppBar/src",
"src/components/BottomSheet/src", "src/components/BottomSheet/src",
"src/components/ButtonBar/src", "src/components/ButtonBar/src",
"src/components/Buttons/src/ButtonThemer",
"src/components/Buttons/src/ColorThemer",
"src/components/Buttons/src/TypographyThemer",
"src/components/NavigationBar/src", "src/components/NavigationBar/src",
"src/components/OverlayWindow/src", "src/components/OverlayWindow/src",
"src/components/private/Math/src", "src/components/private/Math/src",
......
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// This forwarding header allows to import the file using import directives
// assuming the code is build as a framework bundle while building it as a
// source set. This is required as multiple third-party dependencies disagree on
// that point.
#import "ios/third_party/material_internationalization_ios/src/Sources/NSLocale+MaterialRTL.h"
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// This forwarding header allows to import the file using import directives
// assuming the code is build as a framework bundle while building it as a
// source set. This is required as multiple third-party dependencies disagree on
// that point.
#import "ios/third_party/material_internationalization_ios/src/Sources/NSString+MaterialBidi.h"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment