Skip to content

Commit 479d4ae

Browse files
randalllirandallli
committed
Renamed demo folder to build_tests because these are the build system canary tests
Summary: moving nits that were added in google Reviewers: #material_components_ios_owners, featherless Reviewed By: #material_components_ios_owners, featherless Projects: #material_components_ios_owners Differential Revision: http://codereview.cc/D73
1 parent 2566b8c commit 479d4ae

File tree

24 files changed

+87
-87
lines changed

24 files changed

+87
-87
lines changed

‎demos/CocoapodsObjCApp/CocoapodsObjCApp.xcodeproj/project.pbxproj renamed to ‎build_tests/CocoapodsObjCApp/CocoapodsObjCApp.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
/* Begin PBXBuildFile section */
1010
18D3345942EAEC7D74A23C51 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B3FF76E59043033C3E2895D /* libPods.a */; };
11+
208DFFFA1C46E64700746F10 /* MDCBuildTestAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 208DFFF71C46E64700746F10 /* MDCBuildTestAppDelegate.m */; };
12+
208DFFFB1C46E64700746F10 /* MDCBuildTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 208DFFF91C46E64700746F10 /* MDCBuildTestViewController.m */; };
1113
6632A5371C066465004AC7CD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6632A5361C066465004AC7CD /* main.m */; };
12-
6632A53A1C066466004AC7CD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6632A5391C066466004AC7CD /* AppDelegate.m */; };
13-
6632A53D1C066466004AC7CD /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6632A53C1C066466004AC7CD /* ViewController.m */; };
1414
6632A5401C066466004AC7CD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6632A53E1C066466004AC7CD /* Main.storyboard */; };
1515
6632A5421C066466004AC7CD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6632A5411C066466004AC7CD /* Assets.xcassets */; };
1616
6632A5451C066466004AC7CD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6632A5431C066466004AC7CD /* LaunchScreen.storyboard */; };
@@ -19,12 +19,12 @@
1919

