Merge branch 'release-candidate'

material-components · Jul 29, 2016 · 7727342 · 7727342
2 parents 50ed805 + 64009d0
commit 7727342
Show file tree

Hide file tree

Showing 14 changed files with 315 additions and 262 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,42 @@
+# 13.0.1
+
+Hotfix for Xcode 8.0 beta 3 (8S174q) compilation.
+
+## API diffs
+
+Auto-generated by running:
+
+    scripts/api_diff -o 50ed805a58529c8cd3a0bfe56a9b99937134ad2c -n e8dbfebbb20f3d1314b5396e6cc1f76f9d23beb2
+
+No public API changes detected.
+
+## Component changes
+
+### Collections
+
+#### Changes
+
+* [Source changes to fix Xcode 8 compilation.](https://github.com/google/material-components-ios/commit/6ce08f4c0fd500c18becb89b990c9a6ffeb89de7) (Adrian Secord)
+* [Undo Xcode 8 changes to CollectionsStoryboardExample.storyboard.](https://github.com/google/material-components-ios/commit/e8dbfebbb20f3d1314b5396e6cc1f76f9d23beb2) (Adrian Secord)
+
+### ProgressView
+
+#### Changes
+
+* [Source changes to fix Xcode 8 compilation.](https://github.com/google/material-components-ios/commit/6ce08f4c0fd500c18becb89b990c9a6ffeb89de7) (Adrian Secord)
+
+### Snackbar
+
+#### Changes
+
+* [Source changes to fix Xcode 8 compilation.](https://github.com/google/material-components-ios/commit/6ce08f4c0fd500c18becb89b990c9a6ffeb89de7) (Adrian Secord)
+
+### SpritedAnimationView
+
+#### Changes
+
+* [Source changes to fix Xcode 8 compilation.](https://github.com/google/material-components-ios/commit/6ce08f4c0fd500c18becb89b990c9a6ffeb89de7) (Adrian Secord)
+
 # 13.0.0
 
 ## API diffs

diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponents"
-  s.version      = "13.0.0"
+  s.version      = "13.0.1"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "13.0.0"
+  s.version      = "13.0.1"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "13.0.0"
+  s.version      = "13.0.1"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

diff --git a/catalog/MDCCatalog.xcodeproj/project.pbxproj b/catalog/MDCCatalog.xcodeproj/project.pbxproj
@@ -296,6 +296,7 @@
 				TargetAttributes = {
 					664524B21C6BA62A001ADBF8 = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -596,6 +597,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "MDCCatalog/MDCCatalog-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -611,6 +613,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCCatalog;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "MDCCatalog/MDCCatalog-Bridging-Header.h";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};

diff --git a/catalog/MDCUnitTests.xcodeproj/project.pbxproj b/catalog/MDCUnitTests.xcodeproj/project.pbxproj
@@ -110,6 +110,7 @@
 				TargetAttributes = {
 					66CB712B1C853DB30099B932 = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -288,6 +289,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCUnitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -299,6 +301,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCUnitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};

diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock
@@ -1,34 +1,34 @@
 PODS:
   - CatalogByConvention (1.0.1)
-  - MaterialComponents (13.0.0):
-    - MaterialComponents/ActivityIndicator (= 13.0.0)
-    - MaterialComponents/AppBar (= 13.0.0)
-    - MaterialComponents/ButtonBar (= 13.0.0)
-    - MaterialComponents/Buttons (= 13.0.0)
-    - MaterialComponents/CollectionCells (= 13.0.0)
-    - MaterialComponents/CollectionLayoutAttributes (= 13.0.0)
-    - MaterialComponents/Collections (= 13.0.0)
-    - MaterialComponents/Dialogs (= 13.0.0)
-    - MaterialComponents/FlexibleHeader (= 13.0.0)
-    - MaterialComponents/FontDiskLoader (= 13.0.0)
-    - MaterialComponents/HeaderStackView (= 13.0.0)
-    - MaterialComponents/Ink (= 13.0.0)
-    - MaterialComponents/NavigationBar (= 13.0.0)
-    - MaterialComponents/OverlayWindow (= 13.0.0)
-    - MaterialComponents/PageControl (= 13.0.0)
-    - MaterialComponents/Palettes (= 13.0.0)
-    - MaterialComponents/private (= 13.0.0)
-    - MaterialComponents/ProgressView (= 13.0.0)
-    - MaterialComponents/RobotoFontLoader (= 13.0.0)
-    - MaterialComponents/ShadowElevations (= 13.0.0)
-    - MaterialComponents/ShadowLayer (= 13.0.0)
-    - MaterialComponents/Slider (= 13.0.0)
-    - MaterialComponents/Snackbar (= 13.0.0)
-    - MaterialComponents/SpritedAnimationView (= 13.0.0)
-    - MaterialComponents/Switch (= 13.0.0)
-    - MaterialComponents/Typography (= 13.0.0)
-  - MaterialComponents/ActivityIndicator (13.0.0)
-  - MaterialComponents/AppBar (13.0.0):
+  - MaterialComponents (13.0.1):
+    - MaterialComponents/ActivityIndicator (= 13.0.1)
+    - MaterialComponents/AppBar (= 13.0.1)
+    - MaterialComponents/ButtonBar (= 13.0.1)
+    - MaterialComponents/Buttons (= 13.0.1)
+    - MaterialComponents/CollectionCells (= 13.0.1)
+    - MaterialComponents/CollectionLayoutAttributes (= 13.0.1)
+    - MaterialComponents/Collections (= 13.0.1)
+    - MaterialComponents/Dialogs (= 13.0.1)
+    - MaterialComponents/FlexibleHeader (= 13.0.1)
+    - MaterialComponents/FontDiskLoader (= 13.0.1)
+    - MaterialComponents/HeaderStackView (= 13.0.1)
+    - MaterialComponents/Ink (= 13.0.1)
+    - MaterialComponents/NavigationBar (= 13.0.1)
+    - MaterialComponents/OverlayWindow (= 13.0.1)
+    - MaterialComponents/PageControl (= 13.0.1)
+    - MaterialComponents/Palettes (= 13.0.1)
+    - MaterialComponents/private (= 13.0.1)
+    - MaterialComponents/ProgressView (= 13.0.1)
+    - MaterialComponents/RobotoFontLoader (= 13.0.1)
+    - MaterialComponents/ShadowElevations (= 13.0.1)
+    - MaterialComponents/ShadowLayer (= 13.0.1)
+    - MaterialComponents/Slider (= 13.0.1)
+    - MaterialComponents/Snackbar (= 13.0.1)
+    - MaterialComponents/SpritedAnimationView (= 13.0.1)
+    - MaterialComponents/Switch (= 13.0.1)
+    - MaterialComponents/Typography (= 13.0.1)
+  - MaterialComponents/ActivityIndicator (13.0.1)
+  - MaterialComponents/AppBar (13.0.1):
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
@@ -37,15 +37,15 @@ PODS:
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (13.0.0):
+  - MaterialComponents/ButtonBar (13.0.1):
     - MaterialComponents/Buttons
     - MaterialComponents/private/RTL
-  - MaterialComponents/Buttons (13.0.0):
+  - MaterialComponents/Buttons (13.0.1):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionCells (13.0.0):
+  - MaterialComponents/CollectionCells (13.0.1):
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/private/Icons/ic_check
@@ -56,91 +56,91 @@ PODS:
     - MaterialComponents/private/Icons/ic_reorder
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionLayoutAttributes (13.0.0)
-  - MaterialComponents/Collections (13.0.0):
+  - MaterialComponents/CollectionLayoutAttributes (13.0.1)
+  - MaterialComponents/Collections (13.0.1):
     - MaterialComponents/CollectionCells
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/Dialogs (13.0.0):
+  - MaterialComponents/Dialogs (13.0.1):
     - MaterialComponents/Buttons
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/FlexibleHeader (13.0.0)
-  - MaterialComponents/FontDiskLoader (13.0.0)
-  - MaterialComponents/HeaderStackView (13.0.0)
-  - MaterialComponents/Ink (13.0.0)
-  - MaterialComponents/NavigationBar (13.0.0):
+  - MaterialComponents/FlexibleHeader (13.0.1)
+  - MaterialComponents/FontDiskLoader (13.0.1)
+  - MaterialComponents/HeaderStackView (13.0.1)
+  - MaterialComponents/Ink (13.0.1)
+  - MaterialComponents/NavigationBar (13.0.1):
     - MaterialComponents/ButtonBar
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/OverlayWindow (13.0.0)
-  - MaterialComponents/PageControl (13.0.0)
-  - MaterialComponents/Palettes (13.0.0)
-  - MaterialComponents/private (13.0.0):
-    - MaterialComponents/private/Color (= 13.0.0)
-    - MaterialComponents/private/Icons (= 13.0.0)
-    - MaterialComponents/private/KeyboardWatcher (= 13.0.0)
-    - MaterialComponents/private/Overlay (= 13.0.0)
-    - MaterialComponents/private/RTL (= 13.0.0)
-    - MaterialComponents/private/ThumbTrack (= 13.0.0)
-  - MaterialComponents/private/Color (13.0.0)
-  - MaterialComponents/private/Icons (13.0.0):
-    - MaterialComponents/private/Icons/Base (= 13.0.0)
-    - MaterialComponents/private/Icons/ic_arrow_back (= 13.0.0)
-    - MaterialComponents/private/Icons/ic_check (= 13.0.0)
-    - MaterialComponents/private/Icons/ic_check_circle (= 13.0.0)
-    - MaterialComponents/private/Icons/ic_chevron_right (= 13.0.0)
-    - MaterialComponents/private/Icons/ic_info (= 13.0.0)
-    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 13.0.0)
-    - MaterialComponents/private/Icons/ic_reorder (= 13.0.0)
-  - MaterialComponents/private/Icons/Base (13.0.0)
-  - MaterialComponents/private/Icons/ic_arrow_back (13.0.0):
+  - MaterialComponents/OverlayWindow (13.0.1)
+  - MaterialComponents/PageControl (13.0.1)
+  - MaterialComponents/Palettes (13.0.1)
+  - MaterialComponents/private (13.0.1):
+    - MaterialComponents/private/Color (= 13.0.1)
+    - MaterialComponents/private/Icons (= 13.0.1)
+    - MaterialComponents/private/KeyboardWatcher (= 13.0.1)
+    - MaterialComponents/private/Overlay (= 13.0.1)
+    - MaterialComponents/private/RTL (= 13.0.1)
+    - MaterialComponents/private/ThumbTrack (= 13.0.1)
+  - MaterialComponents/private/Color (13.0.1)
+  - MaterialComponents/private/Icons (13.0.1):
+    - MaterialComponents/private/Icons/Base (= 13.0.1)
+    - MaterialComponents/private/Icons/ic_arrow_back (= 13.0.1)
+    - MaterialComponents/private/Icons/ic_check (= 13.0.1)
+    - MaterialComponents/private/Icons/ic_check_circle (= 13.0.1)
+    - MaterialComponents/private/Icons/ic_chevron_right (= 13.0.1)
+    - MaterialComponents/private/Icons/ic_info (= 13.0.1)
+    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 13.0.1)
+    - MaterialComponents/private/Icons/ic_reorder (= 13.0.1)
+  - MaterialComponents/private/Icons/Base (13.0.1)
+  - MaterialComponents/private/Icons/ic_arrow_back (13.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check (13.0.0):
+  - MaterialComponents/private/Icons/ic_check (13.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check_circle (13.0.0):
+  - MaterialComponents/private/Icons/ic_check_circle (13.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_chevron_right (13.0.0):
+  - MaterialComponents/private/Icons/ic_chevron_right (13.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_info (13.0.0):
+  - MaterialComponents/private/Icons/ic_info (13.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_radio_button_unchecked (13.0.0):
+  - MaterialComponents/private/Icons/ic_radio_button_unchecked (13.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_reorder (13.0.0):
+  - MaterialComponents/private/Icons/ic_reorder (13.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/KeyboardWatcher (13.0.0)
-  - MaterialComponents/private/Overlay (13.0.0)
-  - MaterialComponents/private/RTL (13.0.0)
-  - MaterialComponents/private/ThumbTrack (13.0.0):
+  - MaterialComponents/private/KeyboardWatcher (13.0.1)
+  - MaterialComponents/private/Overlay (13.0.1)
+  - MaterialComponents/private/RTL (13.0.1)
+  - MaterialComponents/private/ThumbTrack (13.0.1):
     - MaterialComponents/Ink
     - MaterialComponents/private/Color
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/ProgressView (13.0.0):
+  - MaterialComponents/ProgressView (13.0.1):
     - MaterialComponents/private/RTL
-  - MaterialComponents/RobotoFontLoader (13.0.0):
+  - MaterialComponents/RobotoFontLoader (13.0.1):
     - MaterialComponents/FontDiskLoader
     - MaterialComponents/Typography
-  - MaterialComponents/ShadowElevations (13.0.0)
-  - MaterialComponents/ShadowLayer (13.0.0)
-  - MaterialComponents/Slider (13.0.0):
+  - MaterialComponents/ShadowElevations (13.0.1)
+  - MaterialComponents/ShadowLayer (13.0.1)
+  - MaterialComponents/Slider (13.0.1):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Snackbar (13.0.0):
+  - MaterialComponents/Snackbar (13.0.1):
     - MaterialComponents/Buttons
     - MaterialComponents/OverlayWindow
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/Overlay
-  - MaterialComponents/SpritedAnimationView (13.0.0)
-  - MaterialComponents/Switch (13.0.0):
+  - MaterialComponents/SpritedAnimationView (13.0.1)
+  - MaterialComponents/Switch (13.0.1):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Typography (13.0.0)
-  - MaterialComponentsCatalog (13.0.0):
+  - MaterialComponents/Typography (13.0.1)
+  - MaterialComponentsCatalog (13.0.1):
     - MaterialComponents
-  - MaterialComponentsUnitTests (13.0.0):
+  - MaterialComponentsUnitTests (13.0.1):
     - MaterialComponents
 
 DEPENDENCIES:
@@ -159,9 +159,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec
-  MaterialComponents: d25237e4b011014b9fe91baecf4d0bd48319aaa0
-  MaterialComponentsCatalog: 2591186abea9c87ad6e3c6aac76684b870c0fc94
-  MaterialComponentsUnitTests: a3a6ba266630b82c9e5f85481f0aa451b496d81f
+  MaterialComponents: ff17f58b0ca6d9cc24fd113fb0668c5e72eace8e
+  MaterialComponentsCatalog: 1325863f2364beeae1885aab0f3f8cdf2d00e7b5
+  MaterialComponentsUnitTests: 7ae2fd23684a63370e7f2ff7e98cbfccf56669ac
 
 PODFILE CHECKSUM: 309489cdb2727f360a2446856fc0dbe264a2bf36
 

diff --git a/components/ProgressView/examples/ProgressViewExample.m b/components/ProgressView/examples/ProgressViewExample.m
@@ -120,7 +120,7 @@ - (void)setupLabels {
 }
 
 - (void)setupConstraints {
-  NSArray *views = @{
+  NSDictionary *views = @{
     @"stockView" : _stockProgressView,
     @"stockLabel" : _stockProgressLabel,
     @"tintedView" : _tintedProgressView,
@@ -130,7 +130,7 @@ - (void)setupConstraints {
     @"backwardView" : _backwardProgressView,
     @"backwardLabel" : _backwardProgressLabel,
   };
-  NSArray *metrics = @{
+  NSDictionary *metrics = @{
     @"p" : @20,
     @"s" : @40,
     @"h" : @2,
@@ -158,7 +158,7 @@ - (void)setupConstraints {
     @"H:|-(>=p)-[coloredLabel]-(>=p)-|",
     @"H:|-(>=p)-[backwardLabel]-(>=p)-|",
   ];
-  for (NSArray *format in horizontalVisualFormats) {
+  for (NSString *format in horizontalVisualFormats) {
     [horizontalConstraints
         addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:format
                                                                     options:0

diff --git a/components/Snackbar/examples/supplemental/SnackbarExampleSupplemental.h b/components/Snackbar/examples/supplemental/SnackbarExampleSupplemental.h
@@ -44,7 +44,7 @@
 @end
 
 @interface SnackbarSimpleExample : SnackbarExample
-
+- (void)handleShowSnackbarButtonTapped:(id)sender;
 @end
 
 @interface SnackbarSuspensionExample : SnackbarExample
@@ -61,4 +61,7 @@
 @property(nonatomic) UILabel *groupBLabel;
 @property(nonatomic) UILabel *allLabel;
 
+- (void)handleShowTapped:(id)sender;
+- (void)handleSuspendStateChanged:(MDCSwitch *)sender;
+
 @end