Manually merge release-canddiate

material-components · Jul 22, 2016 · 307b03c · 307b03c
2 parents c6523ea + b2454be
commit 307b03c
Show file tree

Hide file tree

Showing 68 changed files with 1,549 additions and 2,512 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,21 +1,77 @@
+<<<<<<< HEAD
 # 12.1.1
+=======
+# 12.2.0
+>>>>>>> release-candidate
 
 ## API diffs
 
 Auto-generated by running:
 
+<<<<<<< HEAD
     scripts/api_diff -o ec923edf948c5c0ef8cef52f3a3b26a21cbf29d9 -n 34f12cf42f45e30bada83ff6c4c67d5104201a00
 
 No public API changes detected.
 
 ## Component changes
 
+=======
+    scripts/api_diff -o c6523eae8e811b1c89d94073b9153a03390b1950 -n edab0db4908985cd0b56003b4341d5f064f98d6a
+
+### Dialogs
+
+**New component.**
+
+## Component changes
+
+### Dialogs
+
+#### Changes
+
+* [Initial Import](https://github.com/google/material-components-ios/commit/3742dd4849c64e334a46e6b027ddfa9c75e6034c) (Ian Gordon)
+* [Add missing website API and usage docs.](https://github.com/google/material-components-ios/commit/493331502c44f6e844ffbdfdf21d439ce4ba455b) (Adrian Secord)
+
+### Ink
+
+#### Changes
+
+* [Arc lint changes.](https://github.com/google/material-components-ios/commit/7bedb6183cb47017763bfa8b4d50265b4530ebd9) (Adrian Secord)
+
+### ProgressView
+
+#### Changes
+
+* [Add missing website API and usage docs.](https://github.com/google/material-components-ios/commit/493331502c44f6e844ffbdfdf21d439ce4ba455b) (Adrian Secord)
+
+### Slider
+
+#### Changes
+
+* [[Catalog] Bigger sliders in component example](https://github.com/google/material-components-ios/commit/e1b7f86879cfc09abfc057344e8a484447ec7766) (Max Luzuriaga)
+
+### Snackbar
+
+#### Changes
+
+* [Add missing website API and usage docs.](https://github.com/google/material-components-ios/commit/493331502c44f6e844ffbdfdf21d439ce4ba455b) (Adrian Secord)
+
+>>>>>>> release-candidate
 ### SpritedAnimationView
 
 #### Changes
 
+<<<<<<< HEAD
 * [Added intrinsicContentSize.](https://github.com/google/material-components-ios/commit/34f12cf42f45e30bada83ff6c4c67d5104201a00) (randallli)
 
+=======
+* [Add intrinsicContentSize.](https://github.com/google/material-components-ios/commit/32614d0fb4f9621fa03933d20866095c6890c926) (randallli)
+
+### Switch
+
+#### Changes
+
+* [#524 - Fix RTL support](https://github.com/google/material-components-ios/commit/9f328d5eca12116ae9a03089377613f4176ddb51) (Justin Shephard)
+>>>>>>> release-candidate
 
 # 12.1.0
 

diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -2,13 +2,13 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponents"
-  s.version      = "12.1.1"
+  s.version      = "12.2.0"
   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"
   s.license      = "Apache 2.0"
   s.source       = { :git => "https://github.com/google/material-components-ios.git", :tag => s.version.to_s }
-  s.platform     = :ios, "7.0"
+  s.platform     = :ios
   s.requires_arc = true
 
   # # Subspec explanation
@@ -39,12 +39,14 @@ Pod::Spec.new do |s|
   #
 
   s.subspec "ActivityIndicator" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src/*"
   end
 
   s.subspec "AppBar" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -64,6 +66,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Buttons" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -75,6 +78,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "ButtonBar" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -84,6 +88,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "CollectionCells" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -103,12 +108,14 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "CollectionLayoutAttributes" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "Collections" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -126,13 +133,26 @@ Pod::Spec.new do |s|
     ss.dependency "MaterialComponents/Typography"
   end
 
+  s.subspec "Dialogs" do |ss|
+    ss.ios.deployment_target = '8.0'
+    ss.public_header_files = "components/#{ss.base_name}/src/*.h"
+    ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
+    ss.dependency "MaterialComponents/Buttons"
+    ss.dependency "MaterialComponents/ShadowElevations"
+    ss.dependency "MaterialComponents/ShadowLayer"
+    ss.dependency "MaterialComponents/private/KeyboardWatcher"
+  end
+
   s.subspec "FlexibleHeader" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "FontDiskLoader" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -141,18 +161,21 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "HeaderStackView" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "Ink" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "NavigationBar" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -163,12 +186,14 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "OverlayWindow" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "PageControl" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -178,12 +203,14 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Palettes" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "ProgressView" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -192,6 +219,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "RobotoFontLoader" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -206,18 +234,21 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "ShadowElevations" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "ShadowLayer" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "Slider" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -226,6 +257,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Snackbar" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -237,12 +269,14 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "SpritedAnimationView" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "Switch" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -254,6 +288,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Typography" do |ss|
+    ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
@@ -267,30 +302,35 @@ Pod::Spec.new do |s|
     registerIcons(pss)
 
     pss.subspec "Color" do |ss|
+      ss.ios.deployment_target = '7.0'
       ss.public_header_files = "components/private/#{ss.base_name}/src/*.h"
       ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}"
       ss.header_mappings_dir = "components/private/#{ss.base_name}/src"
     end
 
     pss.subspec "KeyboardWatcher" do |ss|
+      ss.ios.deployment_target = '7.0'
       ss.public_header_files = "components/private/#{ss.base_name}/src/*.h"
       ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}"
       ss.header_mappings_dir = "components/private/#{ss.base_name}/src"
     end
 
     pss.subspec "Overlay" do |ss|
+      ss.ios.deployment_target = '7.0'
       ss.public_header_files = "components/private/#{ss.base_name}/src/*.h"
       ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}", "components/private/#{ss.base_name}/src/private/*.{h,m}"
       ss.header_mappings_dir = "components/private/#{ss.base_name}/src"
     end
 
     pss.subspec "RTL" do |ss|
+      ss.ios.deployment_target = '7.0'
       ss.public_header_files = "components/private/#{ss.base_name}/src/*.h"
       ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}"
       ss.header_mappings_dir = "components/private/#{ss.base_name}/src"
     end
 
     pss.subspec "ThumbTrack" do |ss|
+      ss.ios.deployment_target = '7.0'
       ss.public_header_files = "components/private/#{ss.base_name}/src/*.h"
       ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}"
       ss.header_mappings_dir = "components/private/#{ss.base_name}/src"

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

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

diff --git a/catalog/CatalogByConvention/CatalogByConvention.podspec b/catalog/CatalogByConvention/CatalogByConvention.podspec