2020
/* Begin PBXFileReference section */
2121
0131BD4F52E365CCC9055AB1 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
22+
208DFFF61C46E64700746F10 /* MDCBuildTestAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MDCBuildTestAppDelegate.h; path = ../../classes/objective_c/MDCBuildTestAppDelegate.h; sourceTree = "<group>"; };
23+
208DFFF71C46E64700746F10 /* MDCBuildTestAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MDCBuildTestAppDelegate.m; path = ../../classes/objective_c/MDCBuildTestAppDelegate.m; sourceTree = "<group>"; };
24+
208DFFF81C46E64700746F10 /* MDCBuildTestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MDCBuildTestViewController.h; path = ../../classes/objective_c/MDCBuildTestViewController.h; sourceTree = "<group>"; };
25+
208DFFF91C46E64700746F10 /* MDCBuildTestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MDCBuildTestViewController.m; path = ../../classes/objective_c/MDCBuildTestViewController.m; sourceTree = "<group>"; };
2226
6632A5321C066465004AC7CD /* CocoapodsObjCApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CocoapodsObjCApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
2327
6632A5361C066465004AC7CD /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
24-
6632A5381C066466004AC7CD /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
25-
6632A5391C066466004AC7CD /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
26-
6632A53B1C066466004AC7CD /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
27-
6632A53C1C066466004AC7CD /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
2828
6632A53F1C066466004AC7CD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
2929
6632A5411C066466004AC7CD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
3030
6632A5441C066466004AC7CD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -77,10 +77,10 @@
7777
6632A5341C066465004AC7CD /* CocoapodsObjCApp */ = {
7878
isa = PBXGroup;
7979
children = (
80-
6632A5381C066466004AC7CD /* AppDelegate.h */,
81-
6632A5391C066466004AC7CD /* AppDelegate.m */,
82-
6632A53B1C066466004AC7CD /* ViewController.h */,
83-
6632A53C1C066466004AC7CD /* ViewController.m */,
80+
208DFFF61C46E64700746F10 /* MDCBuildTestAppDelegate.h */,
81+
208DFFF71C46E64700746F10 /* MDCBuildTestAppDelegate.m */,
82+
208DFFF81C46E64700746F10 /* MDCBuildTestViewController.h */,
83+
208DFFF91C46E64700746F10 /* MDCBuildTestViewController.m */,
8484
6632A53E1C066466004AC7CD /* Main.storyboard */,
8585
6632A5411C066466004AC7CD /* Assets.xcassets */,
8686
6632A5431C066466004AC7CD /* LaunchScreen.storyboard */,
@@ -228,8 +228,8 @@
228228
isa = PBXSourcesBuildPhase;
229229
buildActionMask = 2147483647;
230230
files = (
231-
6632A53D1C066466004AC7CD /* ViewController.m in Sources */,
232-
6632A53A1C066466004AC7CD /* AppDelegate.m in Sources */,
231+
208DFFFB1C46E64700746F10 /* MDCBuildTestViewController.m in Sources */,
232+
208DFFFA1C46E64700746F10 /* MDCBuildTestAppDelegate.m in Sources */,
233233
6632A5371C066465004AC7CD /* main.m in Sources */,
234234
);
235235
runOnlyForDeploymentPostprocessing = 0;

‎demos/CocoapodsObjCApp/CocoapodsObjCApp/Assets.xcassets/AppIcon.appiconset/Contents.json renamed to ‎build_tests/CocoapodsObjCApp/CocoapodsObjCApp/Assets.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

‎demos/CocoapodsObjCApp/CocoapodsObjCApp/Base.lproj/LaunchScreen.storyboard renamed to ‎build_tests/CocoapodsObjCApp/CocoapodsObjCApp/Base.lproj/LaunchScreen.storyboard

File renamed without changes.

‎demos/CocoapodsObjCApp/CocoapodsObjCApp/Base.lproj/Main.storyboard renamed to ‎build_tests/CocoapodsObjCApp/CocoapodsObjCApp/Base.lproj/Main.storyboard

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
55
</dependencies>
66
<scenes>
7-
<!--View Controller-->
7+
<!--Build Test View Controller-->
88
<scene sceneID="tne-QT-ifu">
99
<objects>
10-
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
10+
<viewController id="BYZ-38-t0r" customClass="MDCBuildTestViewController" sceneMemberID="viewController">
1111
<layoutGuides>
1212
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
1313
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
1414
</layoutGuides>
1515
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
1616
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
1717
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18+
<animations/>
1819
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
1920
</view>
2021
</viewController>

‎demos/CocoapodsObjCApp/CocoapodsObjCApp/Info.plist renamed to ‎build_tests/CocoapodsObjCApp/CocoapodsObjCApp/Info.plist

File renamed without changes.

‎build_tests/CocoapodsObjCApp/CocoapodsObjCApp/main.m

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
Copyright 2015-present Google Inc. All Rights Reserved.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
#import <UIKit/UIKit.h>
18+
#import "MDCBuildTestAppDelegate.h"
19+
20+
int main(int argc, char *argv[]) {
21+
@autoreleasepool {
22+
return UIApplicationMain(argc, argv, nil, NSStringFromClass([MDCBuildTestAppDelegate class]));
23+
}
24+
}

‎demos/CocoapodsObjCApp/Podfile renamed to ‎build_tests/CocoapodsObjCApp/Podfile

File renamed without changes.

‎demos/CocoapodsObjCApp/Podfile.lock renamed to ‎build_tests/CocoapodsObjCApp/Podfile.lock

File renamed without changes.

‎demos/CocoapodsSwiftApp/CocoapodsSwiftApp.xcodeproj/project.pbxproj renamed to ‎build_tests/CocoapodsSwiftApp/CocoapodsSwiftApp.xcodeproj/project.pbxproj

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
208DFFF41C46E62600746F10 /* MDCBuildTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 208DFFF21C46E62600746F10 /* MDCBuildTestViewController.swift */; };
11+
208DFFF51C46E62600746F10 /* MDCBuildTestAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 208DFFF31C46E62600746F10 /* MDCBuildTestAppDelegate.swift */; };
1012
26E3579BF27A3F6A8B6D398A /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C5E487491D38B09E418BF4C /* Pods.framework */; };
11-
6632A5171C0663F5004AC7CD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6632A5161C0663F5004AC7CD /* AppDelegate.swift */; };
12-
6632A5191C0663F5004AC7CD /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6632A5181C0663F5004AC7CD /* ViewController.swift */; };
1313
6632A51C1C0663F5004AC7CD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6632A51A1C0663F5004AC7CD /* Main.storyboard */; };
1414
6632A51E1C0663F5004AC7CD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6632A51D1C0663F5004AC7CD /* Assets.xcassets */; };
1515
6632A5211C0663F5004AC7CD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6632A51F1C0663F5004AC7CD /* LaunchScreen.storyboard */; };
1616
/* End PBXBuildFile section */
1717

