Skip to content

Commit dc14ee2

Browse files
author
Jeff Verkoeyen
committed
Merge branch 'release-candidate' into stable
2 parents 4c63421 + b6ba87d commit dc14ee2

File tree

13 files changed

+568
-33
lines changed

13 files changed

+568
-33
lines changed

‎.kokoro‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
3+
# Fail on any error.
4+
set -e
5+
# Display commands to stderr.
6+
set -x
7+
8+
gem install xcpretty --no-rdoc --no-ri --no-document --quiet
9+
10+
sudo xcode-select --switch /Applications/Xcode_8.2.app/Contents/Developer
11+
xcodebuild -version
12+
13+
cd github/repo
14+
xcodebuild clean build -project CatalogByConvention/CatalogByConvention.xcodeproj -sdk "iphonesimulator" | xcpretty
15+
16+
# Enable this if and when we have unit tests.
17+
#bash <(curl -s https://codecov.io/bash)

‎.swift-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

‎CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# 2.2.0
2+
3+
This minor release introduces support for Carthage.
4+
5+
## New features
6+
7+
It's now possible to define multiple paths to a single example. Simply return an array of arrays
8+
of breadcrumbs from the `catalogBreadcrumbs` implementation.
9+
10+
## Source changes
11+
12+
* [added ability to have multiple parallel bread crumbs to get to a view controller.](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/cc6a0b16dc41cc044d2ca0a98aa2dcbd35a7c2c5) (randallli)
13+
14+
## Non-source changes
15+
16+
* [Disable code coverage reporting. (#16)](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/098188b6353e96f1ffebe2749816e859ba1e8d72) (featherless)
17+
* [Add kokoro continuous build script. (#15)](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/ac9cc4b1c67b74c2c03c1d12c1905dfb47a0a141) (featherless)
18+
* [Fix the xcodeproj. (#14)](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/a25b7b00664903e90e9be058e5e7826213b6295b) (featherless)
19+
* [Add support for Carthage.](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/30dfc96ae85c5e32040304ba584ad6663c9a931f) (Jeff Verkoeyen)
20+
* [fixed method signature](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/9cc0050858eb26dd6bd0c0ecef1f6ffcca6a49e1) (randallli)
21+
* [Add .swift-version file.](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/3e38db52bd3d245ade4734394295894e123b1e59) (Jeff Verkoeyen)
22+
123
# 2.1.1
224

325
- Fixed a crashing bug on iOS 10.3.1.

‎CatalogByConvention.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "CatalogByConvention"
3-
s.version = "2.1.1"
3+
s.version = "2.2.0"
44
s.authors = "Google Inc."
55
s.summary = "Tools for building a Catalog by Convention."
66
s.homepage = "https://github.com/material-foundation/cocoapods-catalog-by-convention"

‎CatalogByConvention/CatalogByConvention.xcodeproj/project.pbxproj‎

Lines changed: 333 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,333 @@
1+
// !$*UTF8*$!
2+
{
3+
archiveVersion = 1;
4+
classes = {
5+
};
6+
objectVersion = 46;
7+
objects = {
8+
9+
/* Begin PBXBuildFile section */
10+
66B35F5F1F842A4C000B0CB8 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 66B35F5E1F842A4C000B0CB8 /* Info.plist */; };
11+
66B35F671F843DBC000B0CB8 /* CatalogByConvention.h in Headers */ = {isa = PBXBuildFile; fileRef = 66B35F601F843DBC000B0CB8 /* CatalogByConvention.h */; };
12+
66B35F681F843DBC000B0CB8 /* CBCCatalogExample.h in Headers */ = {isa = PBXBuildFile; fileRef = 66B35F611F843DBC000B0CB8 /* CBCCatalogExample.h */; };
13+
66B35F691F843DBC000B0CB8 /* CBCNodeListViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 66B35F621F843DBC000B0CB8 /* CBCNodeListViewController.h */; };
14+
66B35F6A1F843DBC000B0CB8 /* CBCNodeListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 66B35F631F843DBC000B0CB8 /* CBCNodeListViewController.m */; };
15+
66B35F6B1F843DBC000B0CB8 /* CBCRuntime.h in Headers */ = {isa = PBXBuildFile; fileRef = 66B35F651F843DBC000B0CB8 /* CBCRuntime.h */; };
16+
66B35F6C1F843DBC000B0CB8 /* CBCRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = 66B35F661F843DBC000B0CB8 /* CBCRuntime.m */; };
17+
/* End PBXBuildFile section */
18+
19+
/* Begin PBXFileReference section */
20+
66B35F351F842691000B0CB8 /* CatalogByConvention.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CatalogByConvention.framework; sourceTree = BUILT_PRODUCTS_DIR; };
21+
66B35F5E1F842A4C000B0CB8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
22+
66B35F601F843DBC000B0CB8 /* CatalogByConvention.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CatalogByConvention.h; sourceTree = "<group>"; };
23+
66B35F611F843DBC000B0CB8 /* CBCCatalogExample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBCCatalogExample.h; sourceTree = "<group>"; };
24+
66B35F621F843DBC000B0CB8 /* CBCNodeListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBCNodeListViewController.h; sourceTree = "<group>"; };
25+
66B35F631F843DBC000B0CB8 /* CBCNodeListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CBCNodeListViewController.m; sourceTree = "<group>"; };
26+
66B35F651F843DBC000B0CB8 /* CBCRuntime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBCRuntime.h; sourceTree = "<group>"; };
27+
66B35F661F843DBC000B0CB8 /* CBCRuntime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CBCRuntime.m; sourceTree = "<group>"; };
28+
/* End PBXFileReference section */
29+
30+
/* Begin PBXFrameworksBuildPhase section */
31+
66B35F311F842691000B0CB8 /* Frameworks */ = {
32+
isa = PBXFrameworksBuildPhase;
33+
buildActionMask = 2147483647;
34+
files = (
35+
);
36+
runOnlyForDeploymentPostprocessing = 0;
37+
};
38+
/* End PBXFrameworksBuildPhase section */
39+
40+
/* Begin PBXGroup section */
41+
66B35F2B1F842691000B0CB8 = {
42+
isa = PBXGroup;
43+
children = (
44+
66B35F5E1F842A4C000B0CB8 /* Info.plist */,
45+
66B35F371F842691000B0CB8 /* src */,
46+
66B35F361F842691000B0CB8 /* Products */,
47+
);
48+
sourceTree = "<group>";
49+
};
50+
66B35F361F842691000B0CB8 /* Products */ = {
51+
isa = PBXGroup;
52+
children = (
53+
66B35F351F842691000B0CB8 /* CatalogByConvention.framework */,
54+
);
55+
name = Products;
56+
sourceTree = "<group>";
57+
};
58+
66B35F371F842691000B0CB8 /* src */ = {
59+
isa = PBXGroup;
60+
children = (
61+
66B35F601F843DBC000B0CB8 /* CatalogByConvention.h */,
62+
66B35F611F843DBC000B0CB8 /* CBCCatalogExample.h */,
63+
66B35F621F843DBC000B0CB8 /* CBCNodeListViewController.h */,
64+
66B35F631F843DBC000B0CB8 /* CBCNodeListViewController.m */,
65+
66B35F641F843DBC000B0CB8 /* private */,
66+
);
67+
name = src;
68+
path = ../src;
69+
sourceTree = "<group>";
70+
};
71+
66B35F641F843DBC000B0CB8 /* private */ = {
72+
isa = PBXGroup;
73+
children = (
74+
66B35F651F843DBC000B0CB8 /* CBCRuntime.h */,
75+
66B35F661F843DBC000B0CB8 /* CBCRuntime.m */,
76+
);
77+
path = private;
78+
sourceTree = "<group>";
79+
};
80+
/* End PBXGroup section */
81+
82+
/* Begin PBXHeadersBuildPhase section */
83+
66B35F321F842691000B0CB8 /* Headers */ = {
84+
isa = PBXHeadersBuildPhase;
85+
buildActionMask = 2147483647;
86+
files = (
87+
66B35F681F843DBC000B0CB8 /* CBCCatalogExample.h in Headers */,
88+
66B35F691F843DBC000B0CB8 /* CBCNodeListViewController.h in Headers */,
89+
66B35F6B1F843DBC000B0CB8 /* CBCRuntime.h in Headers */,
90+
66B35F671F843DBC000B0CB8 /* CatalogByConvention.h in Headers */,
91+
);
92+
runOnlyForDeploymentPostprocessing = 0;
93+
};
94+
/* End PBXHeadersBuildPhase section */
95+
96+
/* Begin PBXNativeTarget section */
97+
66B35F341F842691000B0CB8 /* CatalogByConvention */ = {
98+
isa = PBXNativeTarget;
99+
buildConfigurationList = 66B35F491F842691000B0CB8 /* Build configuration list for PBXNativeTarget "CatalogByConvention" */;
100+
buildPhases = (
101+
66B35F301F842691000B0CB8 /* Sources */,
102+
66B35F311F842691000B0CB8 /* Frameworks */,
103+
66B35F321F842691000B0CB8 /* Headers */,
104+
66B35F331F842691000B0CB8 /* Resources */,
105+
);
106+
buildRules = (
107+
);
108+
dependencies = (
109+
);
110+
name = CatalogByConvention;
111+
productName = CatalogByConvention;
112+
productReference = 66B35F351F842691000B0CB8 /* CatalogByConvention.framework */;
113+
productType = "com.apple.product-type.framework";
114+
};
115+
/* End PBXNativeTarget section */
116+
117+
/* Begin PBXProject section */
118+
66B35F2C1F842691000B0CB8 /* Project object */ = {
119+
isa = PBXProject;
120+
attributes = {
121+
LastSwiftUpdateCheck = 0830;
122+
LastUpgradeCheck = 0830;
123+
ORGANIZATIONNAME = Google;
124+
TargetAttributes = {
125+
66B35F341F842691000B0CB8 = {
126+
CreatedOnToolsVersion = 8.3.3;
127+
ProvisioningStyle = Automatic;
128+
};
129+
};
130+
};
131+
buildConfigurationList = 66B35F2F1F842691000B0CB8 /* Build configuration list for PBXProject "CatalogByConvention" */;
132+
compatibilityVersion = "Xcode 3.2";
133+
developmentRegion = English;
134+
hasScannedForEncodings = 0;
135+
knownRegions = (
136+
en,
137+
);
138+
mainGroup = 66B35F2B1F842691000B0CB8;
139+
productRefGroup = 66B35F361F842691000B0CB8 /* Products */;
140+
projectDirPath = "";
141+
projectRoot = "";
142+
targets = (
143+
66B35F341F842691000B0CB8 /* CatalogByConvention */,
144+
);
145+
};
146+
/* End PBXProject section */
147+
148+
/* Begin PBXResourcesBuildPhase section */
149+
66B35F331F842691000B0CB8 /* Resources */ = {
150+
isa = PBXResourcesBuildPhase;
151+
buildActionMask = 2147483647;
152+
files = (
153+
66B35F5F1F842A4C000B0CB8 /* Info.plist in Resources */,
154+
);
155+
runOnlyForDeploymentPostprocessing = 0;
156+
};
157+
/* End PBXResourcesBuildPhase section */
158+
159+
/* Begin PBXSourcesBuildPhase section */
160+
66B35F301F842691000B0CB8 /* Sources */ = {
161+
isa = PBXSourcesBuildPhase;
162+
buildActionMask = 2147483647;
163+
files = (
164+
66B35F6A1F843DBC000B0CB8 /* CBCNodeListViewController.m in Sources */,
165+
66B35F6C1F843DBC000B0CB8 /* CBCRuntime.m in Sources */,
166+
);
167+
runOnlyForDeploymentPostprocessing = 0;
168+
};
169+
/* End PBXSourcesBuildPhase section */
170+
171+
/* Begin XCBuildConfiguration section */
172+
66B35F471F842691000B0CB8 /* Debug */ = {
173+
isa = XCBuildConfiguration;
174+
buildSettings = {
175+
ALWAYS_SEARCH_USER_PATHS = NO;
176+
CLANG_ANALYZER_NONNULL = YES;
177+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
178+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
179+
CLANG_CXX_LIBRARY = "libc++";
180+
CLANG_ENABLE_MODULES = YES;
181+
CLANG_ENABLE_OBJC_ARC = YES;
182+
CLANG_WARN_BOOL_CONVERSION = YES;
183+
CLANG_WARN_CONSTANT_CONVERSION = YES;
184+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
185+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
186+
CLANG_WARN_EMPTY_BODY = YES;
187+
CLANG_WARN_ENUM_CONVERSION = YES;
188+
CLANG_WARN_INFINITE_RECURSION = YES;
189+
CLANG_WARN_INT_CONVERSION = YES;
190+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
191+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
192+
CLANG_WARN_UNREACHABLE_CODE = YES;
193+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
194+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
195+
COPY_PHASE_STRIP = NO;
196+
CURRENT_PROJECT_VERSION = 1;
197+
DEBUG_INFORMATION_FORMAT = dwarf;
198+
ENABLE_STRICT_OBJC_MSGSEND = YES;
199+
ENABLE_TESTABILITY = YES;
200+
GCC_C_LANGUAGE_STANDARD = gnu99;
201+
GCC_DYNAMIC_NO_PIC = NO;
202+
GCC_NO_COMMON_BLOCKS = YES;
203+
GCC_OPTIMIZATION_LEVEL = 0;
204+
GCC_PREPROCESSOR_DEFINITIONS = (
205+
"DEBUG=1",
206+
"$(inherited)",
207+
);
208+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
209+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
210+
GCC_WARN_UNDECLARED_SELECTOR = YES;
211+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
212+
GCC_WARN_UNUSED_FUNCTION = YES;
213+
GCC_WARN_UNUSED_VARIABLE = YES;
214+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
215+
MTL_ENABLE_DEBUG_INFO = YES;
216+
ONLY_ACTIVE_ARCH = YES;
217+
SDKROOT = iphoneos;
218+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
219+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
220+
TARGETED_DEVICE_FAMILY = "1,2";
221+
VERSIONING_SYSTEM = "apple-generic";
222+
VERSION_INFO_PREFIX = "";
223+
};
224+
name = Debug;
225+
};
226+
66B35F481F842691000B0CB8 /* Release */ = {
227+
isa = XCBuildConfiguration;
228+
buildSettings = {
229+
ALWAYS_SEARCH_USER_PATHS = NO;
230+
CLANG_ANALYZER_NONNULL = YES;
231+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
232+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
233+
CLANG_CXX_LIBRARY = "libc++";
234+
CLANG_ENABLE_MODULES = YES;
235+
CLANG_ENABLE_OBJC_ARC = YES;
236+
CLANG_WARN_BOOL_CONVERSION = YES;
237+
CLANG_WARN_CONSTANT_CONVERSION = YES;
238+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
239+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
240+
CLANG_WARN_EMPTY_BODY = YES;
241+
CLANG_WARN_ENUM_CONVERSION = YES;
242+
CLANG_WARN_INFINITE_RECURSION = YES;
243+
CLANG_WARN_INT_CONVERSION = YES;
244+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
245+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
246+
CLANG_WARN_UNREACHABLE_CODE = YES;
247+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
248+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
249+
COPY_PHASE_STRIP = NO;
250+
CURRENT_PROJECT_VERSION = 1;
251+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
252+
ENABLE_NS_ASSERTIONS = NO;
253+
ENABLE_STRICT_OBJC_MSGSEND = YES;
254+
GCC_C_LANGUAGE_STANDARD = gnu99;
255+
GCC_NO_COMMON_BLOCKS = YES;
256+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
257+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
258+
GCC_WARN_UNDECLARED_SELECTOR = YES;
259+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
260+
GCC_WARN_UNUSED_FUNCTION = YES;
261+
GCC_WARN_UNUSED_VARIABLE = YES;
262+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
263+
MTL_ENABLE_DEBUG_INFO = NO;
264+
SDKROOT = iphoneos;
265+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
266+
TARGETED_DEVICE_FAMILY = "1,2";
267+
VALIDATE_PRODUCT = YES;
268+
VERSIONING_SYSTEM = "apple-generic";
269+
VERSION_INFO_PREFIX = "";
270+
};
271+
name = Release;
272+
};
273+
66B35F4A1F842691000B0CB8 /* Debug */ = {
274+
isa = XCBuildConfiguration;
275+
buildSettings = {
276+
CODE_SIGN_IDENTITY = "";
277+
DEFINES_MODULE = YES;
278+
DYLIB_COMPATIBILITY_VERSION = 1;
279+
DYLIB_CURRENT_VERSION = 1;
280+
DYLIB_INSTALL_NAME_BASE = "@rpath";
281+
INFOPLIST_FILE = Info.plist;
282+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
283+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
284+
PRODUCT_BUNDLE_IDENTIFIER = com.google.CatalogByConvention;
285+
PRODUCT_NAME = "$(TARGET_NAME)";
286+
SKIP_INSTALL = YES;
287+
SWIFT_VERSION = 3.0;
288+
};
289+
name = Debug;
290+
};
291+
66B35F4B1F842691000B0CB8 /* Release */ = {
292+
isa = XCBuildConfiguration;
293+
buildSettings = {
294+
CODE_SIGN_IDENTITY = "";
295+
DEFINES_MODULE = YES;
296+
DYLIB_COMPATIBILITY_VERSION = 1;
297+
DYLIB_CURRENT_VERSION = 1;
298+
DYLIB_INSTALL_NAME_BASE = "@rpath";
299+
INFOPLIST_FILE = Info.plist;
300+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
301+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
302+
PRODUCT_BUNDLE_IDENTIFIER = com.google.CatalogByConvention;
303+
PRODUCT_NAME = "$(TARGET_NAME)";
304+
SKIP_INSTALL = YES;
305+
SWIFT_VERSION = 3.0;
306+
};
307+
name = Release;
308+
};
309+
/* End XCBuildConfiguration section */
310+
311+
/* Begin XCConfigurationList section */
312+
66B35F2F1F842691000B0CB8 /* Build configuration list for PBXProject "CatalogByConvention" */ = {
313+
isa = XCConfigurationList;
314+
buildConfigurations = (
315+
66B35F471F842691000B0CB8 /* Debug */,
316+
66B35F481F842691000B0CB8 /* Release */,
317+
);
318+
defaultConfigurationIsVisible = 0;
319+
defaultConfigurationName = Release;
320+
};
321+
66B35F491F842691000B0CB8 /* Build configuration list for PBXNativeTarget "CatalogByConvention" */ = {
322+
isa = XCConfigurationList;
323+
buildConfigurations = (
324+
66B35F4A1F842691000B0CB8 /* Debug */,
325+
66B35F4B1F842691000B0CB8 /* Release */,
326+
);
327+
defaultConfigurationIsVisible = 0;
328+
defaultConfigurationName = Release;
329+
};
330+
/* End XCConfigurationList section */
331+
};
332+
rootObject = 66B35F2C1F842691000B0CB8 /* Project object */;
333+
}

‎CatalogByConvention/CatalogByConvention.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)