Skip to content

Commit d1e70a4

Browse files
committed
Merge branch 'release-candidate' into stable
2 parents c3cec9d + 43fad8d commit d1e70a4

File tree

108 files changed

+148
-4670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+148
-4670
lines changed

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
# 124.0.0
2+
3+
In this release `MDCTextField` and its associated classes and protocols are deprecated. We also deleted the Pesto example application and cleaned up pre iOS 12 checks in the library.
4+
5+
## Breaking changes
6+
7+
`MDCTextField` and its associated classes and protocols are deprecated.
8+
9+
## API changes
10+
11+
* All classes and protocols under in the `components/TextFields` folder are now deprecated.
12+
13+
## Component changes
14+
15+
### TextFields
16+
17+
* [Deprecate MDCTextField and its associated classes/protocols](https://github.com/material-components/material-components-ios/commit/a29eb2c3c7408a891dadca4613e97ddc67bdbbf5) (Andrew Overton)
18+
19+
## Multi-component changes
20+
21+
* [Internal change](https://github.com/material-components/material-components-ios/commit/b64b0ec23150deef32205c38b0a274171639644b) (Jeff Verkoeyen)
22+
23+
---
24+
125
# 123.0.0
226

327
In this major release we have made the MDCBottomNavigationBarController class and its APIs only be available from iOS 12 and up.

MaterialComponents.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
22

33
Pod::Spec.new do |mdc|
44
mdc.name = "MaterialComponents"
5-
mdc.version = "123.0.0"
5+
mdc.version = "124.0.0"
66
mdc.authors = "The Material Components authors."
77
mdc.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
88
mdc.homepage = "https://github.com/material-components/material-components-ios"

MaterialComponentsEarlGreyTests.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 = "MaterialComponentsEarlGreyTests"
3-
s.version = "123.0.0"
3+
s.version = "124.0.0"
44
s.authors = "The Material Components authors."
55
s.summary = "This spec is an aggregate of all the Material Components EarlGrey tests."
66
s.description = "This spec is made for use in the MDC Catalog."

MaterialComponentsExamples.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 = "MaterialComponentsExamples"
3-
s.version = "123.0.0"
3+
s.version = "124.0.0"
44
s.authors = "The Material Components authors."
55
s.summary = "This spec is an aggregate of all the Material Components examples."
66
s.description = "This spec is made for use in the MDC Catalog. Used in conjunction with CatalogByConvention we create our Material Catalog."

MaterialComponentsSnapshotTests.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ end
5353

5454
Pod::Spec.new do |s|
5555
s.name = "MaterialComponentsSnapshotTests"
56-
s.version = "123.0.0"
56+
s.version = "124.0.0"
5757
s.authors = "The Material Components authors."
5858
s.summary = "This spec is an aggregate of all the Material Components snapshot tests."
5959
s.homepage = "https://github.com/material-components/material-components-ios"

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
123.0.0
1+
124.0.0

catalog/MDCCatalog/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>123.0.0</string>
18+
<string>124.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>123.0.0</string>
22+
<string>124.0.0</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>UIAppFonts</key>

catalog/MDCDragons/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>123.0.0</string>
18+
<string>124.0.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>123.0.0</string>
20+
<string>124.0.0</string>
2121
<key>LSRequiresIPhoneOS</key>
2222
<true/>
2323
<key>UILaunchStoryboardName</key>

catalog/MaterialCatalog/MaterialCatalog.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 = "MaterialCatalog"
3-
s.version = "123.0.0"
3+
s.version = "124.0.0"
44
s.summary = "Helper Objective-C classes for the MDC catalog."
55
s.description = "This spec is made for use in the MDC Catalog."
66
s.homepage = "https://github.com/material-components/material-components-ios"

components/FeatureHighlight/src/MDCFeatureHighlightViewController.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@ - (void)viewDidLoad {
6565
UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
6666
self.featureHighlightView.mdc_adjustsFontForContentSizeCategory =
6767
_mdc_adjustsFontForContentSizeCategory;
68-
if (@available(iOS 10.0, *)) {
69-
self.featureHighlightView.adjustsFontForContentSizeCategory =
70-
_adjustsFontForContentSizeCategory;
71-
}
68+
self.featureHighlightView.adjustsFontForContentSizeCategory = _adjustsFontForContentSizeCategory;
7269
self.featureHighlightView.mdc_legacyFontScaling = _mdc_legacyFontScaling;
7370

7471
__weak MDCFeatureHighlightViewController *weakSelf = self;

0 commit comments

Comments
 (0)