Merge branch 'hotfix-2.0.3'

material-components · Mar 17, 2016 · 14081da · 14081da
2 parents c821b1f + d1630da
commit 14081da
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 17 deletions.
diff --git 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
@@ -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"
@@ -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/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
@@ -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"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...WasCapitalPrivate/MDCButton+Subclassing.h → ...ttons/src/private/MDCButton+Subclassing.h b/...WasCapitalPrivate/MDCButton+Subclassing.h → ...ttons/src/private/MDCButton+Subclassing.h
diff --git 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
@@ -20,7 +20,7 @@
 
 #import "MDCRobotoFontLoader.h"
 #import "MDCTypography.h"
-#import "privateWasCapitalPrivate/MDCTypography+Constants.h"
+#import "private/MDCTypography+Constants.h"
 
 static id<MDCTypographyFontLoader> sFontLoader = nil;
 

diff --git a/...sCapitalPrivate/MDCTypography+Constants.h → ...phy/src/private/MDCTypography+Constants.h b/...sCapitalPrivate/MDCTypography+Constants.h → ...phy/src/private/MDCTypography+Constants.h
diff --git a/...sCapitalPrivate/MDCTypography+Constants.m → ...phy/src/private/MDCTypography+Constants.m b/...sCapitalPrivate/MDCTypography+Constants.m → ...phy/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
@@ -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
@@ -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
@@ -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
@@ -48,6 +48,6 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  MaterialComponents: 9d854282d525f91e7419845561d1e37be627eb29
+  MaterialComponents: cde11be06370c3c0422c182b0cf83ebe1a3fb158
 
 COCOAPODS: 0.39.0