Merge branch 'release-candidate' into develop

material-components · Apr 11, 2018 · 9cd14c5 · 9cd14c5
2 parents 2146d29 + cc75dbd
commit 9cd14c5
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,59 @@
+# 54.3.0
+
+This release continues to expand our support for component Color and Typography theming.
+
+## New features
+
+Buttons and Snackbar now have a Color themer.
+
+BottomNavigationBar, Chips, NavigationBar, TextFields each now have a Typography themer.
+
+## Component changes
+
+### Buttons
+
+#### Changes
+
+* [Implement a semantic color scheme color themer API. (#3306)](https://github.com/material-components/material-components-ios/commit/99fd914646bfa611d3ddb2845cb7b0b5d6bc3fae) (Yarden Eitan)
+
+### TextFields
+
+#### Changes
+
+* [Typography Themer implementation. (#3303)](https://github.com/material-components/material-components-ios/commit/0efdeb2a3f0d23a3521a35c748893c11d0458e7a) (Mohammad Cazi)
+
+### Chips
+
+#### Changes
+
+* [Chips typography implementation. (#3312)](https://github.com/material-components/material-components-ios/commit/81351551f633ae819f241830460e38c08eea637e) (Mohammad Cazi)
+
+### Snackbar
+
+#### Changes
+
+* [Implement a semantic color scheme color themer API. (#3287)](https://github.com/material-components/material-components-ios/commit/66f9b8702a25e1486620561bedeffe3489459a9b) (Yarden Eitan)
+
+### NavigationBar
+
+#### Changes
+
+* [typography implementation. (#3304)](https://github.com/material-components/material-components-ios/commit/8e83dcf3436accaf5367505f8e383bc152886b99) (Mohammad Cazi)
+
+### BottomNavigation
+
+#### Changes
+
+* [BottomNavigationBar Typography Implementation, (#3311)](https://github.com/material-components/material-components-ios/commit/fe10c83c5d8c95c6d5417b36a7ba62aed46ca342) (Mohammad Cazi)
+
+### FlexibleHeader
+
+#### Changes
+
+* [Fix Flexible Header Configurator catalog example (#3254)](https://github.com/material-components/material-components-ios/commit/0797becc18f005263dfe72eb75e63246948c11e6) (John Detloff)
+
+---
+
 # 54.2.0
 
 ## New features

diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |mdc|
   mdc.name         = "MaterialComponents"
-  mdc.version      = "54.2.0"
+  mdc.version      = "54.3.0"
   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"

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

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

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

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-54.2.0
+54.3.0
diff --git a/catalog/MDCCatalog/Info.plist b/catalog/MDCCatalog/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>54.2.0</string>
+	<string>54.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

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

diff --git a/components/LibraryInfo/src/MDCLibraryInfo.m b/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.2.0";
+static NSString const *MDCLibraryInfoVersionString = @"54.3.0";
 
 @implementation MDCLibraryInfo
 

diff --git a/components/LibraryInfo/tests/unit/LibraryInfoTests.swift b/components/LibraryInfo/tests/unit/LibraryInfoTests.swift
@@ -23,7 +23,7 @@ class LibraryInfoTests: XCTestCase {
     // Given
 
     // This regex pattern does the following:
-    // Accept: "54.2.0", etc.
+    // Accept: "54.3.0", etc.
     // Reject: "0.0.0", "1.2", "1", "-1.2.3", "Hi, I'm a version 1.2.3", "1.2.3 is my version", etc.
     //
     // Note the major version must be >= 1 since "0.0.0" is used as the version when something goes

diff --git a/demos/supplemental/RemoteImageServiceForMDCDemos.podspec b/demos/supplemental/RemoteImageServiceForMDCDemos.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "RemoteImageServiceForMDCDemos"
-  s.version      = "54.2.0"
+  s.version      = "54.3.0"
   s.summary      = "A helper image class for the MDC demos."
   s.description  = "This spec is made for use in the MDC demos. It gets images via url."
   s.homepage     = "https://github.com/material-components/material-components-ios"