From 9d240ba0d691e14fd931c542d00f660e3019f642 Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Sat, 5 Mar 2016 13:22:25 -0500 Subject: [PATCH 1/3] 1.0.0 release bugfix. Summary: The 1.0.0 release included the following warning: components/Switch/src/MDCSwitch.m:223:11: error: parameter 'toggleState' not found in the function declaration [-Werror,-Wdocumentation] This was resolved in `develop`, so we're back-porting the fix to the 1.0.0 release. Cherry-picked from http://codereview.cc/D204: [Switch] Remove internal docs demarcated with /**. Reviewers: ajsecord, randallli, #mdc_ios_owners, iangordon Reviewed By: #mdc_ios_owners, iangordon Projects: #material_components_ios Differential Revision: http://codereview.cc/D212 --- CHANGELOG.md | 6 +++--- components/Switch/src/MDCSwitch.m | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 258f723e1ab..a0de3ccb08e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ -## In progress since last release +## 1.0.1 -##### Breaking ##### Enhancements -##### Bug Fixes + +* [Switch] Removed internal docs that were pretending to be public docs. [Jeff Verkoeyen](https://github.com/jverkoey) ## 1.0.0 diff --git a/components/Switch/src/MDCSwitch.m b/components/Switch/src/MDCSwitch.m index 0d60af0815c..950f14d665a 100644 --- a/components/Switch/src/MDCSwitch.m +++ b/components/Switch/src/MDCSwitch.m @@ -218,10 +218,6 @@ - (void)thumbTrack:(MDCThumbTrack *)thumbTrack willJumpToValue:(CGFloat)value { [self updateAccessibilityValues]; } -/** - * Updates the accessibility value of the switch given a toggle state. - * @param toggleState A value for the state of the switch. - */ - (void)updateAccessibilityValues { // Set accessibility value similar to native UISwitch. if (self.on) { @@ -239,11 +235,6 @@ - (void)updateAccessibilityValues { } } -/** - * Returns the toggle state of the switch given a possible slider @c value on the @c thumbTrack. - * @param thumbTrack The contained @c MDCThumbTrack object. - * @param value The value of the slider in @c thumbTrack. - */ - (BOOL)toggleStateFromThumbTrack:(MDCThumbTrack *)thumbTrack withValue:(CGFloat)value { // TODO(ajsecord): When the track supports multiple discrete locations, get the location directly. BOOL allSignsPointToYes = value >= (thumbTrack.minimumValue + thumbTrack.maximumValue) / 2; From 6f6ce8b736cb369ae7a739457df30390cdd187ca Mon Sep 17 00:00:00 2001 From: randallli Date: Mon, 7 Mar 2016 12:26:21 -0500 Subject: [PATCH 2/3] hotfix: incremented pod version Summary: Also reverted some change log differences. Ran pod install on 5 directories Reviewers: featherless, iangordon, ajsecord, #mdc_ios_owners Reviewed By: ajsecord, #mdc_ios_owners Projects: #material_components_ios Differential Revision: http://codereview.cc/D214 --- CHANGELOG.md | 6 ++ MaterialComponents.podspec | 2 +- MaterialComponentsCatalog.podspec | 2 +- MaterialComponentsUnitTests.podspec | 2 +- build_tests/CocoapodsObjCApp/Podfile.lock | 64 +++++++++---------- build_tests/CocoapodsSwiftApp/Podfile.lock | 64 +++++++++---------- catalog/Podfile.lock | 72 +++++++++++----------- demos/Pesto/Podfile.lock | 64 +++++++++---------- demos/Shrine/Podfile.lock | 64 +++++++++---------- 9 files changed, 173 insertions(+), 167 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0de3ccb08e..aa5ca7a4802 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ * [Switch] Removed internal docs that were pretending to be public docs. [Jeff Verkoeyen](https://github.com/jverkoey) +## 1.0.1 + +##### Enhancements + +* [Switch] Removed internal docs that were pretending to be public docs. [Jeff Verkoeyen](https://github.com/jverkoey) + ## 1.0.0 ##### Breaking diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec index 8a26cadee5c..2deeba4c439 100644 --- a/MaterialComponents.podspec +++ b/MaterialComponents.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponents" - s.version = "1.0.0" + s.version = "1.0.1" 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" diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec index 07a4e899dd7..517151be2e5 100644 --- a/MaterialComponentsCatalog.podspec +++ b/MaterialComponentsCatalog.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsCatalog" - s.version = "1.0.0" + s.version = "1.0.1" 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" diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec index f62de44405f..7a801baa449 100644 --- a/MaterialComponentsUnitTests.podspec +++ b/MaterialComponentsUnitTests.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsUnitTests" - s.version = "1.0.0" + s.version = "1.0.1" 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" diff --git a/build_tests/CocoapodsObjCApp/Podfile.lock b/build_tests/CocoapodsObjCApp/Podfile.lock index dddb975da6c..9858694f101 100644 --- a/build_tests/CocoapodsObjCApp/Podfile.lock +++ b/build_tests/CocoapodsObjCApp/Podfile.lock @@ -1,44 +1,44 @@ PODS: - - MaterialComponents (1.0.0): - - MaterialComponents/Buttons (= 1.0.0) - - MaterialComponents/FlexibleHeader (= 1.0.0) - - MaterialComponents/HeaderStackView (= 1.0.0) - - MaterialComponents/Ink (= 1.0.0) - - MaterialComponents/PageControl (= 1.0.0) - - MaterialComponents/private (= 1.0.0) - - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0) - - MaterialComponents/ShadowElevations (= 1.0.0) - - MaterialComponents/ShadowLayer (= 1.0.0) - - MaterialComponents/Slider (= 1.0.0) - - MaterialComponents/SpritedAnimationView (= 1.0.0) - - MaterialComponents/Switch (= 1.0.0) - - MaterialComponents/Typography (= 1.0.0) - - MaterialComponents/Buttons (1.0.0): + - MaterialComponents (1.0.1): + - MaterialComponents/Buttons (= 1.0.1) + - MaterialComponents/FlexibleHeader (= 1.0.1) + - MaterialComponents/HeaderStackView (= 1.0.1) + - MaterialComponents/Ink (= 1.0.1) + - MaterialComponents/PageControl (= 1.0.1) + - MaterialComponents/private (= 1.0.1) + - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1) + - MaterialComponents/ShadowElevations (= 1.0.1) + - MaterialComponents/ShadowLayer (= 1.0.1) + - MaterialComponents/Slider (= 1.0.1) + - MaterialComponents/SpritedAnimationView (= 1.0.1) + - MaterialComponents/Switch (= 1.0.1) + - MaterialComponents/Typography (= 1.0.1) + - MaterialComponents/Buttons (1.0.1): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (1.0.0) - - MaterialComponents/HeaderStackView (1.0.0) - - MaterialComponents/Ink (1.0.0) - - MaterialComponents/PageControl (1.0.0) - - MaterialComponents/private (1.0.0): - - MaterialComponents/private/Color (= 1.0.0) - - MaterialComponents/private/ThumbTrack (= 1.0.0) - - MaterialComponents/private/Color (1.0.0) - - MaterialComponents/private/ThumbTrack (1.0.0): + - MaterialComponents/FlexibleHeader (1.0.1) + - MaterialComponents/HeaderStackView (1.0.1) + - MaterialComponents/Ink (1.0.1) + - MaterialComponents/PageControl (1.0.1) + - MaterialComponents/private (1.0.1): + - MaterialComponents/private/Color (= 1.0.1) + - MaterialComponents/private/ThumbTrack (= 1.0.1) + - MaterialComponents/private/Color (1.0.1) + - MaterialComponents/private/ThumbTrack (1.0.1): - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0) - - MaterialComponents/ShadowElevations (1.0.0) - - MaterialComponents/ShadowLayer (1.0.0) - - MaterialComponents/Slider (1.0.0): + - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.1) + - MaterialComponents/ShadowElevations (1.0.1) + - MaterialComponents/ShadowLayer (1.0.1) + - MaterialComponents/Slider (1.0.1): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (1.0.0) - - MaterialComponents/Switch (1.0.0): + - MaterialComponents/SpritedAnimationView (1.0.1) + - MaterialComponents/Switch (1.0.1): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (1.0.0) + - MaterialComponents/Typography (1.0.1) DEPENDENCIES: - MaterialComponents (from `../../`) @@ -48,6 +48,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d + MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b COCOAPODS: 0.39.0 diff --git a/build_tests/CocoapodsSwiftApp/Podfile.lock b/build_tests/CocoapodsSwiftApp/Podfile.lock index dddb975da6c..9858694f101 100644 --- a/build_tests/CocoapodsSwiftApp/Podfile.lock +++ b/build_tests/CocoapodsSwiftApp/Podfile.lock @@ -1,44 +1,44 @@ PODS: - - MaterialComponents (1.0.0): - - MaterialComponents/Buttons (= 1.0.0) - - MaterialComponents/FlexibleHeader (= 1.0.0) - - MaterialComponents/HeaderStackView (= 1.0.0) - - MaterialComponents/Ink (= 1.0.0) - - MaterialComponents/PageControl (= 1.0.0) - - MaterialComponents/private (= 1.0.0) - - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0) - - MaterialComponents/ShadowElevations (= 1.0.0) - - MaterialComponents/ShadowLayer (= 1.0.0) - - MaterialComponents/Slider (= 1.0.0) - - MaterialComponents/SpritedAnimationView (= 1.0.0) - - MaterialComponents/Switch (= 1.0.0) - - MaterialComponents/Typography (= 1.0.0) - - MaterialComponents/Buttons (1.0.0): + - MaterialComponents (1.0.1): + - MaterialComponents/Buttons (= 1.0.1) + - MaterialComponents/FlexibleHeader (= 1.0.1) + - MaterialComponents/HeaderStackView (= 1.0.1) + - MaterialComponents/Ink (= 1.0.1) + - MaterialComponents/PageControl (= 1.0.1) + - MaterialComponents/private (= 1.0.1) + - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1) + - MaterialComponents/ShadowElevations (= 1.0.1) + - MaterialComponents/ShadowLayer (= 1.0.1) + - MaterialComponents/Slider (= 1.0.1) + - MaterialComponents/SpritedAnimationView (= 1.0.1) + - MaterialComponents/Switch (= 1.0.1) + - MaterialComponents/Typography (= 1.0.1) + - MaterialComponents/Buttons (1.0.1): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (1.0.0) - - MaterialComponents/HeaderStackView (1.0.0) - - MaterialComponents/Ink (1.0.0) - - MaterialComponents/PageControl (1.0.0) - - MaterialComponents/private (1.0.0): - - MaterialComponents/private/Color (= 1.0.0) - - MaterialComponents/private/ThumbTrack (= 1.0.0) - - MaterialComponents/private/Color (1.0.0) - - MaterialComponents/private/ThumbTrack (1.0.0): + - MaterialComponents/FlexibleHeader (1.0.1) + - MaterialComponents/HeaderStackView (1.0.1) + - MaterialComponents/Ink (1.0.1) + - MaterialComponents/PageControl (1.0.1) + - MaterialComponents/private (1.0.1): + - MaterialComponents/private/Color (= 1.0.1) + - MaterialComponents/private/ThumbTrack (= 1.0.1) + - MaterialComponents/private/Color (1.0.1) + - MaterialComponents/private/ThumbTrack (1.0.1): - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0) - - MaterialComponents/ShadowElevations (1.0.0) - - MaterialComponents/ShadowLayer (1.0.0) - - MaterialComponents/Slider (1.0.0): + - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.1) + - MaterialComponents/ShadowElevations (1.0.1) + - MaterialComponents/ShadowLayer (1.0.1) + - MaterialComponents/Slider (1.0.1): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (1.0.0) - - MaterialComponents/Switch (1.0.0): + - MaterialComponents/SpritedAnimationView (1.0.1) + - MaterialComponents/Switch (1.0.1): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (1.0.0) + - MaterialComponents/Typography (1.0.1) DEPENDENCIES: - MaterialComponents (from `../../`) @@ -48,6 +48,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d + MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b COCOAPODS: 0.39.0 diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock index 3602a8da7c4..9c3a1c56155 100644 --- a/catalog/Podfile.lock +++ b/catalog/Podfile.lock @@ -1,46 +1,46 @@ PODS: - - MaterialComponents (1.0.0): - - MaterialComponents/Buttons (= 1.0.0) - - MaterialComponents/FlexibleHeader (= 1.0.0) - - MaterialComponents/HeaderStackView (= 1.0.0) - - MaterialComponents/Ink (= 1.0.0) - - MaterialComponents/PageControl (= 1.0.0) - - MaterialComponents/private (= 1.0.0) - - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0) - - MaterialComponents/ShadowElevations (= 1.0.0) - - MaterialComponents/ShadowLayer (= 1.0.0) - - MaterialComponents/Slider (= 1.0.0) - - MaterialComponents/SpritedAnimationView (= 1.0.0) - - MaterialComponents/Switch (= 1.0.0) - - MaterialComponents/Typography (= 1.0.0) - - MaterialComponents/Buttons (1.0.0): + - MaterialComponents (1.0.1): + - MaterialComponents/Buttons (= 1.0.1) + - MaterialComponents/FlexibleHeader (= 1.0.1) + - MaterialComponents/HeaderStackView (= 1.0.1) + - MaterialComponents/Ink (= 1.0.1) + - MaterialComponents/PageControl (= 1.0.1) + - MaterialComponents/private (= 1.0.1) + - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1) + - MaterialComponents/ShadowElevations (= 1.0.1) + - MaterialComponents/ShadowLayer (= 1.0.1) + - MaterialComponents/Slider (= 1.0.1) + - MaterialComponents/SpritedAnimationView (= 1.0.1) + - MaterialComponents/Switch (= 1.0.1) + - MaterialComponents/Typography (= 1.0.1) + - MaterialComponents/Buttons (1.0.1): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (1.0.0) - - MaterialComponents/HeaderStackView (1.0.0) - - MaterialComponents/Ink (1.0.0) - - MaterialComponents/PageControl (1.0.0) - - MaterialComponents/private (1.0.0): - - MaterialComponents/private/Color (= 1.0.0) - - MaterialComponents/private/ThumbTrack (= 1.0.0) - - MaterialComponents/private/Color (1.0.0) - - MaterialComponents/private/ThumbTrack (1.0.0): + - MaterialComponents/FlexibleHeader (1.0.1) + - MaterialComponents/HeaderStackView (1.0.1) + - MaterialComponents/Ink (1.0.1) + - MaterialComponents/PageControl (1.0.1) + - MaterialComponents/private (1.0.1): + - MaterialComponents/private/Color (= 1.0.1) + - MaterialComponents/private/ThumbTrack (= 1.0.1) + - MaterialComponents/private/Color (1.0.1) + - MaterialComponents/private/ThumbTrack (1.0.1): - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0) - - MaterialComponents/ShadowElevations (1.0.0) - - MaterialComponents/ShadowLayer (1.0.0) - - MaterialComponents/Slider (1.0.0): + - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.1) + - MaterialComponents/ShadowElevations (1.0.1) + - MaterialComponents/ShadowLayer (1.0.1) + - MaterialComponents/Slider (1.0.1): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (1.0.0) - - MaterialComponents/Switch (1.0.0): + - MaterialComponents/SpritedAnimationView (1.0.1) + - MaterialComponents/Switch (1.0.1): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (1.0.0) - - MaterialComponentsCatalog (1.0.0) - - MaterialComponentsUnitTests (1.0.0) + - MaterialComponents/Typography (1.0.1) + - MaterialComponentsCatalog (1.0.1) + - MaterialComponentsUnitTests (1.0.1) DEPENDENCIES: - MaterialComponents (from `../`) @@ -56,8 +56,8 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d - MaterialComponentsCatalog: 2f0e7bae9ebf7ba0dca2699996d4103a8224901f - MaterialComponentsUnitTests: 4fb216eb24e8b239d5fb2b874ad210460d322fd2 + MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b + MaterialComponentsCatalog: 1083faa86271b7591e27f03a2cb2a0bbd20e9038 + MaterialComponentsUnitTests: 48a654682f525dd89946bf82bc6d4fe5d8d6e7c0 COCOAPODS: 0.39.0 diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock index dddb975da6c..9858694f101 100644 --- a/demos/Pesto/Podfile.lock +++ b/demos/Pesto/Podfile.lock @@ -1,44 +1,44 @@ PODS: - - MaterialComponents (1.0.0): - - MaterialComponents/Buttons (= 1.0.0) - - MaterialComponents/FlexibleHeader (= 1.0.0) - - MaterialComponents/HeaderStackView (= 1.0.0) - - MaterialComponents/Ink (= 1.0.0) - - MaterialComponents/PageControl (= 1.0.0) - - MaterialComponents/private (= 1.0.0) - - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0) - - MaterialComponents/ShadowElevations (= 1.0.0) - - MaterialComponents/ShadowLayer (= 1.0.0) - - MaterialComponents/Slider (= 1.0.0) - - MaterialComponents/SpritedAnimationView (= 1.0.0) - - MaterialComponents/Switch (= 1.0.0) - - MaterialComponents/Typography (= 1.0.0) - - MaterialComponents/Buttons (1.0.0): + - MaterialComponents (1.0.1): + - MaterialComponents/Buttons (= 1.0.1) + - MaterialComponents/FlexibleHeader (= 1.0.1) + - MaterialComponents/HeaderStackView (= 1.0.1) + - MaterialComponents/Ink (= 1.0.1) + - MaterialComponents/PageControl (= 1.0.1) + - MaterialComponents/private (= 1.0.1) + - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1) + - MaterialComponents/ShadowElevations (= 1.0.1) + - MaterialComponents/ShadowLayer (= 1.0.1) + - MaterialComponents/Slider (= 1.0.1) + - MaterialComponents/SpritedAnimationView (= 1.0.1) + - MaterialComponents/Switch (= 1.0.1) + - MaterialComponents/Typography (= 1.0.1) + - MaterialComponents/Buttons (1.0.1): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (1.0.0) - - MaterialComponents/HeaderStackView (1.0.0) - - MaterialComponents/Ink (1.0.0) - - MaterialComponents/PageControl (1.0.0) - - MaterialComponents/private (1.0.0): - - MaterialComponents/private/Color (= 1.0.0) - - MaterialComponents/private/ThumbTrack (= 1.0.0) - - MaterialComponents/private/Color (1.0.0) - - MaterialComponents/private/ThumbTrack (1.0.0): + - MaterialComponents/FlexibleHeader (1.0.1) + - MaterialComponents/HeaderStackView (1.0.1) + - MaterialComponents/Ink (1.0.1) + - MaterialComponents/PageControl (1.0.1) + - MaterialComponents/private (1.0.1): + - MaterialComponents/private/Color (= 1.0.1) + - MaterialComponents/private/ThumbTrack (= 1.0.1) + - MaterialComponents/private/Color (1.0.1) + - MaterialComponents/private/ThumbTrack (1.0.1): - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0) - - MaterialComponents/ShadowElevations (1.0.0) - - MaterialComponents/ShadowLayer (1.0.0) - - MaterialComponents/Slider (1.0.0): + - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.1) + - MaterialComponents/ShadowElevations (1.0.1) + - MaterialComponents/ShadowLayer (1.0.1) + - MaterialComponents/Slider (1.0.1): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (1.0.0) - - MaterialComponents/Switch (1.0.0): + - MaterialComponents/SpritedAnimationView (1.0.1) + - MaterialComponents/Switch (1.0.1): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (1.0.0) + - MaterialComponents/Typography (1.0.1) DEPENDENCIES: - MaterialComponents (from `../../`) @@ -48,6 +48,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d + MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b COCOAPODS: 0.39.0 diff --git a/demos/Shrine/Podfile.lock b/demos/Shrine/Podfile.lock index dddb975da6c..9858694f101 100644 --- a/demos/Shrine/Podfile.lock +++ b/demos/Shrine/Podfile.lock @@ -1,44 +1,44 @@ PODS: - - MaterialComponents (1.0.0): - - MaterialComponents/Buttons (= 1.0.0) - - MaterialComponents/FlexibleHeader (= 1.0.0) - - MaterialComponents/HeaderStackView (= 1.0.0) - - MaterialComponents/Ink (= 1.0.0) - - MaterialComponents/PageControl (= 1.0.0) - - MaterialComponents/private (= 1.0.0) - - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0) - - MaterialComponents/ShadowElevations (= 1.0.0) - - MaterialComponents/ShadowLayer (= 1.0.0) - - MaterialComponents/Slider (= 1.0.0) - - MaterialComponents/SpritedAnimationView (= 1.0.0) - - MaterialComponents/Switch (= 1.0.0) - - MaterialComponents/Typography (= 1.0.0) - - MaterialComponents/Buttons (1.0.0): + - MaterialComponents (1.0.1): + - MaterialComponents/Buttons (= 1.0.1) + - MaterialComponents/FlexibleHeader (= 1.0.1) + - MaterialComponents/HeaderStackView (= 1.0.1) + - MaterialComponents/Ink (= 1.0.1) + - MaterialComponents/PageControl (= 1.0.1) + - MaterialComponents/private (= 1.0.1) + - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1) + - MaterialComponents/ShadowElevations (= 1.0.1) + - MaterialComponents/ShadowLayer (= 1.0.1) + - MaterialComponents/Slider (= 1.0.1) + - MaterialComponents/SpritedAnimationView (= 1.0.1) + - MaterialComponents/Switch (= 1.0.1) + - MaterialComponents/Typography (= 1.0.1) + - MaterialComponents/Buttons (1.0.1): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (1.0.0) - - MaterialComponents/HeaderStackView (1.0.0) - - MaterialComponents/Ink (1.0.0) - - MaterialComponents/PageControl (1.0.0) - - MaterialComponents/private (1.0.0): - - MaterialComponents/private/Color (= 1.0.0) - - MaterialComponents/private/ThumbTrack (= 1.0.0) - - MaterialComponents/private/Color (1.0.0) - - MaterialComponents/private/ThumbTrack (1.0.0): + - MaterialComponents/FlexibleHeader (1.0.1) + - MaterialComponents/HeaderStackView (1.0.1) + - MaterialComponents/Ink (1.0.1) + - MaterialComponents/PageControl (1.0.1) + - MaterialComponents/private (1.0.1): + - MaterialComponents/private/Color (= 1.0.1) + - MaterialComponents/private/ThumbTrack (= 1.0.1) + - MaterialComponents/private/Color (1.0.1) + - MaterialComponents/private/ThumbTrack (1.0.1): - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0) - - MaterialComponents/ShadowElevations (1.0.0) - - MaterialComponents/ShadowLayer (1.0.0) - - MaterialComponents/Slider (1.0.0): + - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.1) + - MaterialComponents/ShadowElevations (1.0.1) + - MaterialComponents/ShadowLayer (1.0.1) + - MaterialComponents/Slider (1.0.1): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (1.0.0) - - MaterialComponents/Switch (1.0.0): + - MaterialComponents/SpritedAnimationView (1.0.1) + - MaterialComponents/Switch (1.0.1): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (1.0.0) + - MaterialComponents/Typography (1.0.1) DEPENDENCIES: - MaterialComponents (from `../../`) @@ -48,6 +48,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d + MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b COCOAPODS: 0.39.0 From a18e9d386ccba898370d042cedee66c0fd82d709 Mon Sep 17 00:00:00 2001 From: randallli Date: Mon, 7 Mar 2016 12:34:27 -0500 Subject: [PATCH 3/3] fixed changelog Summary: fixed a merge kludge Reviewers: ajsecord, #mdc_ios_owners, featherless Reviewed By: #mdc_ios_owners, featherless Projects: #material_components_ios Differential Revision: http://codereview.cc/D216 --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa5ca7a4802..dde26021405 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ -## 1.0.1 +## In progress since last release +##### Breaking ##### Enhancements - -* [Switch] Removed internal docs that were pretending to be public docs. [Jeff Verkoeyen](https://github.com/jverkoey) +##### Bug Fixes ## 1.0.1