Skip to content

Commit

Permalink
Merge branch 'release-candidate' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Verkoeyen committed Dec 20, 2017
2 parents c63eeaf + 69ee8b8 commit bd3eb3e
Show file tree
Hide file tree
Showing 11 changed files with 160 additions and 10 deletions.
150 changes: 150 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,153 @@
# 43.1.0

## API changes

### Buttons

#### MDCButton

*new* method: `-setTitleFont:forState:` in `MDCButton`

*new* method: `-titleFontForState:` in `MDCButton`

### FeatureHighlight

#### MDCFeatureHighlightView

*new* property: `bodyFont` in `MDCFeatureHighlightView`

*new* property: `titleFont` in `MDCFeatureHighlightView`

## Component changes

### ActivityIndicator

#### Changes

* [[kokoro] Add :ColorThemer targets (#2712)](https://github.com/material-components/material-components-ios/commit/d2e028f3886596f7fa6b2400418dc6140a2d4174) (Robert Moore)

### AppBar

#### Changes

* [Add BUILD file (#2699)](https://github.com/material-components/material-components-ios/commit/6469c85b04b61eb21a83610f51b2f9aad11a2fb2) (Robert Moore)

### BottomAppBar

#### Changes

* [Add BUILD file and no-op test (#2700)](https://github.com/material-components/material-components-ios/commit/60c4e169c21b3e9594133c6beb69bf089aabeb07) (Robert Moore)

### BottomNavigation

#### Changes

* [Add BUILD file and no-op test (#2703)](https://github.com/material-components/material-components-ios/commit/c478173606fff7ed6e2927abd8577032f18dbfc7) (Robert Moore)

### ButtonBar

#### Changes

* [[NavBar, ButtonBar] Add NavBar tests, fix ButtonBar KVO (#2713)](https://github.com/material-components/material-components-ios/commit/8f1eb74490f3641ff7edf4608fb16698aaebdf93) (Robert Moore)

### Buttons

#### Changes

* [Add a custom font property (#2715)](https://github.com/material-components/material-components-ios/commit/4befe61f74f42a20bb9667a6c3c50975753ad0d7) (ianegordon)

### Chips

#### Changes

* [Add BUILD file and no-op test (#2706)](https://github.com/material-components/material-components-ios/commit/ef3f7d103b78bd00d6fc17f746b079de20a3ef4a) (Robert Moore)
* [Fix sizeToFit sometimes being too small (#2719)](https://github.com/material-components/material-components-ios/commit/3cc1a7a6c542d3153aa74778933beb6bcfaf8875) (Sam Morrison)
* [Use new layer border properties (#2717)](https://github.com/material-components/material-components-ios/commit/723f8c798e322e503004b822f0a9969976c5be66) (Sam Morrison)
* [[Ink] Add updated ink to chips, update ink animation when bounds change (#2545)](https://github.com/material-components/material-components-ios/commit/892f0c09d95ca4e2e6210429b4ad1dbc4413c551) (Junius Gunaratne)
* [[Shapes] Remove MDCShapedShadowLayer fillColor property (#2716)](https://github.com/material-components/material-components-ios/commit/1a68851befc1e1a6838325a628fce6194e9e37db) (Sam Morrison)

### CollectionCells

#### Changes

* [ Add BUILD file (#2693)](https://github.com/material-components/material-components-ios/commit/847d3757f553ff662d9f6fb48472eb099aaa5bdf) (Robert Moore)

### Collections

#### Changes

* [Add BUILD file and add missing import (#2698)](https://github.com/material-components/material-components-ios/commit/0bade5a52e8c16223c68ad7cb48fa59cd6ac5171) (Robert Moore)

### FeatureHighlight

#### Changes

* [Add custom font support (#2701)](https://github.com/material-components/material-components-ios/commit/fcf9712d325e28f9c1683ca61c7f239536130c8e) (ianegordon)

### FlexibleHeader

#### Changes

* [[kokoro] Add :ColorThemer targets (#2712)](https://github.com/material-components/material-components-ios/commit/d2e028f3886596f7fa6b2400418dc6140a2d4174) (Robert Moore)

### HeaderStackView

#### Changes

* [Add BUILD file and no-op test (#2695)](https://github.com/material-components/material-components-ios/commit/1f5918b55ac3e74bac35ed7eb1da2c9b372cc69d) (Robert Moore)

### Ink

#### Changes

* [Add updated ink to chips, update ink animation when bounds change (#2545)](https://github.com/material-components/material-components-ios/commit/892f0c09d95ca4e2e6210429b4ad1dbc4413c551) (Junius Gunaratne)
* [[kokoro] Add :ColorThemer targets (#2712)](https://github.com/material-components/material-components-ios/commit/d2e028f3886596f7fa6b2400418dc6140a2d4174) (Robert Moore)

### LibraryInfo

#### Changes

* [Add BUILD file (#2707)](https://github.com/material-components/material-components-ios/commit/5c24f30a291b296bd3e8f4641bf88253cb08b243) (Robert Moore)

### MaskedTransition

#### Changes

* [Add BUILD file and no-op test (#2708)](https://github.com/material-components/material-components-ios/commit/5746134132216de8583c79024505ac611f2054f1) (Robert Moore)

### NavigationBar

#### Changes

* [[NavBar, ButtonBar] Add NavBar tests, fix ButtonBar KVO (#2713)](https://github.com/material-components/material-components-ios/commit/8f1eb74490f3641ff7edf4608fb16698aaebdf93) (Robert Moore)

### Slider

#### Changes

* [Add BUILD file (#2694)](https://github.com/material-components/material-components-ios/commit/a31a9e10c291501b6cd3e353d06c08b606b1ea67) (Robert Moore)

### Snackbar

#### Changes

* [Add BUILD file (#2697)](https://github.com/material-components/material-components-ios/commit/9481c61954f6668305071ec3ad50af537657958e) (Robert Moore)

### Tabs

#### Changes

* [Re-enable new ink (reverts #2665) (#2682)](https://github.com/material-components/material-components-ios/commit/b0266e9367b95b851699a1aa62e4082bb6d8f157) (featherless)

### TextFields

#### Changes

* [States example (#2718)](https://github.com/material-components/material-components-ios/commit/290f13f7bede9eceaa8159d7af85cd54a703c1c6) (Will Larche)
* [[kokoro] Add :ColorThemer targets (#2712)](https://github.com/material-components/material-components-ios/commit/d2e028f3886596f7fa6b2400418dc6140a2d4174) (Robert Moore)

---

# 43.0.0

This major release includes a variety of API name changes. Please see the API changes below for more details.
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponents.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'

Pod::Spec.new do |mdc|
mdc.name = "MaterialComponents"
mdc.version = "43.0.0"
mdc.version = "43.1.0"
mdc.authors = "The Material Components authors."
mdc.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
mdc.homepage = "https://github.com/material-components/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsEarlGreyTests.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsEarlGreyTests"
s.version = "43.0.0"
s.version = "43.1.0"
s.authors = "The Material Components authors."
s.summary = "This spec is an aggregate of all the Material Components EarlGrey tests."
s.description = "This spec is made for use in the MDC Catalog."
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsExamples.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsExamples"
s.version = "43.0.0"
s.version = "43.1.0"
s.authors = "The Material Components authors."
s.summary = "This spec is an aggregate of all the Material Components examples."
s.description = "This spec is made for use in the MDC Catalog. Used in conjunction with CatalogByConvention we create our Material Catalog."
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsUnitTests.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsUnitTests"
s.version = "43.0.0"
s.version = "43.1.0"
s.authors = "The Material Components authors."
s.summary = "This spec is an aggregate of all the Material Components unit tests."
s.description = "This spec is made for use in the MDC Catalog."
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
43.0.0
43.1.0
2 changes: 1 addition & 1 deletion catalog/MDCCatalog/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>43.0.0</string>
<string>43.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion catalog/MaterialCatalog/MaterialCatalog.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialCatalog"
s.version = "43.0.0"
s.version = "43.1.0"
s.summary = "Helper Objective-C classes for the MDC catalog."
s.description = "This spec is made for use in the MDC Catalog."
s.homepage = "https://github.com/material-components/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion components/LibraryInfo/src/MDCLibraryInfo.m
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// This string is updated automatically as a part of the release process and should not be edited
// manually. Do not rename this constant or change the formatting without updating the release
// scripts.
static NSString const *MDCLibraryInfoVersionString = @"43.0.0";
static NSString const *MDCLibraryInfoVersionString = @"43.1.0";

@implementation MDCLibraryInfo

Expand Down
2 changes: 1 addition & 1 deletion components/LibraryInfo/tests/unit/LibraryInfoTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class LibraryInfoTests: XCTestCase {
// Given

// This regex pattern does the following:
// Accept: "43.0.0", etc.
// Accept: "43.1.0", etc.
// Reject: "0.0.0", "1.2", "1", "-1.2.3", "Hi, I'm a version 1.2.3", "1.2.3 is my version", etc.
//
// Note the major version must be >= 1 since "0.0.0" is used as the version when something goes
Expand Down
2 changes: 1 addition & 1 deletion demos/supplemental/RemoteImageServiceForMDCDemos.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RemoteImageServiceForMDCDemos"
s.version = "43.0.0"
s.version = "43.1.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"
Expand Down

0 comments on commit bd3eb3e

Please sign in to comment.