Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Examples/Tests] Convert @imports to imports #2761

Merged
merged 1 commit into from
Dec 22, 2017
Merged

[Examples/Tests] Convert @imports to imports #2761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Examples/Tests] Convert @imports to imports 
In order to make the internal build systems happier, @import statements should not be used.
  • Loading branch information
Robert Moore committed Dec 22, 2017
commit eed60ef4d9f21bcc01c4b44ac20a882c893ab1f9
2 changes: 1 addition & 1 deletion components/Collections/examples/supplemental/CollectionsSectionInsetsExampleSupplemental.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
limitations under the License.
*/

@import UIKit;
#import <UIKit/UIKit.h>

#import "MaterialCollections.h"

Expand Down
4 changes: 2 additions & 2 deletions components/Collections/tests/earlgrey/MDCCollectionViewControllerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
limitations under the License.
*/

@import XCTest;
@import EarlGrey;
#import <XCTest/XCTest.h>
#import <EarlGrey/EarlGrey.h>

@interface MDCCollectionViewControllerTests : XCTestCase
@end
Expand Down
2 changes: 1 addition & 1 deletion components/Dialogs/examples/supplemental/DialogsAlertViewControllerSupplemental.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#import <UIKit/UIKit.h>

@import MaterialComponents.MaterialCollections;
#import "MaterialCollections.h"

@interface DialogsAlertViewController : MDCCollectionViewController
@property(nonatomic, strong, nullable) NSArray *modes;
Expand Down
2 changes: 1 addition & 1 deletion components/Dialogs/examples/supplemental/DialogsKeyboardViewControllerSupplemental.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#import <UIKit/UIKit.h>

@import MaterialComponents.MaterialCollections;
#import "MaterialCollections.h"

@interface DialogsKeyboardViewController : MDCCollectionViewController
@end
Expand Down
2 changes: 1 addition & 1 deletion components/Dialogs/examples/supplemental/DialogsTypicalUseSupplemental.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#import <UIKit/UIKit.h>

@import MaterialComponents.MaterialCollections;
#import "MaterialCollections.h"

//@class DialogsTypicalUseViewController;

Expand Down
4 changes: 2 additions & 2 deletions components/Snackbar/tests/earlgrey/SnackbarInteractionTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
limitations under the License.
*/

@import XCTest;
@import EarlGrey;
#import <XCTest/XCTest.h>
#import <EarlGrey/EarlGrey.h>

@interface SnackbarEarlGreyTests : XCTestCase

Expand Down
2 changes: 1 addition & 1 deletion components/Tabs/examples/BottomNavigationBarExample.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
limitations under the License.
*/

@import MaterialComponents.MaterialTabs;
#import "MaterialTabs.h"

@interface BottomNavigationBarExample : UIViewController <MDCTabBarDelegate>
@end
Expand Down
6 changes: 3 additions & 3 deletions components/Tabs/examples/TabBarIconExample.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#import "supplemental/TabBarIconExampleSupplemental.h"

@import MaterialComponents.MaterialAppBar;
@import MaterialComponents.MaterialPalettes;
@import MaterialComponents.MaterialTabs;
#import "MaterialAppBar.h"
#import "MaterialPalettes.h"
#import "MaterialTabs.h"

@implementation TabBarIconExample

Expand Down
6 changes: 3 additions & 3 deletions components/Tabs/examples/TabBarInterfaceBuilderExample.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
limitations under the License.
*/

@import UIKit;
#import <UIKit/UIKit.h>

@import MaterialComponents.MaterialPalettes;
@import MaterialComponents.MaterialTabs;
#import "MaterialPalettes.h"
#import "MaterialTabs.h"

@interface TabBarInterfaceBuilderExample : UIViewController <MDCTabBarDelegate>

Expand Down
6 changes: 3 additions & 3 deletions components/Tabs/examples/TabBarViewControllerInterfaceBuilderExample.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
limitations under the License.
*/

@import UIKit;
#import <UIKit/UIKit.h>

@import MaterialComponents.MaterialPalettes;
@import MaterialComponents.MaterialTabs;
#import "MaterialPalettes.h"
#import "MaterialTabs.h"

@interface TabBarViewControllerInterfaceBuilderExample : MDCTabBarViewController

Expand Down
8 changes: 4 additions & 4 deletions components/Tabs/examples/supplemental/TabBarIconExampleSupplemental.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
instructions. It is not necessary to import this file to use Material Components for iOS.
*/

@import UIKit;
#import <UIKit/UIKit.h>

@import MaterialComponents.MaterialAppBar;
@import MaterialComponents.MaterialButtons;
@import MaterialComponents.MaterialTabs;
#import "MaterialAppBar.h"
#import "MaterialButtons.h"
#import "MaterialTabs.h"

@interface TabBarIconExample : UIViewController <MDCTabBarDelegate>

Expand Down
2 changes: 1 addition & 1 deletion components/Tabs/examples/supplemental/TabBarIconExampleSupplemental.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#import "TabBarIconExampleSupplemental.h"

@import MaterialComponents.MaterialPalettes;
#import "MaterialPalettes.h"

// Exposing selectors defined in the main example class
@interface TabBarIconExample ()
Expand Down
6 changes: 3 additions & 3 deletions components/Tabs/examples/supplemental/TabBarTextOnlyExampleSupplemental.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

#import <UIKit/UIKit.h>

@import MaterialComponents.MaterialAppBar;
@import MaterialComponents.MaterialCollections;
@import MaterialComponents.MaterialTabs;
#import "MaterialAppBar.h"
#import "MaterialCollections.h"
#import "MaterialTabs.h"

@interface TabBarTextOnlyExample : MDCCollectionViewController

Expand Down
4 changes: 2 additions & 2 deletions components/Tabs/examples/supplemental/TabBarViewControllerExampleSupplemental.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

#import "TabBarViewControllerExampleSupplemental.h"

@import MaterialComponents.MaterialAppBar;
@import MaterialComponents.MaterialPalettes;
#import "MaterialAppBar.h"
#import "MaterialPalettes.h"

@interface TBVCSampleView : UIView
@end
Expand Down
2 changes: 1 addition & 1 deletion components/Themes/examples/ThemerColorSchemeViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#import "MaterialThemes.h"
#import "supplemental/ThemerTypicalUseSupplemental.h"

@import MaterialComponents.MaterialCollections;
#import "MaterialCollections.h"

static NSString *const kReusableIdentifierItem = @"cell";

Expand Down
2 changes: 1 addition & 1 deletion components/Themes/examples/ThemerTonalPaletteViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#import "MaterialPalettes.h"
#import "supplemental/ThemerTypicalUseSupplemental.h"

@import MaterialComponents.MaterialCollections;
#import "MaterialCollections.h"

static NSString *const kReusableIdentifierItem = @"cell";

Expand Down