Merge branch 'release-2.0.0'

# Conflicts:
#	CHANGELOG.md
#	MaterialComponents.podspec
#	MaterialComponentsCatalog.podspec
#	MaterialComponentsUnitTests.podspec
#	build_tests/CocoapodsObjCApp/Podfile.lock
#	build_tests/CocoapodsSwiftApp/Podfile.lock
#	catalog/Podfile.lock
#	demos/Pesto/Podfile.lock
#	demos/Shrine/Podfile.lock

.arclint

@@ -10,9 +10,9 @@
       "include": "(\\.(m|h|mm|md|swift)$)",
       "exclude": "(/Pods/)",
       "severity": {
-        "3": "disabled",
         "5": "disabled"
-      }
+      },
+      "text.max-line-length": 100
     },
     "chmod": {
       "type": "chmod",

.gitignore

@@ -59,3 +59,6 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/screenshots
+
+# material component site
+/gh-pages

CHANGELOG.md

@@ -1,9 +1,79 @@
-## In progress since last release
+## 2.0.0
 
 ##### Breaking
 ##### Enhancements
 ##### Bug Fixes
 
+## 2.0.0
+
+##### Breaking
+* [FlexibleHeader] Removed `-[MDCFlexibleHeaderViewController addFlexibleHeaderViewToParentViewControllerView]`,
+  `MDCFlexibleHeaderParentViewController`, and `+[MDCFlexibleHeaderViewController addToParent:]`. These methods
+  were marked deprecated in 1.0.0. [Jeff Verkoeyen](https://github.com/jverkoey)
+
+##### Enhancements
+* Components
+  * [Slider] default color updated to nicer blue.
+  * [Ink] Replace rand() with arc4random() to avoid a static analyzer warning. [Ian Gordon](https://github.com/ianegordon)
+  * [FlexibleHeader] Removed redundant APIs from MDCFlexibleHeaderContainerViewController. [Jeff Verkoeyen](https://github.com/jverkoey)
+  * Rename Private directories to private. (Jeff Verkoeyen)
+
+* Documentation
+  * [Button] Readme copy edits
+* [Conventions] Moved all docs assets into a `docs/assets` directory per component by
+  convention. Issue [#130](https://github.com/google/material-components-ios/issues/130) filed by
+  [peterfriese](https://github.com/peterfriese). Closed by [Jeff Verkoeyen](https://github.com/jverkoey)
+* [CONTRIBUTING] Document our file system conventions in CONTRIBUTING.md. [Jeff Verkoeyen](https://github.com/jverkoey)
+* [CONTRIBUTING] Document our pull request expectations in CONTRIBUTING.md. [Jeff Verkoeyen](https://github.com/jverkoey)
+* [Switch] Removed internal docs that were pretending to be public docs. [Jeff Verkoeyen](https://github.com/jverkoey)
+
+* Catalog
+  * Use single asset for component icons. [Junius Gunaratne](https://github.com/jgunaratne)
+  * Style catalog component screen and change to collection view. [Junius Gunaratne](https://github.com/jgunaratne)
+  * Sorts titles alphabetically. Also fixes title typo in sliders. [Chris Cox](https://github.com/chriscox)
+  * Catalog by convention grabs storyboard resources. [Randall Li](https://github.com/randallli)
+  * Increasing our warnings coverage. [Jeff Verkoeyen](https://github.com/jverkoey)
+  * Support duplicate hierarchy entries. [Randall Li](https://github.com/randallli)
+  * Add support for Swift examples and unit tests [Jeff Verkoeyen](https://github.com/jverkoey)
+  * Added Swift sample for buttons. [Peter Friese](https://github.com/peterfriese)
+  * Refactored Button example to be compatibile with catalog by convention [Randall Li](https://github.com/randallli)
+  * Refactored Slider example to be compatibile with catalog by convention [Randall Li](https://github.com/randallli)
+  * Refactored ShadowLayer example to be compatible with catalog by convention
+  [Randall Li](https://github.com/randallli)
+  * Refactored Switch example to be compatible with catalog by convention
+  [Randall Li](https://github.com/randallli)
+  * Added Swift example for Typography. [Peter Friese](https://github.com/peterfriese)
+
+* Demos
+  * Shrine
+    * Adding PageControl to demo app for scrolling through products. [Junius Gunaratne](https://github.com/jgunaratne)
+    * Fix crash when trying to load images when network is down. [Junius Gunaratne](http://github.com/jgunaratne)
+* Misc
+  * [Jazzy] scripts/gendocs.sh now infers Jazzy arguments by convention. [Jeff Verkoeyen](https://github.com/jverkoey)
+  * [gh-pages] Minor tiding of the preview script for gh-pages. [Jeff Verkoeyen](https://github.com/jverkoey)
+   Enforced lint with `arc lint --everything`.
+* Enable line length warnings in arc lint. [Jeff Verkoeyen](https://github.com/jverkoey)
+* Added script to run pod install on all pods. [Randall Li](https://github.com/randallli)
+* Fix build breakage in MDCCatalog.
+* [FlexibleHeader] Removed redundant APIs from MDCFlexibleHeaderContainerViewController. [Jeff Verkoeyen](https://github.com/jverkoey)
+* Increasing our warnings coverage. [Jeff Verkoeyen](https://github.com/jverkoey)
+
+
+##### Bug Fixes
+
+* [scripts/gendocs.sh] Ensure that doc assets show up in jazzy output. [peterfriese](https://github.com/peterfriese)
+* [MDCSlider] Fixed to [issue](https://github.com/google/material-components-ios/issues/128) that
+  was causing the slider to disappear when disabled. [Randall Li](https://github.com/randallli)
+* Ensure that all private directory references are lower-cased. [Jeff Verkoeyen](https://github.com/jverkoey)
+* [MDCSlider] fixed disabled state so it has the mask around the thumb.
+  [Randall Li](https://github.com/randallli)
+* MaterialComponentsUnitTests.podspec depends on MaterialComponents. [Jeff Verkoeyen](https://github.com/jverkoey)
+* [PageControl] Add missing ss.resource_bundles to the podspec.
+* [Various] Fixed floating-point conversion warnings with Xcode 6 release mode.
+  [ajsecord](https://github.com/ajsecord)
+* [Typography] Add CoreText dependency.
+
+
 ## 1.0.1
 
 ##### Enhancements

CONTRIBUTING.md

@@ -1,5 +1,55 @@
 Want to contribute? Great! First, read this page (including the small print at the end).
 
+## Pull requests
+
+Pull requests can be hard to review if they try to tackle too many things
+at once. Phabricator's "[Writing Reviewable Code](https://secure.phabricator.com/book/phabflavor/article/writing_reviewable_code/)"
+provides a set of guidelines that help increase the likelihood of your
+pull request getting merged.
+
+In short (slightly modified from the original article):
+
+- A pull request should be as small as possible, but no smaller.
+- The smallest a pull request can be is a single cohesive idea: don't
+  make pull requests so small that they are meaningless on their own.
+- Turn large pull requests into small pull requests by dividing large
+  problems into smaller problems and solving the small problems one at
+  a time.
+- Write sensible pull request descriptions.
+
+Our additions:
+
+- A pull request should affect as few components as possible.
+- Pull requests must include a modification to the CHANGELOG.md summarizing the
+  change.
+
+### Conventions
+
+This repository follows a file layout convention that ensures consistency and
+predictability across all of our components. The convention for a given
+component is as follows:
+
+    components/ComponentName/
+      README.md
+      docs/                 <- In-depth technical documentation.
+        TechnicalDoc1.md    <- Docs are written in Markdown.
+        assets/             <- All documentation assets live here.
+          image.png         <- Pngs, movs, gifs, etc...
+      examples/             <- Examples added here show up in the [Catalog](catalog/README.md).
+        Example.swift       <- Examples can be Swift,
+        Example.m           <-                        or Objective-C
+      src/                  <- All component source lives here
+        MaterialComponent.h <- Every component must have an umbrella header
+        MDCObject.h         <- Component source must be written in Objective-C.
+        MDCObject.m
+      tests/                <- All tests here will show up in the [Catalog](catalog/README.md).
+        unit/               <- All unit tests must go here.
+          SomeAPITest.swift <- Unit tests can be Swift,
+          AnotherTest.m     <-                          or Objective-C.
+
+Note that all directories are **lower-cased** except the component's root
+directory.
+
 ### Before you contribute
 
 Before we can use your code, you must sign the

MaterialComponents.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponents"
-  s.version      = "1.0.1"
+  s.version      = "2.0.0"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"
@@ -70,6 +70,9 @@ Pod::Spec.new do |s|
     ss.public_header_files = 'components/PageControl/src/*.h'
     ss.source_files = 'components/PageControl/src/*.{h,m}', 'components/PageControl/src/private/*.{h,m}'
     ss.header_mappings_dir = 'components/PageControl/src/*'
+    ss.resource_bundles = {
+      'MaterialPageControl' => ['components/PageControl/src/MaterialPageControl.bundle/*']
+    }
   end
 
   s.subspec 'ScrollViewDelegateMultiplexer' do |ss|
@@ -117,6 +120,7 @@ Pod::Spec.new do |s|
     ss.public_header_files = 'components/Typography/src/*.h'
     ss.source_files = 'components/Typography/src/*.{h,m}', 'components/Typography/src/Private/*.{h,m}'
     ss.header_mappings_dir = 'components/Typography/src/*'
+    ss.framework = 'CoreText'
 
     ss.resource_bundles = {
       'MaterialTypography' => ['components/Typography/src/MaterialTypography.bundle/*']
@@ -139,7 +143,7 @@ Pod::Spec.new do |s|
       ss.dependency 'MaterialComponents/ShadowLayer'
       ss.dependency 'MaterialComponents/private/Color'
     end
-    
+
   end
 
 end

MaterialComponentsCatalog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "1.0.1"
+  s.version      = "2.0.0"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"
@@ -9,4 +9,6 @@ Pod::Spec.new do |s|
   s.platform     = :ios, '7.0'
   s.requires_arc = true
   s.source_files = 'components/*/examples/*.{h,m,swift}'
+  s.resources    = ["components/*/examples/*.storyboard"]
+  s.dependency 'MaterialComponents'
 end

MaterialComponentsUnitTests.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "1.0.1"
+  s.version      = "2.0.0"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"
@@ -10,4 +10,5 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.source_files = 'components/*/tests/unit/*.{h,m,swift}'
   s.framework    = 'XCTest'
+  s.dependency 'MaterialComponents'
 end