Merge branch 'release-candidate'

CHANGELOG.md

@@ -1,3 +1,34 @@
+# 12.0.1
+
+## API diffs
+
+Auto-generated by running:
+
+    scripts/api_diff -o bdc034da8700a9cbd6064823dc045b511d622f8c -n f9f6d8e87d6cdaf884ac2d3ad462403bdb2fd008
+
+No public API changes detected.
+
+## Component changes
+
+### CollectionCells
+
+#### Changes
+
+* [Resize the content view when there is an accessory view.](https://github.com/google/material-components-ios/commit/f6d329602f84cc0839ebdfa622877d70201fd798) (Louis Romero)
+
+### Slider
+
+#### Changes
+
+* [Add discrete positions when editing](https://github.com/google/material-components-ios/commit/7c0d0a654f030b3e3f2d1136f7415a4caa92917c) (Max Luzuriaga)
+
+### Snackbar
+
+#### Changes
+
+* [Add legal info to snackbar files and umbrella header for keyboard watcher](https://github.com/google/material-components-ios/commit/be579f15da376d1029b4bef2abdf5cdd9c65c891) (Junius Gunaratne)
+* [Don't force uppercasing of the button.](https://github.com/google/material-components-ios/commit/f9f6d8e87d6cdaf884ac2d3ad462403bdb2fd008) (Louis Romero)
+
 # 12.0.0
 
 ## API diffs

MaterialComponents.podspec

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

MaterialComponentsCatalog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "12.0.0"
+  s.version      = "12.0.1"
   s.authors      = { 'Apple platform engineering at Google' => '[email protected]' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

MaterialComponentsUnitTests.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "12.0.0"
+  s.version      = "12.0.1"
   s.authors      = { 'Apple platform engineering at Google' => '[email protected]' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

catalog/CatalogByConvention/example/catalog/Catalog.xcodeproj/project.pbxproj

@@ -89,7 +89,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 666CA6C31CAE277E001B1884 /* Build configuration list for PBXNativeTarget "Catalog" */;
 			buildPhases = (
-				A6D4D34D01155E957863CFC5 /* 📦 Check Pods Manifest.lock */,
+				A6D4D34D01155E957863CFC5 /* [CP] Check Pods Manifest.lock */,
 				5E0C759D6BF372D69AB4361F /* [CP] Check Pods Manifest.lock */,
 				666CA6AD1CAE277E001B1884 /* Sources */,
 				666CA6AE1CAE277E001B1884 /* Frameworks */,
@@ -199,14 +199,14 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Catalog/Pods-Catalog-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A6D4D34D01155E957863CFC5 /* 📦 Check Pods Manifest.lock */ = {
+		A6D4D34D01155E957863CFC5 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;

catalog/CatalogByConvention/example/catalog/Podfile.lock

@@ -28,4 +28,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: f14a477885bb971999b5fa8afb20a539b2bcabdc
 
-COCOAPODS: 1.0.0
+COCOAPODS: 1.0.1

catalog/CatalogByConvention/example/catalog/UnitTests.xcodeproj/project.pbxproj

@@ -83,7 +83,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 666CA7001CAE34F0001B1884 /* Build configuration list for PBXNativeTarget "UnitTests" */;
 			buildPhases = (
-				620E23DD0839D796E051E613 /* 📦 Check Pods Manifest.lock */,
+				620E23DD0839D796E051E613 /* [CP] Check Pods Manifest.lock */,
 				3DF90DBC96265E81B0B0A3BB /* [CP] Check Pods Manifest.lock */,
 				666CA6F41CAE34F0001B1884 /* Sources */,
 				666CA6F51CAE34F0001B1884 /* Frameworks */,
@@ -159,14 +159,14 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		620E23DD0839D796E051E613 /* 📦 Check Pods Manifest.lock */ = {
+		620E23DD0839D796E051E613 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;

catalog/MDCCatalog.xcodeproj/project.pbxproj

@@ -263,12 +263,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 664524C51C6BA62A001ADBF8 /* Build configuration list for PBXNativeTarget "MDCCatalog" */;
 			buildPhases = (
-				D34F9C3373AD1979FBA3F8E0 /* 📦 Check Pods Manifest.lock */,
+				D34F9C3373AD1979FBA3F8E0 /* [CP] Check Pods Manifest.lock */,
 				664524AF1C6BA62A001ADBF8 /* Sources */,
 				664524B01C6BA62A001ADBF8 /* Frameworks */,
 				664524B11C6BA62A001ADBF8 /* Resources */,
-				72ACDAA295D1F2087113246F /* 📦 Embed Pods Frameworks */,
-				8164F6F5D8C80F373A698031 /* 📦 Copy Pods Resources */,
+				72ACDAA295D1F2087113246F /* [CP] Embed Pods Frameworks */,
+				8164F6F5D8C80F373A698031 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -359,44 +359,44 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		72ACDAA295D1F2087113246F /* 📦 Embed Pods Frameworks */ = {
+		72ACDAA295D1F2087113246F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Embed Pods Frameworks";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MDCCatalog/Pods-MDCCatalog-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		8164F6F5D8C80F373A698031 /* 📦 Copy Pods Resources */ = {
+		8164F6F5D8C80F373A698031 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Copy Pods Resources";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MDCCatalog/Pods-MDCCatalog-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D34F9C3373AD1979FBA3F8E0 /* 📦 Check Pods Manifest.lock */ = {
+		D34F9C3373AD1979FBA3F8E0 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;

catalog/MDCUnitTests.xcodeproj/project.pbxproj

@@ -83,12 +83,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 66CB71311C853DB30099B932 /* Build configuration list for PBXNativeTarget "MDCUnitTests" */;
 			buildPhases = (
-				3AAA6E9A4CDB1D9185BBE3C9 /* 📦 Check Pods Manifest.lock */,
+				3AAA6E9A4CDB1D9185BBE3C9 /* [CP] Check Pods Manifest.lock */,
 				66CB71281C853DB30099B932 /* Sources */,
 				66CB71291C853DB30099B932 /* Frameworks */,
 				66CB712A1C853DB30099B932 /* Resources */,
-				F9D78476FD8A80F052AA9626 /* 📦 Embed Pods Frameworks */,
-				AE724C5C2CA008AFD7432821 /* 📦 Copy Pods Resources */,
+				F9D78476FD8A80F052AA9626 /* [CP] Embed Pods Frameworks */,
+				AE724C5C2CA008AFD7432821 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -141,44 +141,44 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3AAA6E9A4CDB1D9185BBE3C9 /* 📦 Check Pods Manifest.lock */ = {
+		3AAA6E9A4CDB1D9185BBE3C9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		AE724C5C2CA008AFD7432821 /* 📦 Copy Pods Resources */ = {
+		AE724C5C2CA008AFD7432821 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Copy Pods Resources";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MDCUnitTests/Pods-MDCUnitTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F9D78476FD8A80F052AA9626 /* 📦 Embed Pods Frameworks */ = {
+		F9D78476FD8A80F052AA9626 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Embed Pods Frameworks";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;