From 395a12ff7e045a7c1f3d7d697cb8809e5bd30b57 Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 07:47:03 -0500 Subject: [PATCH 01/13] Cut release candidate. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9677b962..9f9bb7d1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# release-candidate TODO: Replace me with version number. + # 17.1.1 No public API or component changes. From 9568d7c42060c559a9ee3ca2a227bbf17e06aba3 Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 07:54:56 -0500 Subject: [PATCH 02/13] Updated pods. --- demos/Bare/Podfile.lock | 3 ++- demos/Pesto/Podfile.lock | 2 +- demos/Shrine/Podfile.lock | 4 ++-- demos/Shrine/Shrine.xcodeproj/project.pbxproj | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/demos/Bare/Podfile.lock b/demos/Bare/Podfile.lock index ef4efad07..7942eb8f0 100644 --- a/demos/Bare/Podfile.lock +++ b/demos/Bare/Podfile.lock @@ -72,6 +72,7 @@ PODS: - MaterialComponents/Dialogs (17.1.1): - MaterialComponents/Buttons - MaterialComponents/private/KeyboardWatcher + - MaterialComponents/private/RTL - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/FeatureHighlight (17.1.1): @@ -169,7 +170,7 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - MaterialComponents: a12d5ceb61374c68107a96f199db6237cfc5b05a + MaterialComponents: 0bd28ac1305e3e5a31d8f753d025eed1bbad0b1d MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601 PODFILE CHECKSUM: 44e7c616a05bb4ce24db557c3de4bfbe915c2f56 diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock index 085225e3a..3386958f0 100644 --- a/demos/Pesto/Podfile.lock +++ b/demos/Pesto/Podfile.lock @@ -90,7 +90,7 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - MaterialComponents: a12d5ceb61374c68107a96f199db6237cfc5b05a + MaterialComponents: 0bd28ac1305e3e5a31d8f753d025eed1bbad0b1d MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601 PODFILE CHECKSUM: 5fb11f20fd57ca970cc72aa501b3ee3e360a9f23 diff --git a/demos/Shrine/Podfile.lock b/demos/Shrine/Podfile.lock index c87684965..aa7ae5bfc 100644 --- a/demos/Shrine/Podfile.lock +++ b/demos/Shrine/Podfile.lock @@ -50,10 +50,10 @@ EXTERNAL SOURCES: :path: "../supplemental" SPEC CHECKSUMS: - MaterialComponents: 47e76f8f7d5291625c907c22f2dba2977280b0de + MaterialComponents: 0bd28ac1305e3e5a31d8f753d025eed1bbad0b1d MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601 RemoteImageServiceForMDCDemos: cc158fa6b8cbd644e896ea4301fc2644738b8046 PODFILE CHECKSUM: 5eb94d7fb8deeb6709b7300f5d0e0e1a75902cca -COCOAPODS: 1.1.1 +COCOAPODS: 1.0.1 diff --git a/demos/Shrine/Shrine.xcodeproj/project.pbxproj b/demos/Shrine/Shrine.xcodeproj/project.pbxproj index cce52d49b..b5b69e832 100644 --- a/demos/Shrine/Shrine.xcodeproj/project.pbxproj +++ b/demos/Shrine/Shrine.xcodeproj/project.pbxproj @@ -208,7 +208,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + 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; }; D1F846F8DE8314F37D7BCFC1 /* [CP] Embed Pods Frameworks */ = { From 96ada23f183fd319e6e3b9bd068abdd1ddd67fb4 Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 08:08:46 -0500 Subject: [PATCH 03/13] Fixed double/CGFloat conversion error and formatting in MDCFlexibleHeaderView.m. --- .../src/MDCFlexibleHeaderView.m | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/components/FlexibleHeader/src/MDCFlexibleHeaderView.m b/components/FlexibleHeader/src/MDCFlexibleHeaderView.m index efdd54520..e4171f330 100644 --- a/components/FlexibleHeader/src/MDCFlexibleHeaderView.m +++ b/components/FlexibleHeader/src/MDCFlexibleHeaderView.m @@ -190,11 +190,11 @@ static NSString *const MDCFlexibleHeaderDelegateKey = @"MDCFlexibleHeaderDelegat if (self) { [self commonMDCFlexibleHeaderViewInit]; if ([aDecoder containsValueForKey:MDCFlexibleHeaderMinimumHeightKey]) { - _minimumHeight = [aDecoder decodeDoubleForKey:MDCFlexibleHeaderMinimumHeightKey]; + _minimumHeight = (CGFloat)[aDecoder decodeDoubleForKey:MDCFlexibleHeaderMinimumHeightKey]; } if ([aDecoder containsValueForKey:MDCFlexibleHeaderMaximumHeightKey]) { - _maximumHeight = [aDecoder decodeDoubleForKey:MDCFlexibleHeaderMaximumHeightKey]; + _maximumHeight = (CGFloat)[aDecoder decodeDoubleForKey:MDCFlexibleHeaderMaximumHeightKey]; } if ([aDecoder containsValueForKey:MDCFlexibleHeaderShiftBehaviorKey]) { @@ -202,7 +202,8 @@ static NSString *const MDCFlexibleHeaderDelegateKey = @"MDCFlexibleHeaderDelegat } if ([aDecoder containsValueForKey:MDCFlexibleHeaderContentImportanceKey]) { - _headerContentImportance = [aDecoder decodeIntegerForKey:MDCFlexibleHeaderContentImportanceKey]; + _headerContentImportance = + [aDecoder decodeIntegerForKey:MDCFlexibleHeaderContentImportanceKey]; } if ([aDecoder containsValueForKey:MDCFlexibleHeaderCanOverExtendKey]) { @@ -210,11 +211,13 @@ static NSString *const MDCFlexibleHeaderDelegateKey = @"MDCFlexibleHeaderDelegat } if ([aDecoder containsValueForKey:MDCFlexibleHeaderStatusBarCanOverlapKey]) { - _statusBarHintCanOverlapHeader = [aDecoder decodeBoolForKey:MDCFlexibleHeaderStatusBarCanOverlapKey]; + _statusBarHintCanOverlapHeader = + [aDecoder decodeBoolForKey:MDCFlexibleHeaderStatusBarCanOverlapKey]; } if ([aDecoder containsValueForKey:MDCFlexibleHeaderVisibleShadowOpacityKey]) { - _visibleShadowOpacity = [aDecoder decodeFloatForKey:MDCFlexibleHeaderVisibleShadowOpacityKey]; + _visibleShadowOpacity = + (CGFloat)[aDecoder decodeFloatForKey:MDCFlexibleHeaderVisibleShadowOpacityKey]; } if ([aDecoder containsValueForKey:MDCFlexibleHeaderTrackingScrollViewKey]) { @@ -222,11 +225,13 @@ static NSString *const MDCFlexibleHeaderDelegateKey = @"MDCFlexibleHeaderDelegat } if ([aDecoder containsValueForKey:MDCFlexibleHeaderInFrontOfInfiniteContentKey]) { - _inFrontOfInfiniteContent = [aDecoder decodeBoolForKey:MDCFlexibleHeaderInFrontOfInfiniteContentKey]; + _inFrontOfInfiniteContent = + [aDecoder decodeBoolForKey:MDCFlexibleHeaderInFrontOfInfiniteContentKey]; } if ([aDecoder containsValueForKey:MDCFlexibleHeaderSharedWithManyScrollViewsKey]) { - _sharedWithManyScrollViews = [aDecoder decodeBoolForKey:MDCFlexibleHeaderSharedWithManyScrollViewsKey]; + _sharedWithManyScrollViews = + [aDecoder decodeBoolForKey:MDCFlexibleHeaderSharedWithManyScrollViewsKey]; } if ([aDecoder containsValueForKey:MDCFlexibleHeaderContentIsTranslucentKey]) { @@ -248,13 +253,17 @@ static NSString *const MDCFlexibleHeaderDelegateKey = @"MDCFlexibleHeaderDelegat [aCoder encodeInteger:self.shiftBehavior forKey:MDCFlexibleHeaderShiftBehaviorKey]; [aCoder encodeInteger:self.headerContentImportance forKey:MDCFlexibleHeaderContentImportanceKey]; [aCoder encodeBool:self.canOverExtend forKey:MDCFlexibleHeaderCanOverExtendKey]; - [aCoder encodeBool:self.statusBarHintCanOverlapHeader forKey:MDCFlexibleHeaderStatusBarCanOverlapKey]; + [aCoder encodeBool:self.statusBarHintCanOverlapHeader + forKey:MDCFlexibleHeaderStatusBarCanOverlapKey]; [aCoder encodeFloat:self.visibleShadowOpacity forKey:MDCFlexibleHeaderVisibleShadowOpacityKey]; - [aCoder encodeBool:self.inFrontOfInfiniteContent forKey:MDCFlexibleHeaderInFrontOfInfiniteContentKey]; - [aCoder encodeBool:self.sharedWithManyScrollViews forKey:MDCFlexibleHeaderSharedWithManyScrollViewsKey]; + [aCoder encodeBool:self.inFrontOfInfiniteContent + forKey:MDCFlexibleHeaderInFrontOfInfiniteContentKey]; + [aCoder encodeBool:self.sharedWithManyScrollViews + forKey:MDCFlexibleHeaderSharedWithManyScrollViewsKey]; [aCoder encodeBool:self.contentIsTranslucent forKey:MDCFlexibleHeaderContentIsTranslucentKey]; if (self.trackingScrollView) { - [aCoder encodeConditionalObject:self.trackingScrollView forKey:MDCFlexibleHeaderTrackingScrollViewKey]; + [aCoder encodeConditionalObject:self.trackingScrollView + forKey:MDCFlexibleHeaderTrackingScrollViewKey]; } if (self.delegate) { [aCoder encodeConditionalObject:self.delegate forKey:MDCFlexibleHeaderDelegateKey]; From 7640a0a567b42832842b5aa2888c297eebbc8900 Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 08:12:16 -0500 Subject: [PATCH 04/13] Undid CGFloat cast for one property. --- components/FlexibleHeader/src/MDCFlexibleHeaderView.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/FlexibleHeader/src/MDCFlexibleHeaderView.m b/components/FlexibleHeader/src/MDCFlexibleHeaderView.m index e4171f330..f2ac706ad 100644 --- a/components/FlexibleHeader/src/MDCFlexibleHeaderView.m +++ b/components/FlexibleHeader/src/MDCFlexibleHeaderView.m @@ -216,8 +216,7 @@ static NSString *const MDCFlexibleHeaderDelegateKey = @"MDCFlexibleHeaderDelegat } if ([aDecoder containsValueForKey:MDCFlexibleHeaderVisibleShadowOpacityKey]) { - _visibleShadowOpacity = - (CGFloat)[aDecoder decodeFloatForKey:MDCFlexibleHeaderVisibleShadowOpacityKey]; + _visibleShadowOpacity = [aDecoder decodeFloatForKey:MDCFlexibleHeaderVisibleShadowOpacityKey]; } if ([aDecoder containsValueForKey:MDCFlexibleHeaderTrackingScrollViewKey]) { From b54f2fbec06b328add56120e7aa75aa01f79c1fa Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 08:13:29 -0500 Subject: [PATCH 05/13] Removed pod install and build cleaning from the build-all script. --- scripts/build_all_pod_projects | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/scripts/build_all_pod_projects b/scripts/build_all_pod_projects index 442a295cb..87aa8e9fb 100755 --- a/scripts/build_all_pod_projects +++ b/scripts/build_all_pod_projects @@ -16,24 +16,22 @@ set -o errexit -build_log=build_log.txt -find * -name 'Podfile' | while read path; do - project_dir=$(dirname $path) - echo "Building in $project_dir..." - pushd $(dirname $path) >/dev/null +readonly SCRIPTS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +readonly BUILD_LOG=build_log.txt - rm -rf Pods - pod install --silent +readonly PODFILE_DIRS=$("$SCRIPTS_DIR"/release/manage_pods.py list) +for i in $PODFILE_DIRS; do + echo "Building in $i..." + pushd $i >/dev/null workspace=$(find . -d 1 -name '*.xcworkspace') scheme=$(xcodebuild build -workspace $workspace -list | grep "Information about workspace" | cut -d'"' -f2) - xcodebuild clean -workspace $workspace -scheme $scheme >/dev/null - if ! xcodebuild build -workspace $workspace -scheme $scheme >$build_log 2>&1; then - echo "Failed to build $scheme in $workspace, log left in $project_dir/$build_log." + if ! xcodebuild build -workspace $workspace -scheme $scheme >$BUILD_LOG 2>&1; then + echo "Failed to build $scheme in $workspace, log left in $i/$BUILD_LOG." echo "Continuing with next project..." else - rm $build_log + rm $BUILD_LOG echo "Done." fi From 989caa912e530764bb77b019b5a52625a4690d35 Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 08:32:25 -0500 Subject: [PATCH 06/13] Added a "test_all" script. --- scripts/test_all | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 scripts/test_all diff --git a/scripts/test_all b/scripts/test_all new file mode 100755 index 000000000..649996a5e --- /dev/null +++ b/scripts/test_all @@ -0,0 +1,28 @@ +#!/bin/bash +# +# Copyright 2016-present the Material Components for iOS authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +readonly SCRIPTS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +readonly ROOT_DIR="$(dirname $SCRIPTS_DIR)" +readonly DESTINATION='platform=iOS Simulator,name=iPhone 7,OS=latest' +readonly LOG=test_all_log.txt + +# Expand (or script) this out as needed in the future. +(cd "$ROOT_DIR/catalog" && xcodebuild test -workspace MDCCatalog.xcworkspace -scheme MDCCatalog -destination "$DESTINATION") > $LOG 2>&1 +if [[ $? -ne 0 ]]; then + echo "Testing failed, leaving log output in $LOG." +else + rm $LOG +fi From 1674076115b05364d98e20c58171803d873a4ec1 Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 08:45:32 -0500 Subject: [PATCH 07/13] Added component changes. --- CHANGELOG.md | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 178 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f9bb7d1b..f735c6791 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,183 @@ # release-candidate TODO: Replace me with version number. +## Component changes + +### ActivityIndicator + +#### Changes + +* [Add missing language switcher comments to READMEs (#963)](https://github.com/material-components/material-components-ios/commit/d246914c96d2b831cb213d9dc8d2caf4afb1dbfd) (Sam Morrison) +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) +* [[MDCActivityIndicator] Add API documentation links to README.md (#950)](https://github.com/material-components/material-components-ios/commit/7da34bbff7b17e72c6dc104e41e99ba38aa1bf07) (Junius Gunaratne) + +### AnimationTiming + +#### Changes + +* [Add jekyll file and update pod spec](https://github.com/material-components/material-components-ios/commit/060db3e5966f1bfdfec57e85a3dedde0bc482c49) (Junius Gunaratne) +* [Add missing language switcher comments to READMEs (#963)](https://github.com/material-components/material-components-ios/commit/d246914c96d2b831cb213d9dc8d2caf4afb1dbfd) (Sam Morrison) +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### AppBar + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### ButtonBar + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### Buttons + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### CollectionCells + +#### Changes + +* [Add "selected" accessibility trait when cell is selected in edit mode (#967)](https://github.com/material-components/material-components-ios/commit/3730aa2c580d358322a3efab6f71f40825bbf283) (Jackie Quinn) + +### CollectionLayoutAttributes + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### Collections + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### Dialogs + +#### Changes + +* [Add RTL Support (#972)](https://github.com/material-components/material-components-ios/commit/b13df7f1391c24ea13a53a772c77b68d8ef144e6) (ianegordon) +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### FeatureHighlight + +#### Changes + +* [Fix .png and .mp4 file names to match `scripts/check_components` (#946)](https://github.com/material-components/material-components-ios/commit/850faf828b220b467589b4b16315e9c4b0bbd12b) (Adrian Secord) +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### FlexibleHeader + +#### Changes + +* [- Added NSCoding compliance to component, IBDesignab… (#973)](https://github.com/material-components/material-components-ios/commit/db4b55a54e0dde591e5e171b8a17bfe11ed3ed8d) (Justin Shephard) +* [Fixed double/CGFloat conversion error and formatting in MDCFlexibleHeaderView.m.](https://github.com/material-components/material-components-ios/commit/96ada23f183fd319e6e3b9bd068abdd1ddd67fb4) (Adrian Secord) +* [Undid CGFloat cast for one property.](https://github.com/material-components/material-components-ios/commit/7640a0a567b42832842b5aa2888c297eebbc8900) (Adrian Secord) +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### FontDiskLoader + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### HeaderStackView + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### Ink + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### NavigationBar + +#### Changes + +* [Fix .png and .mp4 file names to match `scripts/check_components` (#946)](https://github.com/material-components/material-components-ios/commit/850faf828b220b467589b4b16315e9c4b0bbd12b) (Adrian Secord) +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### OverlayWindow + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### PageControl + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### Palettes + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### ProgressView + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### RobotoFontLoader + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### ShadowElevations + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### ShadowLayer + +#### Changes + +* [Fix .png and .mp4 file names to match `scripts/check_components` (#946)](https://github.com/material-components/material-components-ios/commit/850faf828b220b467589b4b16315e9c4b0bbd12b) (Adrian Secord) +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) +* [[Shadows] Scrub comments (#948)](https://github.com/material-components/material-components-ios/commit/d8df05828047510bb19f0f6ed1e793c55298a0f3) (ianegordon) + +### Slider + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### Snackbar + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### SpritedAnimationView + +#### Changes + +* [Fix .png and .mp4 file names to match `scripts/check_components` (#946)](https://github.com/material-components/material-components-ios/commit/850faf828b220b467589b4b16315e9c4b0bbd12b) (Adrian Secord) +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### Switch + +#### Changes + +* [Deprecated Switch and removed its examples. (#951)](https://github.com/material-components/material-components-ios/commit/b9fdbd6b11f1766b75f2fbd774ec33997d17fa54) (Adrian Secord) +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + +### Typography + +#### Changes + +* [[Documentation] Putting Swift snippets before Objc (#960)](https://github.com/material-components/material-components-ios/commit/1080e894229e18a7fae391d5e53ccdc7800fcd19) (Will Larche) + # 17.1.1 No public API or component changes. From be375e60e99f686cb5d7f1e9c4d3f8c483f649f3 Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 08:51:55 -0500 Subject: [PATCH 08/13] Fixed scripts/release/diff. --- scripts/release/diff | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/scripts/release/diff b/scripts/release/diff index 4d59dd411..7b396666b 100755 --- a/scripts/release/diff +++ b/scripts/release/diff @@ -16,8 +16,8 @@ # Generates a diff from the last release to the current one. -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"; pushd $DIR >> /dev/null -MDC_ROOT="$(git rev-parse --show-toplevel | tail -n1)"; popd >> /dev/null +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +MDC_ROOT="$(cd "$DIR" && git rev-parse --show-toplevel | tail -n1)" cd $MDC_ROOT if [ ! $(git rev-parse --verify release-candidate 2> /dev/null) ]; then @@ -25,21 +25,10 @@ if [ ! $(git rev-parse --verify release-candidate 2> /dev/null) ]; then exit 1 fi -useDiffTool=false; - -while test $# -gt 0; do - case "$1" in - --use_diff_tool) - useDiffTool=true; - shift - ;; - esac -done - -if $useDiffTool; then - diffTool=difftool -else - diffTool=diff +git_diff=diff +if [ "$1" == "--use_diff_tool" ]; then + git_diff=difftool + shift 1 fi -git $diffTool origin/master..release-candidate "$@" +git $git_diff origin/master..release-candidate "$@" From 53a1a11e2e4a43ca67002fe3cadafe2e7526e53b Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 08:56:46 -0500 Subject: [PATCH 09/13] Added API diffs. --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f735c6791..ae17fcc50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # release-candidate TODO: Replace me with version number. +## API Changes + +### FlexibleHeader + +* `MDCFlexibleHeaderView` is now marked `IB_DESIGNABLE`. + +### Switch + +* `MDCSwitch` is completely deprecated and will be removed in the next release. We recommend apps use UISwitch instead. + ## Component changes ### ActivityIndicator From f526af0a2c1f2f0611e8c3542f7ed3cff01f0af9 Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 09:04:17 -0500 Subject: [PATCH 10/13] Fixed bump usage of manage_pods. --- scripts/release/bump | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/release/bump b/scripts/release/bump index e9a514b2d..6588744aa 100755 --- a/scripts/release/bump +++ b/scripts/release/bump @@ -154,7 +154,8 @@ def main(): update_podspec_file(verbose_printer, p, args.version) # Update all pod files. - manage_pods.install_all_podfile_dirs(args.directory, args.fast_pod_install) + manage_pods.install_all_podfile_dirs(args.directory, args.fast_pod_install, + manage_pods.BLACKLIST_DIRS) if __name__ == '__main__': main() From 4a333373a9a24db6536590f7699879e7dc017cd1 Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 09:04:57 -0500 Subject: [PATCH 11/13] Bumped version to 17.2.0. --- MaterialComponents.podspec | 2 +- MaterialComponentsCatalog.podspec | 2 +- MaterialComponentsUnitTests.podspec | 2 +- catalog/Podfile.lock | 184 +++++++++--------- demos/Bare/Podfile.lock | 176 ++++++++--------- demos/Pesto/Podfile.lock | 56 +++--- demos/Shrine/Podfile.lock | 36 ++-- .../RemoteImageServiceForMDCDemos.podspec | 2 +- 8 files changed, 230 insertions(+), 230 deletions(-) diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec index e41335f43..423d7b44b 100644 --- a/MaterialComponents.podspec +++ b/MaterialComponents.podspec @@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb' Pod::Spec.new do |s| s.name = "MaterialComponents" - s.version = "17.1.1" + s.version = "17.2.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/material-components/material-components-ios" diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec index 6d1c8ab75..ad16794db 100644 --- a/MaterialComponentsCatalog.podspec +++ b/MaterialComponentsCatalog.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsCatalog" - s.version = "17.1.1" + s.version = "17.2.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/material-components/material-components-ios" diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec index 669d31271..f1d7319b2 100644 --- a/MaterialComponentsUnitTests.podspec +++ b/MaterialComponentsUnitTests.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsUnitTests" - s.version = "17.1.1" + s.version = "17.2.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/material-components/material-components-ios" diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock index 1e2f374b3..ad2c2f3c8 100644 --- a/catalog/Podfile.lock +++ b/catalog/Podfile.lock @@ -1,40 +1,40 @@ PODS: - CatalogByConvention (2.0.0) - EarlGrey (1.5.3) - - MaterialComponents (17.1.1): - - MaterialComponents/ActivityIndicator (= 17.1.1) - - MaterialComponents/AnimationTiming (= 17.1.1) - - MaterialComponents/AppBar (= 17.1.1) - - MaterialComponents/ButtonBar (= 17.1.1) - - MaterialComponents/Buttons (= 17.1.1) - - MaterialComponents/CollectionCells (= 17.1.1) - - MaterialComponents/CollectionLayoutAttributes (= 17.1.1) - - MaterialComponents/Collections (= 17.1.1) - - MaterialComponents/Dialogs (= 17.1.1) - - MaterialComponents/FeatureHighlight (= 17.1.1) - - MaterialComponents/FlexibleHeader (= 17.1.1) - - MaterialComponents/FontDiskLoader (= 17.1.1) - - MaterialComponents/HeaderStackView (= 17.1.1) - - MaterialComponents/Ink (= 17.1.1) - - MaterialComponents/NavigationBar (= 17.1.1) - - MaterialComponents/OverlayWindow (= 17.1.1) - - MaterialComponents/PageControl (= 17.1.1) - - MaterialComponents/Palettes (= 17.1.1) - - MaterialComponents/private (= 17.1.1) - - MaterialComponents/ProgressView (= 17.1.1) - - MaterialComponents/RobotoFontLoader (= 17.1.1) - - MaterialComponents/ShadowElevations (= 17.1.1) - - MaterialComponents/ShadowLayer (= 17.1.1) - - MaterialComponents/Slider (= 17.1.1) - - MaterialComponents/Snackbar (= 17.1.1) - - MaterialComponents/SpritedAnimationView (= 17.1.1) - - MaterialComponents/Switch (= 17.1.1) - - MaterialComponents/Typography (= 17.1.1) - - MaterialComponents/ActivityIndicator (17.1.1): + - MaterialComponents (17.2.0): + - MaterialComponents/ActivityIndicator (= 17.2.0) + - MaterialComponents/AnimationTiming (= 17.2.0) + - MaterialComponents/AppBar (= 17.2.0) + - MaterialComponents/ButtonBar (= 17.2.0) + - MaterialComponents/Buttons (= 17.2.0) + - MaterialComponents/CollectionCells (= 17.2.0) + - MaterialComponents/CollectionLayoutAttributes (= 17.2.0) + - MaterialComponents/Collections (= 17.2.0) + - MaterialComponents/Dialogs (= 17.2.0) + - MaterialComponents/FeatureHighlight (= 17.2.0) + - MaterialComponents/FlexibleHeader (= 17.2.0) + - MaterialComponents/FontDiskLoader (= 17.2.0) + - MaterialComponents/HeaderStackView (= 17.2.0) + - MaterialComponents/Ink (= 17.2.0) + - MaterialComponents/NavigationBar (= 17.2.0) + - MaterialComponents/OverlayWindow (= 17.2.0) + - MaterialComponents/PageControl (= 17.2.0) + - MaterialComponents/Palettes (= 17.2.0) + - MaterialComponents/private (= 17.2.0) + - MaterialComponents/ProgressView (= 17.2.0) + - MaterialComponents/RobotoFontLoader (= 17.2.0) + - MaterialComponents/ShadowElevations (= 17.2.0) + - MaterialComponents/ShadowLayer (= 17.2.0) + - MaterialComponents/Slider (= 17.2.0) + - MaterialComponents/Snackbar (= 17.2.0) + - MaterialComponents/SpritedAnimationView (= 17.2.0) + - MaterialComponents/Switch (= 17.2.0) + - MaterialComponents/Typography (= 17.2.0) + - MaterialComponents/ActivityIndicator (17.2.0): - MaterialComponents/private/Application - MaterialComponents/private/RTL - - MaterialComponents/AnimationTiming (17.1.1) - - MaterialComponents/AppBar (17.1.1): + - MaterialComponents/AnimationTiming (17.2.0) + - MaterialComponents/AppBar (17.2.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -43,16 +43,16 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (17.1.1): + - MaterialComponents/ButtonBar (17.2.0): - MaterialComponents/Buttons - MaterialComponents/private/RTL - - MaterialComponents/Buttons (17.1.1): + - MaterialComponents/Buttons (17.2.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - MDFTextAccessibility - - MaterialComponents/CollectionCells (17.1.1): + - MaterialComponents/CollectionCells (17.2.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -63,91 +63,91 @@ PODS: - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/private/RTL - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (17.1.1) - - MaterialComponents/Collections (17.1.1): + - MaterialComponents/CollectionLayoutAttributes (17.2.0) + - MaterialComponents/Collections (17.2.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/Dialogs (17.1.1): + - MaterialComponents/Dialogs (17.2.0): - MaterialComponents/Buttons - MaterialComponents/private/KeyboardWatcher - MaterialComponents/private/RTL - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/FeatureHighlight (17.1.1): + - MaterialComponents/FeatureHighlight (17.2.0): - MaterialComponents/Typography - MDFTextAccessibility - - MaterialComponents/FlexibleHeader (17.1.1): + - MaterialComponents/FlexibleHeader (17.2.0): - MaterialComponents/private/Application - MDFTextAccessibility - - MaterialComponents/FontDiskLoader (17.1.1) - - MaterialComponents/HeaderStackView (17.1.1) - - MaterialComponents/Ink (17.1.1) - - MaterialComponents/NavigationBar (17.1.1): + - MaterialComponents/FontDiskLoader (17.2.0) + - MaterialComponents/HeaderStackView (17.2.0) + - MaterialComponents/Ink (17.2.0) + - MaterialComponents/NavigationBar (17.2.0): - MaterialComponents/ButtonBar - MaterialComponents/private/RTL - MaterialComponents/Typography - - MaterialComponents/OverlayWindow (17.1.1): + - MaterialComponents/OverlayWindow (17.2.0): - MaterialComponents/private/Application - - MaterialComponents/PageControl (17.1.1) - - MaterialComponents/Palettes (17.1.1) - - MaterialComponents/private (17.1.1): - - MaterialComponents/private/Application (= 17.1.1) - - MaterialComponents/private/Color (= 17.1.1) - - MaterialComponents/private/Icons (= 17.1.1) - - MaterialComponents/private/KeyboardWatcher (= 17.1.1) - - MaterialComponents/private/Overlay (= 17.1.1) - - MaterialComponents/private/RTL (= 17.1.1) - - MaterialComponents/private/ThumbTrack (= 17.1.1) - - MaterialComponents/private/Application (17.1.1) - - MaterialComponents/private/Color (17.1.1) - - MaterialComponents/private/Icons (17.1.1): - - MaterialComponents/private/Icons/Base (= 17.1.1) - - MaterialComponents/private/Icons/ic_arrow_back (= 17.1.1) - - MaterialComponents/private/Icons/ic_check (= 17.1.1) - - MaterialComponents/private/Icons/ic_check_circle (= 17.1.1) - - MaterialComponents/private/Icons/ic_chevron_right (= 17.1.1) - - MaterialComponents/private/Icons/ic_info (= 17.1.1) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 17.1.1) - - MaterialComponents/private/Icons/ic_reorder (= 17.1.1) - - MaterialComponents/private/Icons/Base (17.1.1) - - MaterialComponents/private/Icons/ic_arrow_back (17.1.1): + - MaterialComponents/PageControl (17.2.0) + - MaterialComponents/Palettes (17.2.0) + - MaterialComponents/private (17.2.0): + - MaterialComponents/private/Application (= 17.2.0) + - MaterialComponents/private/Color (= 17.2.0) + - MaterialComponents/private/Icons (= 17.2.0) + - MaterialComponents/private/KeyboardWatcher (= 17.2.0) + - MaterialComponents/private/Overlay (= 17.2.0) + - MaterialComponents/private/RTL (= 17.2.0) + - MaterialComponents/private/ThumbTrack (= 17.2.0) + - MaterialComponents/private/Application (17.2.0) + - MaterialComponents/private/Color (17.2.0) + - MaterialComponents/private/Icons (17.2.0): + - MaterialComponents/private/Icons/Base (= 17.2.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 17.2.0) + - MaterialComponents/private/Icons/ic_check (= 17.2.0) + - MaterialComponents/private/Icons/ic_check_circle (= 17.2.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 17.2.0) + - MaterialComponents/private/Icons/ic_info (= 17.2.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 17.2.0) + - MaterialComponents/private/Icons/ic_reorder (= 17.2.0) + - MaterialComponents/private/Icons/Base (17.2.0) + - MaterialComponents/private/Icons/ic_arrow_back (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (17.1.1): + - MaterialComponents/private/Icons/ic_check (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (17.1.1): + - MaterialComponents/private/Icons/ic_check_circle (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (17.1.1): + - MaterialComponents/private/Icons/ic_chevron_right (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (17.1.1): + - MaterialComponents/private/Icons/ic_info (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (17.1.1): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (17.1.1): + - MaterialComponents/private/Icons/ic_reorder (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/KeyboardWatcher (17.1.1): + - MaterialComponents/private/KeyboardWatcher (17.2.0): - MaterialComponents/private/Application - - MaterialComponents/private/Overlay (17.1.1) - - MaterialComponents/private/RTL (17.1.1) - - MaterialComponents/private/ThumbTrack (17.1.1): + - MaterialComponents/private/Overlay (17.2.0) + - MaterialComponents/private/RTL (17.2.0) + - MaterialComponents/private/ThumbTrack (17.2.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ProgressView (17.1.1): + - MaterialComponents/ProgressView (17.2.0): - MaterialComponents/private/RTL - - MaterialComponents/RobotoFontLoader (17.1.1): + - MaterialComponents/RobotoFontLoader (17.2.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (17.1.1) - - MaterialComponents/ShadowLayer (17.1.1) - - MaterialComponents/Slider (17.1.1): + - MaterialComponents/ShadowElevations (17.2.0) + - MaterialComponents/ShadowLayer (17.2.0) + - MaterialComponents/Slider (17.2.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Snackbar (17.1.1): + - MaterialComponents/Snackbar (17.2.0): - MaterialComponents/AnimationTiming - MaterialComponents/Buttons - MaterialComponents/OverlayWindow @@ -155,16 +155,16 @@ PODS: - MaterialComponents/private/KeyboardWatcher - MaterialComponents/private/Overlay - MaterialComponents/Typography - - MaterialComponents/SpritedAnimationView (17.1.1) - - MaterialComponents/Switch (17.1.1): + - MaterialComponents/SpritedAnimationView (17.2.0) + - MaterialComponents/Switch (17.2.0): - MaterialComponents/Ink - MaterialComponents/private/RTL - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/Typography (17.1.1) - - MaterialComponentsCatalog (17.1.1): + - MaterialComponents/Typography (17.2.0) + - MaterialComponentsCatalog (17.2.0): - MaterialComponents - - MaterialComponentsUnitTests (17.1.1): + - MaterialComponentsUnitTests (17.2.0): - MaterialComponents - MDFTextAccessibility - MDFTextAccessibility (1.1.3) @@ -187,9 +187,9 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275 EarlGrey: c45603e76cda710a29228a790d5139f404b908ea - MaterialComponents: 0bd28ac1305e3e5a31d8f753d025eed1bbad0b1d - MaterialComponentsCatalog: 8a7b315e25a159f4758f009113fc98b690c565f8 - MaterialComponentsUnitTests: f1b0a0ab2aa178523d7d235bf3587356637e6dd9 + MaterialComponents: 432b1d23723d013175e5e0dd638c28adbbe484d3 + MaterialComponentsCatalog: 111ea0f74b8dc6afc4b8346077788ee02585188b + MaterialComponentsUnitTests: 74fb12ec9925b7002a3789eef7a9ca3993910eae MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601 PODFILE CHECKSUM: ffdd1aa8c02b3d6be32f07aabc4648c7b12d107c diff --git a/demos/Bare/Podfile.lock b/demos/Bare/Podfile.lock index 7942eb8f0..c53fd40e2 100644 --- a/demos/Bare/Podfile.lock +++ b/demos/Bare/Podfile.lock @@ -1,38 +1,38 @@ PODS: - - MaterialComponents (17.1.1): - - MaterialComponents/ActivityIndicator (= 17.1.1) - - MaterialComponents/AnimationTiming (= 17.1.1) - - MaterialComponents/AppBar (= 17.1.1) - - MaterialComponents/ButtonBar (= 17.1.1) - - MaterialComponents/Buttons (= 17.1.1) - - MaterialComponents/CollectionCells (= 17.1.1) - - MaterialComponents/CollectionLayoutAttributes (= 17.1.1) - - MaterialComponents/Collections (= 17.1.1) - - MaterialComponents/Dialogs (= 17.1.1) - - MaterialComponents/FeatureHighlight (= 17.1.1) - - MaterialComponents/FlexibleHeader (= 17.1.1) - - MaterialComponents/FontDiskLoader (= 17.1.1) - - MaterialComponents/HeaderStackView (= 17.1.1) - - MaterialComponents/Ink (= 17.1.1) - - MaterialComponents/NavigationBar (= 17.1.1) - - MaterialComponents/OverlayWindow (= 17.1.1) - - MaterialComponents/PageControl (= 17.1.1) - - MaterialComponents/Palettes (= 17.1.1) - - MaterialComponents/private (= 17.1.1) - - MaterialComponents/ProgressView (= 17.1.1) - - MaterialComponents/RobotoFontLoader (= 17.1.1) - - MaterialComponents/ShadowElevations (= 17.1.1) - - MaterialComponents/ShadowLayer (= 17.1.1) - - MaterialComponents/Slider (= 17.1.1) - - MaterialComponents/Snackbar (= 17.1.1) - - MaterialComponents/SpritedAnimationView (= 17.1.1) - - MaterialComponents/Switch (= 17.1.1) - - MaterialComponents/Typography (= 17.1.1) - - MaterialComponents/ActivityIndicator (17.1.1): + - MaterialComponents (17.2.0): + - MaterialComponents/ActivityIndicator (= 17.2.0) + - MaterialComponents/AnimationTiming (= 17.2.0) + - MaterialComponents/AppBar (= 17.2.0) + - MaterialComponents/ButtonBar (= 17.2.0) + - MaterialComponents/Buttons (= 17.2.0) + - MaterialComponents/CollectionCells (= 17.2.0) + - MaterialComponents/CollectionLayoutAttributes (= 17.2.0) + - MaterialComponents/Collections (= 17.2.0) + - MaterialComponents/Dialogs (= 17.2.0) + - MaterialComponents/FeatureHighlight (= 17.2.0) + - MaterialComponents/FlexibleHeader (= 17.2.0) + - MaterialComponents/FontDiskLoader (= 17.2.0) + - MaterialComponents/HeaderStackView (= 17.2.0) + - MaterialComponents/Ink (= 17.2.0) + - MaterialComponents/NavigationBar (= 17.2.0) + - MaterialComponents/OverlayWindow (= 17.2.0) + - MaterialComponents/PageControl (= 17.2.0) + - MaterialComponents/Palettes (= 17.2.0) + - MaterialComponents/private (= 17.2.0) + - MaterialComponents/ProgressView (= 17.2.0) + - MaterialComponents/RobotoFontLoader (= 17.2.0) + - MaterialComponents/ShadowElevations (= 17.2.0) + - MaterialComponents/ShadowLayer (= 17.2.0) + - MaterialComponents/Slider (= 17.2.0) + - MaterialComponents/Snackbar (= 17.2.0) + - MaterialComponents/SpritedAnimationView (= 17.2.0) + - MaterialComponents/Switch (= 17.2.0) + - MaterialComponents/Typography (= 17.2.0) + - MaterialComponents/ActivityIndicator (17.2.0): - MaterialComponents/private/Application - MaterialComponents/private/RTL - - MaterialComponents/AnimationTiming (17.1.1) - - MaterialComponents/AppBar (17.1.1): + - MaterialComponents/AnimationTiming (17.2.0) + - MaterialComponents/AppBar (17.2.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -41,16 +41,16 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (17.1.1): + - MaterialComponents/ButtonBar (17.2.0): - MaterialComponents/Buttons - MaterialComponents/private/RTL - - MaterialComponents/Buttons (17.1.1): + - MaterialComponents/Buttons (17.2.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - MDFTextAccessibility - - MaterialComponents/CollectionCells (17.1.1): + - MaterialComponents/CollectionCells (17.2.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -61,91 +61,91 @@ PODS: - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/private/RTL - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (17.1.1) - - MaterialComponents/Collections (17.1.1): + - MaterialComponents/CollectionLayoutAttributes (17.2.0) + - MaterialComponents/Collections (17.2.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/Dialogs (17.1.1): + - MaterialComponents/Dialogs (17.2.0): - MaterialComponents/Buttons - MaterialComponents/private/KeyboardWatcher - MaterialComponents/private/RTL - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/FeatureHighlight (17.1.1): + - MaterialComponents/FeatureHighlight (17.2.0): - MaterialComponents/Typography - MDFTextAccessibility - - MaterialComponents/FlexibleHeader (17.1.1): + - MaterialComponents/FlexibleHeader (17.2.0): - MaterialComponents/private/Application - MDFTextAccessibility - - MaterialComponents/FontDiskLoader (17.1.1) - - MaterialComponents/HeaderStackView (17.1.1) - - MaterialComponents/Ink (17.1.1) - - MaterialComponents/NavigationBar (17.1.1): + - MaterialComponents/FontDiskLoader (17.2.0) + - MaterialComponents/HeaderStackView (17.2.0) + - MaterialComponents/Ink (17.2.0) + - MaterialComponents/NavigationBar (17.2.0): - MaterialComponents/ButtonBar - MaterialComponents/private/RTL - MaterialComponents/Typography - - MaterialComponents/OverlayWindow (17.1.1): + - MaterialComponents/OverlayWindow (17.2.0): - MaterialComponents/private/Application - - MaterialComponents/PageControl (17.1.1) - - MaterialComponents/Palettes (17.1.1) - - MaterialComponents/private (17.1.1): - - MaterialComponents/private/Application (= 17.1.1) - - MaterialComponents/private/Color (= 17.1.1) - - MaterialComponents/private/Icons (= 17.1.1) - - MaterialComponents/private/KeyboardWatcher (= 17.1.1) - - MaterialComponents/private/Overlay (= 17.1.1) - - MaterialComponents/private/RTL (= 17.1.1) - - MaterialComponents/private/ThumbTrack (= 17.1.1) - - MaterialComponents/private/Application (17.1.1) - - MaterialComponents/private/Color (17.1.1) - - MaterialComponents/private/Icons (17.1.1): - - MaterialComponents/private/Icons/Base (= 17.1.1) - - MaterialComponents/private/Icons/ic_arrow_back (= 17.1.1) - - MaterialComponents/private/Icons/ic_check (= 17.1.1) - - MaterialComponents/private/Icons/ic_check_circle (= 17.1.1) - - MaterialComponents/private/Icons/ic_chevron_right (= 17.1.1) - - MaterialComponents/private/Icons/ic_info (= 17.1.1) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 17.1.1) - - MaterialComponents/private/Icons/ic_reorder (= 17.1.1) - - MaterialComponents/private/Icons/Base (17.1.1) - - MaterialComponents/private/Icons/ic_arrow_back (17.1.1): + - MaterialComponents/PageControl (17.2.0) + - MaterialComponents/Palettes (17.2.0) + - MaterialComponents/private (17.2.0): + - MaterialComponents/private/Application (= 17.2.0) + - MaterialComponents/private/Color (= 17.2.0) + - MaterialComponents/private/Icons (= 17.2.0) + - MaterialComponents/private/KeyboardWatcher (= 17.2.0) + - MaterialComponents/private/Overlay (= 17.2.0) + - MaterialComponents/private/RTL (= 17.2.0) + - MaterialComponents/private/ThumbTrack (= 17.2.0) + - MaterialComponents/private/Application (17.2.0) + - MaterialComponents/private/Color (17.2.0) + - MaterialComponents/private/Icons (17.2.0): + - MaterialComponents/private/Icons/Base (= 17.2.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 17.2.0) + - MaterialComponents/private/Icons/ic_check (= 17.2.0) + - MaterialComponents/private/Icons/ic_check_circle (= 17.2.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 17.2.0) + - MaterialComponents/private/Icons/ic_info (= 17.2.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 17.2.0) + - MaterialComponents/private/Icons/ic_reorder (= 17.2.0) + - MaterialComponents/private/Icons/Base (17.2.0) + - MaterialComponents/private/Icons/ic_arrow_back (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (17.1.1): + - MaterialComponents/private/Icons/ic_check (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (17.1.1): + - MaterialComponents/private/Icons/ic_check_circle (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (17.1.1): + - MaterialComponents/private/Icons/ic_chevron_right (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (17.1.1): + - MaterialComponents/private/Icons/ic_info (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (17.1.1): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (17.1.1): + - MaterialComponents/private/Icons/ic_reorder (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/KeyboardWatcher (17.1.1): + - MaterialComponents/private/KeyboardWatcher (17.2.0): - MaterialComponents/private/Application - - MaterialComponents/private/Overlay (17.1.1) - - MaterialComponents/private/RTL (17.1.1) - - MaterialComponents/private/ThumbTrack (17.1.1): + - MaterialComponents/private/Overlay (17.2.0) + - MaterialComponents/private/RTL (17.2.0) + - MaterialComponents/private/ThumbTrack (17.2.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ProgressView (17.1.1): + - MaterialComponents/ProgressView (17.2.0): - MaterialComponents/private/RTL - - MaterialComponents/RobotoFontLoader (17.1.1): + - MaterialComponents/RobotoFontLoader (17.2.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (17.1.1) - - MaterialComponents/ShadowLayer (17.1.1) - - MaterialComponents/Slider (17.1.1): + - MaterialComponents/ShadowElevations (17.2.0) + - MaterialComponents/ShadowLayer (17.2.0) + - MaterialComponents/Slider (17.2.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Snackbar (17.1.1): + - MaterialComponents/Snackbar (17.2.0): - MaterialComponents/AnimationTiming - MaterialComponents/Buttons - MaterialComponents/OverlayWindow @@ -153,13 +153,13 @@ PODS: - MaterialComponents/private/KeyboardWatcher - MaterialComponents/private/Overlay - MaterialComponents/Typography - - MaterialComponents/SpritedAnimationView (17.1.1) - - MaterialComponents/Switch (17.1.1): + - MaterialComponents/SpritedAnimationView (17.2.0) + - MaterialComponents/Switch (17.2.0): - MaterialComponents/Ink - MaterialComponents/private/RTL - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/Typography (17.1.1) + - MaterialComponents/Typography (17.2.0) - MDFTextAccessibility (1.1.3) DEPENDENCIES: @@ -170,7 +170,7 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - MaterialComponents: 0bd28ac1305e3e5a31d8f753d025eed1bbad0b1d + MaterialComponents: 432b1d23723d013175e5e0dd638c28adbbe484d3 MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601 PODFILE CHECKSUM: 44e7c616a05bb4ce24db557c3de4bfbe915c2f56 diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock index 3386958f0..387f4102e 100644 --- a/demos/Pesto/Podfile.lock +++ b/demos/Pesto/Podfile.lock @@ -1,6 +1,6 @@ PODS: - - MaterialComponents/AnimationTiming (17.1.1) - - MaterialComponents/AppBar (17.1.1): + - MaterialComponents/AnimationTiming (17.2.0) + - MaterialComponents/AppBar (17.2.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -9,16 +9,16 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (17.1.1): + - MaterialComponents/ButtonBar (17.2.0): - MaterialComponents/Buttons - MaterialComponents/private/RTL - - MaterialComponents/Buttons (17.1.1): + - MaterialComponents/Buttons (17.2.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - MDFTextAccessibility - - MaterialComponents/CollectionCells (17.1.1): + - MaterialComponents/CollectionCells (17.2.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -29,48 +29,48 @@ PODS: - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/private/RTL - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (17.1.1) - - MaterialComponents/Collections (17.1.1): + - MaterialComponents/CollectionLayoutAttributes (17.2.0) + - MaterialComponents/Collections (17.2.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (17.1.1): + - MaterialComponents/FlexibleHeader (17.2.0): - MaterialComponents/private/Application - MDFTextAccessibility - - MaterialComponents/FontDiskLoader (17.1.1) - - MaterialComponents/HeaderStackView (17.1.1) - - MaterialComponents/Ink (17.1.1) - - MaterialComponents/NavigationBar (17.1.1): + - MaterialComponents/FontDiskLoader (17.2.0) + - MaterialComponents/HeaderStackView (17.2.0) + - MaterialComponents/Ink (17.2.0) + - MaterialComponents/NavigationBar (17.2.0): - MaterialComponents/ButtonBar - MaterialComponents/private/RTL - MaterialComponents/Typography - - MaterialComponents/private/Application (17.1.1) - - MaterialComponents/private/Icons/Base (17.1.1) - - MaterialComponents/private/Icons/ic_arrow_back (17.1.1): + - MaterialComponents/private/Application (17.2.0) + - MaterialComponents/private/Icons/Base (17.2.0) + - MaterialComponents/private/Icons/ic_arrow_back (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (17.1.1): + - MaterialComponents/private/Icons/ic_check (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (17.1.1): + - MaterialComponents/private/Icons/ic_check_circle (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (17.1.1): + - MaterialComponents/private/Icons/ic_chevron_right (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (17.1.1): + - MaterialComponents/private/Icons/ic_info (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (17.1.1): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (17.1.1): + - MaterialComponents/private/Icons/ic_reorder (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/RTL (17.1.1) - - MaterialComponents/RobotoFontLoader (17.1.1): + - MaterialComponents/private/RTL (17.2.0) + - MaterialComponents/RobotoFontLoader (17.2.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (17.1.1) - - MaterialComponents/ShadowLayer (17.1.1) - - MaterialComponents/SpritedAnimationView (17.1.1) - - MaterialComponents/Typography (17.1.1) + - MaterialComponents/ShadowElevations (17.2.0) + - MaterialComponents/ShadowLayer (17.2.0) + - MaterialComponents/SpritedAnimationView (17.2.0) + - MaterialComponents/Typography (17.2.0) - MDFTextAccessibility (1.1.3) DEPENDENCIES: @@ -90,7 +90,7 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - MaterialComponents: 0bd28ac1305e3e5a31d8f753d025eed1bbad0b1d + MaterialComponents: 432b1d23723d013175e5e0dd638c28adbbe484d3 MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601 PODFILE CHECKSUM: 5fb11f20fd57ca970cc72aa501b3ee3e360a9f23 diff --git a/demos/Shrine/Podfile.lock b/demos/Shrine/Podfile.lock index aa7ae5bfc..d30189a3a 100644 --- a/demos/Shrine/Podfile.lock +++ b/demos/Shrine/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - MaterialComponents/AppBar (17.1.1): + - MaterialComponents/AppBar (17.2.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -8,35 +8,35 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (17.1.1): + - MaterialComponents/ButtonBar (17.2.0): - MaterialComponents/Buttons - MaterialComponents/private/RTL - - MaterialComponents/Buttons (17.1.1): + - MaterialComponents/Buttons (17.2.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - MDFTextAccessibility - - MaterialComponents/FlexibleHeader (17.1.1): + - MaterialComponents/FlexibleHeader (17.2.0): - MaterialComponents/private/Application - MDFTextAccessibility - - MaterialComponents/HeaderStackView (17.1.1) - - MaterialComponents/Ink (17.1.1) - - MaterialComponents/NavigationBar (17.1.1): + - MaterialComponents/HeaderStackView (17.2.0) + - MaterialComponents/Ink (17.2.0) + - MaterialComponents/NavigationBar (17.2.0): - MaterialComponents/ButtonBar - MaterialComponents/private/RTL - MaterialComponents/Typography - - MaterialComponents/PageControl (17.1.1) - - MaterialComponents/private/Application (17.1.1) - - MaterialComponents/private/Icons/Base (17.1.1) - - MaterialComponents/private/Icons/ic_arrow_back (17.1.1): + - MaterialComponents/PageControl (17.2.0) + - MaterialComponents/private/Application (17.2.0) + - MaterialComponents/private/Icons/Base (17.2.0) + - MaterialComponents/private/Icons/ic_arrow_back (17.2.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/RTL (17.1.1) - - MaterialComponents/ShadowElevations (17.1.1) - - MaterialComponents/ShadowLayer (17.1.1) - - MaterialComponents/Typography (17.1.1) + - MaterialComponents/private/RTL (17.2.0) + - MaterialComponents/ShadowElevations (17.2.0) + - MaterialComponents/ShadowLayer (17.2.0) + - MaterialComponents/Typography (17.2.0) - MDFTextAccessibility (1.1.3) - - RemoteImageServiceForMDCDemos (17.1.1) + - RemoteImageServiceForMDCDemos (17.2.0) DEPENDENCIES: - MaterialComponents/AppBar (from `../../`) @@ -50,9 +50,9 @@ EXTERNAL SOURCES: :path: "../supplemental" SPEC CHECKSUMS: - MaterialComponents: 0bd28ac1305e3e5a31d8f753d025eed1bbad0b1d + MaterialComponents: 432b1d23723d013175e5e0dd638c28adbbe484d3 MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601 - RemoteImageServiceForMDCDemos: cc158fa6b8cbd644e896ea4301fc2644738b8046 + RemoteImageServiceForMDCDemos: 0a593ab2c0219a7b75c74c2549c812f050a70ff1 PODFILE CHECKSUM: 5eb94d7fb8deeb6709b7300f5d0e0e1a75902cca diff --git a/demos/supplemental/RemoteImageServiceForMDCDemos.podspec b/demos/supplemental/RemoteImageServiceForMDCDemos.podspec index e5d795641..adcc06347 100644 --- a/demos/supplemental/RemoteImageServiceForMDCDemos.podspec +++ b/demos/supplemental/RemoteImageServiceForMDCDemos.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RemoteImageServiceForMDCDemos" - s.version = "17.1.1" + s.version = "17.2.0" 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" From ca0fa682082e87ad94bef99f2b01a6c092cfa60d Mon Sep 17 00:00:00 2001 From: Sam Morrison Date: Thu, 8 Dec 2016 12:08:36 -0500 Subject: [PATCH 12/13] Replace containsString with rangeOfString (#981) --- .../private/Application/src/UIApplication+AppExtensions.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/private/Application/src/UIApplication+AppExtensions.m b/components/private/Application/src/UIApplication+AppExtensions.m index d3e38adda..988aebb87 100644 --- a/components/private/Application/src/UIApplication+AppExtensions.m +++ b/components/private/Application/src/UIApplication+AppExtensions.m @@ -34,7 +34,8 @@ static BOOL isAppExtension; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - isAppExtension = [[[NSBundle mainBundle] executablePath] containsString:@".appex/"]; + isAppExtension = + [[[NSBundle mainBundle] executablePath] rangeOfString:@".appex/"].location != NSNotFound; }); return isAppExtension; } From f3013cd99d081aa5bcf63289f5caae96b6fd2afc Mon Sep 17 00:00:00 2001 From: Adrian Secord Date: Thu, 8 Dec 2016 13:42:21 -0500 Subject: [PATCH 13/13] Added release version to CHANGELOG.md. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae17fcc50..15108fc80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# release-candidate TODO: Replace me with version number. +# 17.2.0 ## API Changes