Merge branch 'release-candidate' into stable

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8.1
 sudo: false
 notifications:
   email: false

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.0.1
+
+- Fixed some warnings.
+
+## Source changes
+
+* [Merge pull request #6 from randallli/fixWarnings](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/8136bf10acab15ebfb12de080e919f6540753dd9) (Randall Li)
+
 # 2.0.0
 
 - Upgraded to Swift 3.

CatalogByConvention.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CatalogByConvention"
-  s.version      = "2.0.0"
+  s.version      = "2.0.1"
   s.authors      = "Google Inc."
   s.summary      = "Tools for building a Catalog by Convention."
   s.homepage     = "https://github.com/material-foundation/cocoapods-catalog-by-convention"

example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - CatalogByConvention (2.0.0)
+  - CatalogByConvention (2.0.1)
   - CatalogExamples (1.0.0)
   - CatalogUnitTests (1.0.0):
     - Resistor
@@ -22,7 +22,7 @@ EXTERNAL SOURCES:
     :path: components/Resistor
 
 SPEC CHECKSUMS:
-  CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
+  CatalogByConvention: 7427d8ac03d5bc1eebcf2898de2b6e27a5876310
   CatalogExamples: cafe3e4eae3abc948d96beb626657455c1dfb327
   CatalogUnitTests: b7a746f12abb31a905654521ee926ea007ab7275
   Resistor: 36a9ae98666be3b4f34d8133fad442fa87fdbce2

src/CBCNodeListViewController.m

@@ -17,7 +17,7 @@
 #import "CBCNodeListViewController.h"
 
 #import "CBCCatalogExample.h"
-#import "CBCRuntime.h"
+#import "private/CBCRuntime.h"
 
 @implementation CBCNode {
   NSMutableDictionary *_map;
@@ -53,7 +53,7 @@ - (void)setExampleClass:(Class)exampleClass {
   _exampleClass = exampleClass;
 }
 
-- (void)finalize {
+- (void)finalizeNode {
   _children = [[_children sortedArrayUsingSelector:@selector(compare:)] mutableCopy];
 }
 
@@ -137,7 +137,7 @@ - (void)viewDidAppear:(BOOL)animated {
 #pragma mark - UITableViewDataSource
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-  return [_node.children count];
+  return (NSInteger)[_node.children count];
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView
@@ -147,15 +147,15 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
     cell =
         [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"cell"];
   }
-  cell.textLabel.text = [_node.children[indexPath.row] title];
+  cell.textLabel.text = [_node.children[(NSUInteger)indexPath.row] title];
   cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
   return cell;
 }
 
 #pragma mark - UITableViewDelegate
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-  CBCNode *node = _node.children[indexPath.row];
+  CBCNode *node = _node.children[(NSUInteger)indexPath.row];
   UIViewController *viewController = nil;
   if ([node isExample]) {
     viewController = [node createExampleViewController];
@@ -206,7 +206,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     [queue removeObjectAtIndex:0];
     [queue addObjectsFromArray:node.children];
 
-    [node finalize];
+    [node finalizeNode];
   }
 
   return tree;

src/private/CBCRuntime.m

@@ -48,7 +48,7 @@ BOOL CBCCatalogIsPrimaryDemoFromClass(Class aClass) {
 
 NSArray<Class> *CBCGetAllClasses(void) {
   int numberOfClasses = objc_getClassList(NULL, 0);
-  Class *classList = (Class *)malloc(numberOfClasses * sizeof(Class));
+  Class *classList = (Class *)malloc((size_t)numberOfClasses * sizeof(Class));
   objc_getClassList(classList, numberOfClasses);
 
   NSMutableArray<Class> *classes = [NSMutableArray array];