1818
/* Begin PBXFileReference section */
1919
1114DA0633EFEDB2AF891DFF /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
20+
208DFFF21C46E62600746F10 /* MDCBuildTestViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MDCBuildTestViewController.swift; path = ../../classes/swift/MDCBuildTestViewController.swift; sourceTree = "<group>"; };
21+
208DFFF31C46E62600746F10 /* MDCBuildTestAppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MDCBuildTestAppDelegate.swift; path = ../../classes/swift/MDCBuildTestAppDelegate.swift; sourceTree = "<group>"; };
2022
2C5E487491D38B09E418BF4C /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2123
6632A5131C0663F5004AC7CD /* CocoapodsSwiftApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CocoapodsSwiftApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
22-
6632A5161C0663F5004AC7CD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
23-
6632A5181C0663F5004AC7CD /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
2424
6632A51B1C0663F5004AC7CD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
2525
6632A51D1C0663F5004AC7CD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2626
6632A5201C0663F5004AC7CD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -80,8 +80,8 @@
8080
6632A5151C0663F5004AC7CD /* CocoapodsSwiftApp */ = {
8181
isa = PBXGroup;
8282
children = (
83-
6632A5161C0663F5004AC7CD /* AppDelegate.swift */,
84-
6632A5181C0663F5004AC7CD /* ViewController.swift */,
83+
208DFFF21C46E62600746F10 /* MDCBuildTestViewController.swift */,
84+
208DFFF31C46E62600746F10 /* MDCBuildTestAppDelegate.swift */,
8585
6632A51A1C0663F5004AC7CD /* Main.storyboard */,
8686
6632A51D1C0663F5004AC7CD /* Assets.xcassets */,
8787
6632A51F1C0663F5004AC7CD /* LaunchScreen.storyboard */,
@@ -212,8 +212,8 @@
212212
isa = PBXSourcesBuildPhase;
213213
buildActionMask = 2147483647;
214214
files = (
215-
6632A5191C0663F5004AC7CD /* ViewController.swift in Sources */,
216-
6632A5171C0663F5004AC7CD /* AppDelegate.swift in Sources */,
215+
208DFFF51C46E62600746F10 /* MDCBuildTestAppDelegate.swift in Sources */,
216+
208DFFF41C46E62600746F10 /* MDCBuildTestViewController.swift in Sources */,
217217
);
218218
runOnlyForDeploymentPostprocessing = 0;
219219
};
@@ -325,10 +325,12 @@
325325
baseConfigurationReference = 1114DA0633EFEDB2AF891DFF /* Pods.debug.xcconfig */;
326326
buildSettings = {
327327
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
328+
CLANG_ENABLE_MODULES = YES;
328329
INFOPLIST_FILE = CocoapodsSwiftApp/Info.plist;
329330
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
330331
PRODUCT_BUNDLE_IDENTIFIER = com.google.CocoapodsSwiftApp;
331332
PRODUCT_NAME = "$(TARGET_NAME)";
333+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
332334
};
333335
name = Debug;
334336
};
@@ -337,6 +339,7 @@
337339
baseConfigurationReference = 9D5EEFE66C4B349E5794078B /* Pods.release.xcconfig */;
338340
buildSettings = {
339341
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
342+
CLANG_ENABLE_MODULES = YES;
340343
INFOPLIST_FILE = CocoapodsSwiftApp/Info.plist;
341344
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
342345
PRODUCT_BUNDLE_IDENTIFIER = com.google.CocoapodsSwiftApp;

‎demos/CocoapodsSwiftApp/CocoapodsSwiftApp/Assets.xcassets/AppIcon.appiconset/Contents.json renamed to ‎build_tests/CocoapodsSwiftApp/CocoapodsSwiftApp/Assets.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

0 commit comments

Comments
 (0)