Merge branch 'release-candidate' into stable

Author: Jeff Verkoeyen

CHANGELOG.md

@@ -1,3 +1,17 @@
+# 54.6.1
+
+This is a hotfix release fixing a bug in ButtonBar that was introduced in 54.6.0.
+
+## Component changes
+
+### ButtonBar
+
+#### Changes
+
+* [[NavigationBar]Restore the changed default inkColor](https://github.com/material-components/material-components-ios/commit/367048d4b2f40eb84f0c3161c218db69798461d5) (Ali Rabbani)
+
+---
+
 # 54.6.0
 
 This release introduces new APIs and themers for customizing typography and color. This release

MaterialComponents.podspec

@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |mdc|
   mdc.name         = "MaterialComponents"
-  mdc.version      = "54.6.0"
+  mdc.version      = "54.6.1"
   mdc.authors      = "The Material Components authors."
   mdc.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   mdc.homepage     = "https://github.com/material-components/material-components-ios"

MaterialComponentsEarlGreyTests.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsEarlGreyTests"
-  s.version      = "54.6.0"
+  s.version      = "54.6.1"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components EarlGrey tests."
   s.description  = "This spec is made for use in the MDC Catalog."

MaterialComponentsExamples.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsExamples"
-  s.version      = "54.6.0"
+  s.version      = "54.6.1"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components examples."
   s.description  = "This spec is made for use in the MDC Catalog. Used in conjunction with CatalogByConvention we create our Material Catalog."

MaterialComponentsUnitTests.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "54.6.0"
+  s.version      = "54.6.1"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components unit tests."
   s.description  = "This spec is made for use in the MDC Catalog."

VERSION

@@ -1 +1 @@
-54.6.0
+54.6.1

catalog/MDCCatalog/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>54.6.0</string>
+	<string>54.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

catalog/MaterialCatalog/MaterialCatalog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialCatalog"
-  s.version      = "54.6.0"
+  s.version      = "54.6.1"
   s.summary      = "Helper Objective-C classes for the MDC catalog."
   s.description  = "This spec is made for use in the MDC Catalog."
   s.homepage     = "https://github.com/material-components/material-components-ios"

components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m

@@ -88,8 +88,10 @@ - (UIView *)buttonBar:(MDCButtonBar *)buttonBar
   MDCButtonBarButton *button = [[MDCButtonBarButton alloc] init];
   [button setBackgroundColor:[UIColor clearColor] forState:UIControlStateNormal];
   button.disabledAlpha = kDisabledButtonAlpha;
-  button.inkColor = buttonBar.inkColor ? buttonBar.inkColor : button.inkColor;
-  
+  if (buttonBar.inkColor) {
+    button.inkColor = buttonBar.inkColor;
+  }
+
   button.exclusiveTouch = YES;
 
   [MDCAppBarButtonBarBuilder configureButton:button fromButtonItem:buttonItem];

components/LibraryInfo/src/MDCLibraryInfo.m

@@ -21,7 +21,7 @@
 // This string is updated automatically as a part of the release process and should not be edited
 // manually. Do not rename this constant or change the formatting without updating the release
 // scripts.
-static NSString const *MDCLibraryInfoVersionString = @"54.6.0";
+static NSString const *MDCLibraryInfoVersionString = @"54.6.1";
 
 @implementation MDCLibraryInfo