Merge branch 'release-candidate'

material-components · Feb 15, 2017 · 2fe5887 · 2fe5887
2 parents 31d5812 + d1b2b7d
commit 2fe5887
Show file tree

Hide file tree

Showing 27 changed files with 597 additions and 358 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,8 @@ before_install:
   - scripts/install_contributor_tools
 # The travis_wait prefix ensures that the build doesn't error out because too much time went past
 # without any output being produced.
+#
+# Note that we only test unit tests in an attempt to get reasonable performance out of Travis CI.
 script:
   - set -o pipefail
   - xcodebuild -version
@@ -26,6 +28,6 @@ script:
   - swiftlint
   - scripts/prep_all
   - travis_wait scripts/build_all
-  - travis_wait scripts/test_all
+  - travis_wait scripts/test_all catalog/MDCCatalog.xcworkspace:MDCUnitTests
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,37 @@
+# 21.2.0
+
+## API diffs
+
+### NavigationBar
+
+* [Added MDCNavigationBarTextColorAccessibilityMutator. (#1180)](https://github.com/material-components/material-components-ios/commit/5db1b8add5e9e77d9439a973cbc9d2d41188d049) (Justin Shephard)
+
+## Component changes
+
+### CollectionCells
+
+#### Changes
+
+* [Fix memory leak in Ink and correct issues with ink when re-using cells (#1180)](https://github.com/material-components/material-components-ios/commit/5db1b8add5e9e77d9439a973cbc9d2d41188d049) (Justin Shephard)
+
+### Ink
+
+#### Changes
+
+* [Fix memory leak in Ink and correct issues with ink when re-using cells (#1180)](https://github.com/material-components/material-components-ios/commit/5db1b8add5e9e77d9439a973cbc9d2d41188d049) (Justin Shephard)
+
+### NavigationBar
+
+#### Changes
+
+* [Added Accessibility Mutator (#1109)](https://github.com/material-components/material-components-ios/commit/c3d3bd34affdd0d52500682bb3c129995f24eadc) (Justin Shephard)
+
+### Typography
+
+#### Changes
+
+* [Corrects typo in snippet. (#1198)](https://github.com/material-components/material-components-ios/commit/a6b23484bdf25b3f15629693e0e8beb65932791a) (Will Larche)
+
 # 21.1.0
 
 ## Component changes

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      = "21.1.0"
+  s.version      = "21.2.0"
   s.authors      = "The Material Components authors."
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/material-components/material-components-ios"
@@ -177,6 +177,9 @@ Pod::Spec.new do |s|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
 
+    # Accessibility Configurator
+    ss.dependency "MDFTextAccessibility"
+
     ss.dependency "MaterialComponents/ButtonBar"
     ss.dependency "MaterialComponents/Typography"
     ss.dependency "MaterialComponents/private/RTL"

diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "21.1.0"
+  s.version      = "21.2.0"
   s.authors      = "The Material Components authors."
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/material-components/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      = "21.1.0"
+  s.version      = "21.2.0"
   s.authors      = "The Material Motion authors."
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/material-components/material-components-ios"

diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock
@@ -1,37 +1,37 @@
 PODS:
   - CatalogByConvention (2.0.0)
   - EarlGrey (1.7.1)
-  - MaterialComponents (21.1.0):
-    - MaterialComponents/ActivityIndicator (= 21.1.0)
-    - MaterialComponents/AnimationTiming (= 21.1.0)
-    - MaterialComponents/AppBar (= 21.1.0)
-    - MaterialComponents/ButtonBar (= 21.1.0)
-    - MaterialComponents/Buttons (= 21.1.0)
-    - MaterialComponents/CollectionCells (= 21.1.0)
-    - MaterialComponents/CollectionLayoutAttributes (= 21.1.0)
-    - MaterialComponents/Collections (= 21.1.0)
-    - MaterialComponents/Dialogs (= 21.1.0)
-    - MaterialComponents/FeatureHighlight (= 21.1.0)
-    - MaterialComponents/FlexibleHeader (= 21.1.0)
-    - MaterialComponents/HeaderStackView (= 21.1.0)
-    - MaterialComponents/Ink (= 21.1.0)
-    - MaterialComponents/NavigationBar (= 21.1.0)
-    - MaterialComponents/OverlayWindow (= 21.1.0)
-    - MaterialComponents/PageControl (= 21.1.0)
-    - MaterialComponents/Palettes (= 21.1.0)
-    - MaterialComponents/private (= 21.1.0)
-    - MaterialComponents/ProgressView (= 21.1.0)
-    - MaterialComponents/ShadowElevations (= 21.1.0)
-    - MaterialComponents/ShadowLayer (= 21.1.0)
-    - MaterialComponents/Slider (= 21.1.0)
-    - MaterialComponents/Snackbar (= 21.1.0)
-    - MaterialComponents/Tabs (= 21.1.0)
-    - MaterialComponents/Typography (= 21.1.0)
-  - MaterialComponents/ActivityIndicator (21.1.0):
+  - MaterialComponents (21.2.0):
+    - MaterialComponents/ActivityIndicator (= 21.2.0)
+    - MaterialComponents/AnimationTiming (= 21.2.0)
+    - MaterialComponents/AppBar (= 21.2.0)
+    - MaterialComponents/ButtonBar (= 21.2.0)
+    - MaterialComponents/Buttons (= 21.2.0)
+    - MaterialComponents/CollectionCells (= 21.2.0)
+    - MaterialComponents/CollectionLayoutAttributes (= 21.2.0)
+    - MaterialComponents/Collections (= 21.2.0)
+    - MaterialComponents/Dialogs (= 21.2.0)
+    - MaterialComponents/FeatureHighlight (= 21.2.0)
+    - MaterialComponents/FlexibleHeader (= 21.2.0)
+    - MaterialComponents/HeaderStackView (= 21.2.0)
+    - MaterialComponents/Ink (= 21.2.0)
+    - MaterialComponents/NavigationBar (= 21.2.0)
+    - MaterialComponents/OverlayWindow (= 21.2.0)
+    - MaterialComponents/PageControl (= 21.2.0)
+    - MaterialComponents/Palettes (= 21.2.0)
+    - MaterialComponents/private (= 21.2.0)
+    - MaterialComponents/ProgressView (= 21.2.0)
+    - MaterialComponents/ShadowElevations (= 21.2.0)
+    - MaterialComponents/ShadowLayer (= 21.2.0)
+    - MaterialComponents/Slider (= 21.2.0)
+    - MaterialComponents/Snackbar (= 21.2.0)
+    - MaterialComponents/Tabs (= 21.2.0)
+    - MaterialComponents/Typography (= 21.2.0)
+  - MaterialComponents/ActivityIndicator (21.2.0):
     - MaterialComponents/private/Application
     - MaterialComponents/private/RTL
-  - MaterialComponents/AnimationTiming (21.1.0)
-  - MaterialComponents/AppBar (21.1.0):
+  - MaterialComponents/AnimationTiming (21.2.0)
+  - MaterialComponents/AppBar (21.2.0):
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
@@ -40,16 +40,16 @@ PODS:
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (21.1.0):
+  - MaterialComponents/ButtonBar (21.2.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/RTL
-  - MaterialComponents/Buttons (21.1.0):
+  - MaterialComponents/Buttons (21.2.0):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
     - MDFTextAccessibility
-  - MaterialComponents/CollectionCells (21.1.0):
+  - MaterialComponents/CollectionCells (21.2.0):
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/private/Icons/ic_check
@@ -60,102 +60,103 @@ PODS:
     - MaterialComponents/private/Icons/ic_reorder
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionLayoutAttributes (21.1.0)
-  - MaterialComponents/Collections (21.1.0):
+  - MaterialComponents/CollectionLayoutAttributes (21.2.0)
+  - MaterialComponents/Collections (21.2.0):
     - MaterialComponents/CollectionCells
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/Dialogs (21.1.0):
+  - MaterialComponents/Dialogs (21.2.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/RTL
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/FeatureHighlight (21.1.0):
+  - MaterialComponents/FeatureHighlight (21.2.0):
     - MaterialComponents/Typography
     - MDFTextAccessibility
-  - MaterialComponents/FlexibleHeader (21.1.0):
+  - MaterialComponents/FlexibleHeader (21.2.0):
     - MaterialComponents/private/Application
     - MDFTextAccessibility
-  - MaterialComponents/HeaderStackView (21.1.0)
-  - MaterialComponents/Ink (21.1.0)
-  - MaterialComponents/NavigationBar (21.1.0):
+  - MaterialComponents/HeaderStackView (21.2.0)
+  - MaterialComponents/Ink (21.2.0)
+  - MaterialComponents/NavigationBar (21.2.0):
     - MaterialComponents/ButtonBar
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/OverlayWindow (21.1.0):
+    - MDFTextAccessibility
+  - MaterialComponents/OverlayWindow (21.2.0):
     - MaterialComponents/private/Application
-  - MaterialComponents/PageControl (21.1.0)
-  - MaterialComponents/Palettes (21.1.0)
-  - MaterialComponents/private (21.1.0):
-    - MaterialComponents/private/Application (= 21.1.0)
-    - MaterialComponents/private/Icons (= 21.1.0)
-    - MaterialComponents/private/KeyboardWatcher (= 21.1.0)
-    - MaterialComponents/private/Overlay (= 21.1.0)
-    - MaterialComponents/private/RTL (= 21.1.0)
-    - MaterialComponents/private/ThumbTrack (= 21.1.0)
-  - MaterialComponents/private/Application (21.1.0)
-  - MaterialComponents/private/Icons (21.1.0):
-    - MaterialComponents/private/Icons/Base (= 21.1.0)
-    - MaterialComponents/private/Icons/ic_arrow_back (= 21.1.0)
-    - MaterialComponents/private/Icons/ic_check (= 21.1.0)
-    - MaterialComponents/private/Icons/ic_check_circle (= 21.1.0)
-    - MaterialComponents/private/Icons/ic_chevron_right (= 21.1.0)
-    - MaterialComponents/private/Icons/ic_info (= 21.1.0)
-    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 21.1.0)
-    - MaterialComponents/private/Icons/ic_reorder (= 21.1.0)
-  - MaterialComponents/private/Icons/Base (21.1.0)
-  - MaterialComponents/private/Icons/ic_arrow_back (21.1.0):
+  - MaterialComponents/PageControl (21.2.0)
+  - MaterialComponents/Palettes (21.2.0)
+  - MaterialComponents/private (21.2.0):
+    - MaterialComponents/private/Application (= 21.2.0)
+    - MaterialComponents/private/Icons (= 21.2.0)
+    - MaterialComponents/private/KeyboardWatcher (= 21.2.0)
+    - MaterialComponents/private/Overlay (= 21.2.0)
+    - MaterialComponents/private/RTL (= 21.2.0)
+    - MaterialComponents/private/ThumbTrack (= 21.2.0)
+  - MaterialComponents/private/Application (21.2.0)
+  - MaterialComponents/private/Icons (21.2.0):
+    - MaterialComponents/private/Icons/Base (= 21.2.0)
+    - MaterialComponents/private/Icons/ic_arrow_back (= 21.2.0)
+    - MaterialComponents/private/Icons/ic_check (= 21.2.0)
+    - MaterialComponents/private/Icons/ic_check_circle (= 21.2.0)
+    - MaterialComponents/private/Icons/ic_chevron_right (= 21.2.0)
+    - MaterialComponents/private/Icons/ic_info (= 21.2.0)
+    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 21.2.0)
+    - MaterialComponents/private/Icons/ic_reorder (= 21.2.0)
+  - MaterialComponents/private/Icons/Base (21.2.0)
+  - MaterialComponents/private/Icons/ic_arrow_back (21.2.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check (21.1.0):
+  - MaterialComponents/private/Icons/ic_check (21.2.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check_circle (21.1.0):
+  - MaterialComponents/private/Icons/ic_check_circle (21.2.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_chevron_right (21.1.0):
+  - MaterialComponents/private/Icons/ic_chevron_right (21.2.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_info (21.1.0):
+  - MaterialComponents/private/Icons/ic_info (21.2.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_radio_button_unchecked (21.1.0):
+  - MaterialComponents/private/Icons/ic_radio_button_unchecked (21.2.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_reorder (21.1.0):
+  - MaterialComponents/private/Icons/ic_reorder (21.2.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/KeyboardWatcher (21.1.0):
+  - MaterialComponents/private/KeyboardWatcher (21.2.0):
     - MaterialComponents/private/Application
-  - MaterialComponents/private/Overlay (21.1.0)
-  - MaterialComponents/private/RTL (21.1.0)
-  - MaterialComponents/private/ThumbTrack (21.1.0):
+  - MaterialComponents/private/Overlay (21.2.0)
+  - MaterialComponents/private/RTL (21.2.0)
+  - MaterialComponents/private/ThumbTrack (21.2.0):
     - MaterialComponents/Ink
     - MaterialComponents/private/RTL
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ProgressView (21.1.0):
+  - MaterialComponents/ProgressView (21.2.0):
     - MaterialComponents/private/RTL
-  - MaterialComponents/ShadowElevations (21.1.0)
-  - MaterialComponents/ShadowLayer (21.1.0)
-  - MaterialComponents/Slider (21.1.0):
+  - MaterialComponents/ShadowElevations (21.2.0)
+  - MaterialComponents/ShadowLayer (21.2.0)
+  - MaterialComponents/Slider (21.2.0):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Snackbar (21.1.0):
+  - MaterialComponents/Snackbar (21.2.0):
     - MaterialComponents/AnimationTiming
     - MaterialComponents/Buttons
     - MaterialComponents/OverlayWindow
     - MaterialComponents/private/Application
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/Overlay
     - MaterialComponents/Typography
-  - MaterialComponents/Tabs (21.1.0):
+  - MaterialComponents/Tabs (21.2.0):
     - MaterialComponents/AnimationTiming
     - MaterialComponents/Ink
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/Typography (21.1.0):
+  - MaterialComponents/Typography (21.2.0):
     - MaterialComponents/private/Application
-  - MaterialComponentsCatalog (21.1.0):
+  - MaterialComponentsCatalog (21.2.0):
     - MaterialComponents
-  - MaterialComponentsUnitTests (21.1.0):
+  - MaterialComponentsUnitTests (21.2.0):
     - MaterialComponents
     - MDFTextAccessibility
   - MDFTextAccessibility (1.1.4)
@@ -178,9 +179,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
   EarlGrey: 4ee729245614b7157aafa7fa4a8c4fd4ba38113a
-  MaterialComponents: 1ebb183bfa1b2ccbe7f5afb9536fc9395b368b07
-  MaterialComponentsCatalog: e7f07ab415fe6455b607f122aca9511f2866096c
-  MaterialComponentsUnitTests: '09d7e3529e8b03ff7a89240da8c5117523cbdea7'
+  MaterialComponents: 69b470f9d3dc303cd360b4ba5ab2cd937853e5e1
+  MaterialComponentsCatalog: bfb9427952bf4f851e898b5157964973623adac9
+  MaterialComponentsUnitTests: eccd0e947f8507a908856e6985e38484d43b5b05
   MDFTextAccessibility: aa897b2675bc614c01a331053af680deea692148
 
 PODFILE CHECKSUM: 0a93a34ae9af89654baaaa3a998126cb7d9e1198

diff --git a/components/CollectionCells/src/MDCCollectionViewCell+Ink.h b/components/CollectionCells/src/MDCCollectionViewCell+Ink.h