Skip to content
This repository was archived by the owner on Dec 11, 2025. It is now read-only.

Commit c821b1f

Browse files
randalllirandallli
committed
Merge branch 'hotfix-2.0.2'
2 parents 9a98e46 + f75d9a2 commit c821b1f

18 files changed

+123
-114
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66

77
##### Bug Fixes
88

9+
## 2.0.2
10+
11+
##### Breaking
12+
13+
##### Enhancements
14+
* Renamed the Private folders to privateWasCapitalPrivate.
15+
16+
##### Bug Fixes
17+
918
## 2.0.1
1019

1120
##### Breaking

‎MaterialComponents.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MaterialComponents"
3-
s.version = "2.0.1"
3+
s.version = "2.0.2"
44
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
55
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
66
s.homepage = "https://github.com/google/material-components-ios"
@@ -40,7 +40,7 @@ Pod::Spec.new do |s|
4040

4141
s.subspec 'Buttons' do |ss|
4242
ss.public_header_files = 'components/Buttons/src/*.h'
43-
ss.source_files = 'components/Buttons/src/*.{h,m}', 'components/Buttons/src/Private/*.{h,m}'
43+
ss.source_files = 'components/Buttons/src/*.{h,m}', 'components/Buttons/src/privateWasCapitalPrivate/*.{h,m}'
4444
ss.header_mappings_dir = 'components/Buttons/src/*'
4545
ss.dependency 'MaterialComponents/Ink'
4646
ss.dependency 'MaterialComponents/ShadowElevations'
@@ -118,7 +118,7 @@ Pod::Spec.new do |s|
118118

119119
s.subspec 'Typography' do |ss|
120120
ss.public_header_files = 'components/Typography/src/*.h'
121-
ss.source_files = 'components/Typography/src/*.{h,m}', 'components/Typography/src/Private/*.{h,m}'
121+
ss.source_files = 'components/Typography/src/*.{h,m}', 'components/Typography/src/privateWasCapitalPrivate/*.{h,m}'
122122
ss.header_mappings_dir = 'components/Typography/src/*'
123123
ss.framework = 'CoreText'
124124

‎MaterialComponentsCatalog.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MaterialComponentsCatalog"
3-
s.version = "2.0.1"
3+
s.version = "2.0.2"
44
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
55
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
66
s.homepage = "https://github.com/google/material-components-ios"

‎MaterialComponentsUnitTests.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MaterialComponentsUnitTests"
3-
s.version = "2.0.1"
3+
s.version = "2.0.2"
44
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
55
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
66
s.homepage = "https://github.com/google/material-components-ios"

‎catalog/Podfile.lock‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
PODS:
2-
- MaterialComponents (2.0.1):
3-
- MaterialComponents/Buttons (= 2.0.1)
4-
- MaterialComponents/FlexibleHeader (= 2.0.1)
5-
- MaterialComponents/HeaderStackView (= 2.0.1)
6-
- MaterialComponents/Ink (= 2.0.1)
7-
- MaterialComponents/PageControl (= 2.0.1)
8-
- MaterialComponents/private (= 2.0.1)
9-
- MaterialComponents/ScrollViewDelegateMultiplexer (= 2.0.1)
10-
- MaterialComponents/ShadowElevations (= 2.0.1)
11-
- MaterialComponents/ShadowLayer (= 2.0.1)
12-
- MaterialComponents/Slider (= 2.0.1)
13-
- MaterialComponents/SpritedAnimationView (= 2.0.1)
14-
- MaterialComponents/Switch (= 2.0.1)
15-
- MaterialComponents/Typography (= 2.0.1)
16-
- MaterialComponents/Buttons (2.0.1):
2+
- MaterialComponents (2.0.2):
3+
- MaterialComponents/Buttons (= 2.0.2)
4+
- MaterialComponents/FlexibleHeader (= 2.0.2)
5+
- MaterialComponents/HeaderStackView (= 2.0.2)
6+
- MaterialComponents/Ink (= 2.0.2)
7+
- MaterialComponents/PageControl (= 2.0.2)
8+
- MaterialComponents/private (= 2.0.2)
9+
- MaterialComponents/ScrollViewDelegateMultiplexer (= 2.0.2)
10+
- MaterialComponents/ShadowElevations (= 2.0.2)
11+
- MaterialComponents/ShadowLayer (= 2.0.2)
12+
- MaterialComponents/Slider (= 2.0.2)
13+
- MaterialComponents/SpritedAnimationView (= 2.0.2)
14+
- MaterialComponents/Switch (= 2.0.2)
15+
- MaterialComponents/Typography (= 2.0.2)
16+
- MaterialComponents/Buttons (2.0.2):
1717
- MaterialComponents/Ink
1818
- MaterialComponents/ShadowElevations
1919
- MaterialComponents/ShadowLayer
2020
- MaterialComponents/Typography
21-
- MaterialComponents/FlexibleHeader (2.0.1)
22-
- MaterialComponents/HeaderStackView (2.0.1)
23-
- MaterialComponents/Ink (2.0.1)
24-
- MaterialComponents/PageControl (2.0.1)
25-
- MaterialComponents/private (2.0.1):
26-
- MaterialComponents/private/Color (= 2.0.1)
27-
- MaterialComponents/private/ThumbTrack (= 2.0.1)
28-
- MaterialComponents/private/Color (2.0.1)
29-
- MaterialComponents/private/ThumbTrack (2.0.1):
21+
- MaterialComponents/FlexibleHeader (2.0.2)
22+
- MaterialComponents/HeaderStackView (2.0.2)
23+
- MaterialComponents/Ink (2.0.2)
24+
- MaterialComponents/PageControl (2.0.2)
25+
- MaterialComponents/private (2.0.2):
26+
- MaterialComponents/private/Color (= 2.0.2)
27+
- MaterialComponents/private/ThumbTrack (= 2.0.2)
28+
- MaterialComponents/private/Color (2.0.2)
29+
- MaterialComponents/private/ThumbTrack (2.0.2):
3030
- MaterialComponents/private/Color
3131
- MaterialComponents/ShadowElevations
3232
- MaterialComponents/ShadowLayer
33-
- MaterialComponents/ScrollViewDelegateMultiplexer (2.0.1)
34-
- MaterialComponents/ShadowElevations (2.0.1)
35-
- MaterialComponents/ShadowLayer (2.0.1)
36-
- MaterialComponents/Slider (2.0.1):
33+
- MaterialComponents/ScrollViewDelegateMultiplexer (2.0.2)
34+
- MaterialComponents/ShadowElevations (2.0.2)
35+
- MaterialComponents/ShadowLayer (2.0.2)
36+
- MaterialComponents/Slider (2.0.2):
3737
- MaterialComponents/private/ThumbTrack
38-
- MaterialComponents/SpritedAnimationView (2.0.1)
39-
- MaterialComponents/Switch (2.0.1):
38+
- MaterialComponents/SpritedAnimationView (2.0.2)
39+
- MaterialComponents/Switch (2.0.2):
4040
- MaterialComponents/private/ThumbTrack
41-
- MaterialComponents/Typography (2.0.1)
42-
- MaterialComponentsCatalog (2.0.1):
41+
- MaterialComponents/Typography (2.0.2)
42+
- MaterialComponentsCatalog (2.0.2):
4343
- MaterialComponents
44-
- MaterialComponentsUnitTests (2.0.1):
44+
- MaterialComponentsUnitTests (2.0.2):
4545
- MaterialComponents
4646

