Merge branch 'release-candidate' into stable

material-components · May 4, 2018 · 1104129 · 1104129
2 parents 5ee7e2e + e2e46ba
commit 1104129
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 55.0.3
+
+This patch release adds documentation polish around bidirectionality.
+
+---
+
 # 55.0.2
 
 This patch release includes more documentation polish and a bug fix for Cards theming.

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      = "55.0.2"
+  mdc.version      = "55.0.3"
   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      = "55.0.2"
+  s.version      = "55.0.3"
   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      = "55.0.2"
+  s.version      = "55.0.3"
   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      = "55.0.2"
+  s.version      = "55.0.3"
   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 @@
-55.0.2
+55.0.3
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>55.0.2</string>
+	<string>55.0.3</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      = "55.0.2"
+  s.version      = "55.0.3"
   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 = @"55.0.2";
+static NSString const *MDCLibraryInfoVersionString = @"55.0.3";
 
 @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: "55.0.2", etc.
+    // Accept: "55.0.3", 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/components/schemes/Bidirectionality/README.md b/components/schemes/Bidirectionality/README.md
@@ -0,0 +1,4 @@
+# Bidirectionality
+
+The [bidirectionality](https://material.io/go/design-bidirectionality) engineering guidance is yet to be completed, please follow the [tracking issue](https://www.pivotaltracker.com/story/show/157329301) for more information.
+
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      = "55.0.2"
+  s.version      = "55.0.3"
   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"

diff --git a/scripts/external/material-motion-apidiff b/scripts/external/material-motion-apidiff
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		# Bidirectionality

		The [bidirectionality](https://material.io/go/design-bidirectionality) engineering guidance is yet to be completed, please follow the [tracking issue](https://www.pivotaltracker.com/story/show/157329301) for more information.