From 3a16dbe620eda93b55fd3ab3ce8e17a5e54a650e Mon Sep 17 00:00:00 2001 From: randallli Date: Thu, 17 Mar 2016 01:50:08 -0400 Subject: [PATCH 1/2] Renamed references of privateWasCapitalPrivate to private Reviewers: ajsecord, #mdc_ios_owners, featherless Reviewed By: #mdc_ios_owners, featherless Projects: #material_components_ios Differential Revision: http://codereview.cc/D285 --- MaterialComponents.podspec | 4 ++-- catalog/Podfile.lock | 2 +- components/Buttons/src/MDCButton.m | 2 +- components/Buttons/src/MDCFlatButton.m | 2 +- components/Buttons/src/MDCFloatingButton.m | 2 +- components/Buttons/src/MDCRaisedButton.m | 2 +- .../MDCButton+Subclassing.h | 0 components/Typography/src/MDCRobotoFontLoader.m | 2 +- components/Typography/src/MDCTypography.m | 2 +- .../MDCTypography+Constants.h | 0 .../MDCTypography+Constants.m | 2 +- components/Typography/tests/unit/MDCFontResourceTests.m | 2 +- components/Typography/tests/unit/MDCRobotoFontLoaderTests.m | 2 +- demos/Pesto/Podfile.lock | 2 +- demos/Shrine/Podfile.lock | 2 +- 15 files changed, 14 insertions(+), 14 deletions(-) rename components/Buttons/src/{privateWasCapitalPrivate => private}/MDCButton+Subclassing.h (100%) rename components/Typography/src/{privateWasCapitalPrivate => private}/MDCTypography+Constants.h (100%) rename components/Typography/src/{privateWasCapitalPrivate => private}/MDCTypography+Constants.m (97%) diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec index d0344acf9d5..0c05a6836be 100644 --- a/MaterialComponents.podspec +++ b/MaterialComponents.podspec @@ -40,7 +40,7 @@ Pod::Spec.new do |s| s.subspec 'Buttons' do |ss| ss.public_header_files = 'components/Buttons/src/*.h' - ss.source_files = 'components/Buttons/src/*.{h,m}', 'components/Buttons/src/privateWasCapitalPrivate/*.{h,m}' + ss.source_files = 'components/Buttons/src/*.{h,m}', 'components/Buttons/src/private/*.{h,m}' ss.header_mappings_dir = 'components/Buttons/src/*' ss.dependency 'MaterialComponents/Ink' ss.dependency 'MaterialComponents/ShadowElevations' @@ -118,7 +118,7 @@ Pod::Spec.new do |s| s.subspec 'Typography' do |ss| ss.public_header_files = 'components/Typography/src/*.h' - ss.source_files = 'components/Typography/src/*.{h,m}', 'components/Typography/src/privateWasCapitalPrivate/*.{h,m}' + ss.source_files = 'components/Typography/src/*.{h,m}', 'components/Typography/src/Private/*.{h,m}' ss.header_mappings_dir = 'components/Typography/src/*' ss.framework = 'CoreText' diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock index 4c20b6faee5..66619c085ef 100644 --- a/catalog/Podfile.lock +++ b/catalog/Podfile.lock @@ -58,7 +58,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - MaterialComponents: 9d854282d525f91e7419845561d1e37be627eb29 + MaterialComponents: cde11be06370c3c0422c182b0cf83ebe1a3fb158 MaterialComponentsCatalog: 4f3484c5de7b62bc6795bb9c1d7c420c408eff47 MaterialComponentsUnitTests: acb10bb4d58a1cf2d96a37d1ae95a0421b365806 diff --git a/components/Buttons/src/MDCButton.m b/components/Buttons/src/MDCButton.m index 07d7313203b..4d96989802b 100644 --- a/components/Buttons/src/MDCButton.m +++ b/components/Buttons/src/MDCButton.m @@ -24,7 +24,7 @@ #import "MaterialShadowElevations.h" #import "MaterialShadowLayer.h" #import "MaterialTypography.h" -#import "privateWasCapitalPrivate/MDCButton+Subclassing.h" +#import "private/MDCButton+Subclassing.h" // TODO(ajsecord): Animate title color when animating between enabled/disabled states. // Non-trivial: http://corecocoa.wordpress.com/2011/10/04/animatable-text-color-of-uilabel/ diff --git a/components/Buttons/src/MDCFlatButton.m b/components/Buttons/src/MDCFlatButton.m index 562501ff090..f1b4d60166e 100644 --- a/components/Buttons/src/MDCFlatButton.m +++ b/components/Buttons/src/MDCFlatButton.m @@ -20,7 +20,7 @@ #import "MDCFlatButton.h" -#import "privateWasCapitalPrivate/MDCButton+Subclassing.h" +#import "private/MDCButton+Subclassing.h" static NSString *const MDCFlatButtonHasOpaqueBackground = @"MDCFlatButtonHasOpaqueBackground"; diff --git a/components/Buttons/src/MDCFloatingButton.m b/components/Buttons/src/MDCFloatingButton.m index 63e4538c8fa..a8cd7d36922 100644 --- a/components/Buttons/src/MDCFloatingButton.m +++ b/components/Buttons/src/MDCFloatingButton.m @@ -20,7 +20,7 @@ #import "MDCFloatingButton.h" -#import "privateWasCapitalPrivate/MDCButton+Subclassing.h" +#import "private/MDCButton+Subclassing.h" #import "MaterialShadowElevations.h" static const CGFloat MDCFloatingButtonDefaultDimension = 56.0f; diff --git a/components/Buttons/src/MDCRaisedButton.m b/components/Buttons/src/MDCRaisedButton.m index 05cbb650dcb..411f81eb595 100644 --- a/components/Buttons/src/MDCRaisedButton.m +++ b/components/Buttons/src/MDCRaisedButton.m @@ -20,7 +20,7 @@ #import "MDCRaisedButton.h" -#import "privateWasCapitalPrivate/MDCButton+Subclassing.h" +#import "private/MDCButton+Subclassing.h" #import "MaterialShadowElevations.h" @implementation MDCRaisedButton diff --git a/components/Buttons/src/privateWasCapitalPrivate/MDCButton+Subclassing.h b/components/Buttons/src/private/MDCButton+Subclassing.h similarity index 100% rename from components/Buttons/src/privateWasCapitalPrivate/MDCButton+Subclassing.h rename to components/Buttons/src/private/MDCButton+Subclassing.h diff --git a/components/Typography/src/MDCRobotoFontLoader.m b/components/Typography/src/MDCRobotoFontLoader.m index cf3ae283afb..181d21edff2 100644 --- a/components/Typography/src/MDCRobotoFontLoader.m +++ b/components/Typography/src/MDCRobotoFontLoader.m @@ -17,7 +17,7 @@ #import "MDCRobotoFontLoader.h" #import "MDCFontResource.h" -#import "privateWasCapitalPrivate/MDCTypography+Constants.h" +#import "private/MDCTypography+Constants.h" @interface MDCRobotoFontLoader () @property(nonatomic, strong) MDCFontResource *lightFontResource; diff --git a/components/Typography/src/MDCTypography.m b/components/Typography/src/MDCTypography.m index d6773e07cb9..f4b271dc541 100644 --- a/components/Typography/src/MDCTypography.m +++ b/components/Typography/src/MDCTypography.m @@ -20,7 +20,7 @@ #import "MDCRobotoFontLoader.h" #import "MDCTypography.h" -#import "privateWasCapitalPrivate/MDCTypography+Constants.h" +#import "private/MDCTypography+Constants.h" static id sFontLoader = nil; diff --git a/components/Typography/src/privateWasCapitalPrivate/MDCTypography+Constants.h b/components/Typography/src/private/MDCTypography+Constants.h similarity index 100% rename from components/Typography/src/privateWasCapitalPrivate/MDCTypography+Constants.h rename to components/Typography/src/private/MDCTypography+Constants.h diff --git a/components/Typography/src/privateWasCapitalPrivate/MDCTypography+Constants.m b/components/Typography/src/private/MDCTypography+Constants.m similarity index 97% rename from components/Typography/src/privateWasCapitalPrivate/MDCTypography+Constants.m rename to components/Typography/src/private/MDCTypography+Constants.m index d385ea4f1b5..140541d1cd5 100644 --- a/components/Typography/src/privateWasCapitalPrivate/MDCTypography+Constants.m +++ b/components/Typography/src/private/MDCTypography+Constants.m @@ -14,7 +14,7 @@ limitations under the License. */ -#import "privateWasCapitalPrivate/MDCTypography+Constants.h" +#import "private/MDCTypography+Constants.h" #ifndef GOOGLEKIT_QUANTUM_TYPOGRAPHY_BUNDLE #define GOOGLEKIT_QUANTUM_TYPOGRAPHY_BUNDLE @"MaterialTypography.bundle" diff --git a/components/Typography/tests/unit/MDCFontResourceTests.m b/components/Typography/tests/unit/MDCFontResourceTests.m index 36823b9310f..206cfe1f1b9 100644 --- a/components/Typography/tests/unit/MDCFontResourceTests.m +++ b/components/Typography/tests/unit/MDCFontResourceTests.m @@ -18,7 +18,7 @@ #import "MDCFontResource.h" #import "MDCRobotoFontLoader.h" -#import "privateWasCapitalPrivate/MDCTypography+Constants.h" +#import "private/MDCTypography+Constants.h" static const CGFloat kEpsilonAccuracy = 0.001f; diff --git a/components/Typography/tests/unit/MDCRobotoFontLoaderTests.m b/components/Typography/tests/unit/MDCRobotoFontLoaderTests.m index 015a16ac24b..3e73fcc6108 100644 --- a/components/Typography/tests/unit/MDCRobotoFontLoaderTests.m +++ b/components/Typography/tests/unit/MDCRobotoFontLoaderTests.m @@ -18,7 +18,7 @@ #import "MDCFontResource.h" #import "MDCRobotoFontLoader.h" -#import "privateWasCapitalPrivate/MDCTypography+Constants.h" +#import "private/MDCTypography+Constants.h" static const CGFloat kEpsilonAccuracy = 0.001f; diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock index 4c36a602eec..8c2c4333758 100644 --- a/demos/Pesto/Podfile.lock +++ b/demos/Pesto/Podfile.lock @@ -48,6 +48,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: 9d854282d525f91e7419845561d1e37be627eb29 + MaterialComponents: cde11be06370c3c0422c182b0cf83ebe1a3fb158 COCOAPODS: 0.39.0 diff --git a/demos/Shrine/Podfile.lock b/demos/Shrine/Podfile.lock index 4c36a602eec..8c2c4333758 100644 --- a/demos/Shrine/Podfile.lock +++ b/demos/Shrine/Podfile.lock @@ -48,6 +48,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: 9d854282d525f91e7419845561d1e37be627eb29 + MaterialComponents: cde11be06370c3c0422c182b0cf83ebe1a3fb158 COCOAPODS: 0.39.0 From d1630da81ef1e7cafdbf97cb40ea72a0a4286281 Mon Sep 17 00:00:00 2001 From: randallli Date: Thu, 17 Mar 2016 10:48:04 -0400 Subject: [PATCH 2/2] bump version to 2.0.3 Reviewers: #mdc_ios_owners, ajsecord, featherless Reviewed By: #mdc_ios_owners, ajsecord, featherless Subscribers: featherless Projects: #material_components_ios Differential Revision: http://codereview.cc/D284 --- CHANGELOG.md | 9 +++++++++ MaterialComponents.podspec | 2 +- MaterialComponentsCatalog.podspec | 2 +- MaterialComponentsUnitTests.podspec | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6f6306bcf5..fe2bfb1bbd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ ##### Breaking +##### Enhancements + * Renamed the privateWasCapitalPrivate folders to private. + +##### Bug Fixes + +## 2.0.3 + +##### Breaking + ##### Enhancements ##### Bug Fixes diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec index 0c05a6836be..a7e50cb2235 100644 --- a/MaterialComponents.podspec +++ b/MaterialComponents.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponents" - s.version = "2.0.2" + s.version = "2.0.3" 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 b9262a063e3..bfe30b0be81 100644 --- a/MaterialComponentsCatalog.podspec +++ b/MaterialComponentsCatalog.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsCatalog" - s.version = "2.0.2" + s.version = "2.0.3" 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 ffc2431a8bc..2425d789a00 100644 --- a/MaterialComponentsUnitTests.podspec +++ b/MaterialComponentsUnitTests.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsUnitTests" - s.version = "2.0.2" + s.version = "2.0.3" 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"