Merge branch 'release-candidate' into stable

material-foundation · May 15, 2017 · 4c63421 · 4c63421
2 parents 0b37d44 + 0a9081d
commit 4c63421
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.1.1
+
+- Fixed a crashing bug on iOS 10.3.1.
+
 # 2.1.0
 
 - Add tvOS as a platform.

diff --git a/CatalogByConvention.podspec b/CatalogByConvention.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CatalogByConvention"
-  s.version      = "2.1.0"
+  s.version      = "2.1.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"

diff --git a/src/private/CBCRuntime.m b/src/private/CBCRuntime.m
@@ -56,7 +56,7 @@ BOOL CBCCatalogIsPrimaryDemoFromClass(Class aClass) {
   NSSet *ignoredClasses = [NSSet setWithArray:@[
     @"SwiftObject", @"Object", @"FigIrisAutoTrimmerMotionSampleExport", @"NSLeafProxy"
   ]];
-  NSArray *ignoredPrefixes = @[ @"Swift.", @"_", @"JS" ];
+  NSArray *ignoredPrefixes = @[ @"Swift.", @"_", @"JS", @"WK" ];
 
   for (int ix = 0; ix < numberOfClasses; ++ix) {
     Class aClass = classList[ix];