4747
DEPENDENCIES:
@@ -58,8 +58,8 @@ EXTERNAL SOURCES:
5858
:path: ../
5959

6060
SPEC CHECKSUMS:
61-
MaterialComponents: d207aac00eb66c26e023f208fa2849b1e3f8f0d4
62-
MaterialComponentsCatalog: 9bb461b2496db894e753edc88961901a76c401b3
63-
MaterialComponentsUnitTests: 835b1b393901aeb90cc45fb7606fe7b0f3eda10c
61+
MaterialComponents: 9d854282d525f91e7419845561d1e37be627eb29
62+
MaterialComponentsCatalog: 4f3484c5de7b62bc6795bb9c1d7c420c408eff47
63+
MaterialComponentsUnitTests: acb10bb4d58a1cf2d96a37d1ae95a0421b365806
6464

6565
COCOAPODS: 0.39.0

‎components/Buttons/src/MDCButton.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#import "MaterialShadowElevations.h"
2525
#import "MaterialShadowLayer.h"
2626
#import "MaterialTypography.h"
27-
#import "Private/MDCButton+Subclassing.h"
27+
#import "privateWasCapitalPrivate/MDCButton+Subclassing.h"
2828

2929
// TODO(ajsecord): Animate title color when animating between enabled/disabled states.
3030
// Non-trivial: http://corecocoa.wordpress.com/2011/10/04/animatable-text-color-of-uilabel/

‎components/Buttons/src/MDCFlatButton.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#import "MDCFlatButton.h"
2222

23-
#import "Private/MDCButton+Subclassing.h"
23+
#import "privateWasCapitalPrivate/MDCButton+Subclassing.h"
2424

2525
static NSString *const MDCFlatButtonHasOpaqueBackground = @"MDCFlatButtonHasOpaqueBackground";
2626

‎components/Buttons/src/MDCFloatingButton.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#import "MDCFloatingButton.h"
2222

23-
#import "Private/MDCButton+Subclassing.h"
23+
#import "privateWasCapitalPrivate/MDCButton+Subclassing.h"
2424
#import "MaterialShadowElevations.h"
2525

2626
static const CGFloat MDCFloatingButtonDefaultDimension = 56.0f;

‎components/Buttons/src/MDCRaisedButton.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#import "MDCRaisedButton.h"
2222

23-
#import "Private/MDCButton+Subclassing.h"
23+
#import "privateWasCapitalPrivate/MDCButton+Subclassing.h"
2424
#import "MaterialShadowElevations.h"
2525

2626
@implementation MDCRaisedButton

components/Buttons/src/Private/MDCButton+Subclassing.h renamed to components/Buttons/src/privateWasCapitalPrivate/MDCButton+Subclassing.h

File renamed without changes.

0 commit comments

Comments
 (0)