Skip to content

Commit

Permalink
Merge branch 'release-candidate'
Browse files Browse the repository at this point in the history
  • Loading branch information
@randallli
randallli committed Apr 14, 2016
2 parents 1542251 + f9bbc7e commit 55afa3a
Show file tree
Hide file tree
Showing 9 changed files with 168 additions and 195 deletions.
18 changes: 17 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
## 4.0.0
# 4.0.1

## API diffs

Auto-generated by running:

scripts/api_diff -o 1542251633905c3c2089b38f1c01a5010a8894f1 -n 789beeb556aab8b4aeddb71fa837d7db8c4660d7

### Typography

- [deleted] [`MDCFontResource`](https://github.com/google/material-components-ios/blob/1542251633905c3c2089b38f1c01a5010a8894f1/components/Typography/src/MDCFontResource.h#L21)

## Component changes

### Typography

* [[Typgoraphy]! Deleted files need for deprecation](https://github.com/google/material-components-ios/commit/789beeb556aab8b4aeddb71fa837d7db8c4660d7) (randallli)

# 4.0.0

Expand Down
2 changes: 1 addition & 1 deletion MaterialComponents.podspec
View file
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 |s|
s.name = "MaterialComponents"
s.version = "4.0.0"
s.version = "4.0.1"
s.authors = { 'Apple platform engineering at Google' => '[email protected]' }
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
s.homepage = "https://github.com/google/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsCatalog.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsCatalog"
s.version = "4.0.0"
s.version = "4.0.1"
s.authors = { 'Apple platform engineering at Google' => '[email protected]' }
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
s.homepage = "https://github.com/google/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsUnitTests.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsUnitTests"
s.version = "4.0.0"
s.version = "4.0.1"
s.authors = { 'Apple platform engineering at Google' => '[email protected]' }
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
s.homepage = "https://github.com/google/material-components-ios"
Expand Down
104 changes: 52 additions & 52 deletions catalog/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,77 @@
PODS:
- MaterialComponents (4.0.0):
- MaterialComponents/AppBar (= 4.0.0)
- MaterialComponents/ButtonBar (= 4.0.0)
- MaterialComponents/Buttons (= 4.0.0)
- MaterialComponents/FlexibleHeader (= 4.0.0)
- MaterialComponents/FontDiskLoader (= 4.0.0)
- MaterialComponents/HeaderStackView (= 4.0.0)
- MaterialComponents/Ink (= 4.0.0)
- MaterialComponents/NavigationBar (= 4.0.0)
- MaterialComponents/PageControl (= 4.0.0)
- MaterialComponents/private (= 4.0.0)
- MaterialComponents/RobotoFontLoader (= 4.0.0)
- MaterialComponents/ScrollViewDelegateMultiplexer (= 4.0.0)
- MaterialComponents/ShadowElevations (= 4.0.0)
- MaterialComponents/ShadowLayer (= 4.0.0)
- MaterialComponents/Slider (= 4.0.0)
- MaterialComponents/SpritedAnimationView (= 4.0.0)
- MaterialComponents/Switch (= 4.0.0)
- MaterialComponents/Typography (= 4.0.0)
- MaterialComponents/AppBar (4.0.0):
- MaterialComponents (4.0.1):
- MaterialComponents/AppBar (= 4.0.1)
- MaterialComponents/ButtonBar (= 4.0.1)
- MaterialComponents/Buttons (= 4.0.1)
- MaterialComponents/FlexibleHeader (= 4.0.1)
- MaterialComponents/FontDiskLoader (= 4.0.1)
- MaterialComponents/HeaderStackView (= 4.0.1)
- MaterialComponents/Ink (= 4.0.1)
- MaterialComponents/NavigationBar (= 4.0.1)
- MaterialComponents/PageControl (= 4.0.1)
- MaterialComponents/private (= 4.0.1)
- MaterialComponents/RobotoFontLoader (= 4.0.1)
- MaterialComponents/ScrollViewDelegateMultiplexer (= 4.0.1)
- MaterialComponents/ShadowElevations (= 4.0.1)
- MaterialComponents/ShadowLayer (= 4.0.1)
- MaterialComponents/Slider (= 4.0.1)
- MaterialComponents/SpritedAnimationView (= 4.0.1)
- MaterialComponents/Switch (= 4.0.1)
- MaterialComponents/Typography (= 4.0.1)
- MaterialComponents/AppBar (4.0.1):
- MaterialComponents/FlexibleHeader
- MaterialComponents/HeaderStackView
- MaterialComponents/NavigationBar
- MaterialComponents/private/Icons/ic_arrow_back
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ButtonBar (4.0.0):
- MaterialComponents/ButtonBar (4.0.1):
- MaterialComponents/Buttons
- MaterialComponents/Buttons (4.0.0):
- MaterialComponents/Buttons (4.0.1):
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/FlexibleHeader (4.0.0)
- MaterialComponents/FontDiskLoader (4.0.0)
- MaterialComponents/HeaderStackView (4.0.0)
- MaterialComponents/Ink (4.0.0)
- MaterialComponents/NavigationBar (4.0.0):
- MaterialComponents/FlexibleHeader (4.0.1)
- MaterialComponents/FontDiskLoader (4.0.1)
- MaterialComponents/HeaderStackView (4.0.1)
- MaterialComponents/Ink (4.0.1)
- MaterialComponents/NavigationBar (4.0.1):
- MaterialComponents/ButtonBar
- MaterialComponents/Typography
- MaterialComponents/PageControl (4.0.0)
- MaterialComponents/private (4.0.0):
- MaterialComponents/private/Color (= 4.0.0)
- MaterialComponents/private/Icons (= 4.0.0)
- MaterialComponents/private/ThumbTrack (= 4.0.0)
- MaterialComponents/private/Color (4.0.0)
- MaterialComponents/private/Icons (4.0.0):
- MaterialComponents/private/Icons/Base (= 4.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 4.0.0)
- MaterialComponents/private/Icons/Base (4.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (4.0.0):
- MaterialComponents/PageControl (4.0.1)
- MaterialComponents/private (4.0.1):
- MaterialComponents/private/Color (= 4.0.1)
- MaterialComponents/private/Icons (= 4.0.1)
- MaterialComponents/private/ThumbTrack (= 4.0.1)
- MaterialComponents/private/Color (4.0.1)
- MaterialComponents/private/Icons (4.0.1):
- MaterialComponents/private/Icons/Base (= 4.0.1)
- MaterialComponents/private/Icons/ic_arrow_back (= 4.0.1)
- MaterialComponents/private/Icons/Base (4.0.1)
- MaterialComponents/private/Icons/ic_arrow_back (4.0.1):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/ThumbTrack (4.0.0):
- MaterialComponents/private/ThumbTrack (4.0.1):
- MaterialComponents/Ink
- MaterialComponents/private/Color
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/RobotoFontLoader (4.0.0):
- MaterialComponents/RobotoFontLoader (4.0.1):
- MaterialComponents/FontDiskLoader
- MaterialComponents/Typography
- MaterialComponents/ScrollViewDelegateMultiplexer (4.0.0)
- MaterialComponents/ShadowElevations (4.0.0)
- MaterialComponents/ShadowLayer (4.0.0)
- MaterialComponents/Slider (4.0.0):
- MaterialComponents/ScrollViewDelegateMultiplexer (4.0.1)
- MaterialComponents/ShadowElevations (4.0.1)
- MaterialComponents/ShadowLayer (4.0.1)
- MaterialComponents/Slider (4.0.1):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/SpritedAnimationView (4.0.0)
- MaterialComponents/Switch (4.0.0):
- MaterialComponents/SpritedAnimationView (4.0.1)
- MaterialComponents/Switch (4.0.1):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Typography (4.0.0)
- MaterialComponentsCatalog (4.0.0):
- MaterialComponents/Typography (4.0.1)
- MaterialComponentsCatalog (4.0.1):
- MaterialComponents
- MaterialComponentsUnitTests (4.0.0):
- MaterialComponentsUnitTests (4.0.1):
- MaterialComponents

DEPENDENCIES:
Expand All @@ -88,8 +88,8 @@ EXTERNAL SOURCES:
:path: ../

SPEC CHECKSUMS:
MaterialComponents: b9f68b528c394b14b774591be1de18e25648c38a
MaterialComponentsCatalog: 82dc510292fedfd8a6c296b2d82da20dc24f0ef9
MaterialComponentsUnitTests: 4cfd5c80aaf7b3f8155fc4052ad2ee153bac74fe
MaterialComponents: 0f57dfb792eee175d9c287e6b5778cbeb60fcf0b
MaterialComponentsCatalog: 4769fcabbbdb4b40373eb428f329dbc4c2b53dac
MaterialComponentsUnitTests: 8fa9520a8dae5ee0b7962ce449619b5be13445e6

COCOAPODS: 0.39.0
23 changes: 0 additions & 23 deletions components/Typography/src/MDCFontResource.h
View file

This file was deleted.

20 changes: 0 additions & 20 deletions components/Typography/src/MDCFontResource.m
View file

This file was deleted.

96 changes: 48 additions & 48 deletions demos/Pesto/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
PODS:
- MaterialComponents (4.0.0):
- MaterialComponents/AppBar (= 4.0.0)
- MaterialComponents/ButtonBar (= 4.0.0)
- MaterialComponents/Buttons (= 4.0.0)
- MaterialComponents/FlexibleHeader (= 4.0.0)
- MaterialComponents/FontDiskLoader (= 4.0.0)
- MaterialComponents/HeaderStackView (= 4.0.0)
- MaterialComponents/Ink (= 4.0.0)
- MaterialComponents/NavigationBar (= 4.0.0)
- MaterialComponents/PageControl (= 4.0.0)
- MaterialComponents/private (= 4.0.0)
- MaterialComponents/RobotoFontLoader (= 4.0.0)
- MaterialComponents/ScrollViewDelegateMultiplexer (= 4.0.0)
- MaterialComponents/ShadowElevations (= 4.0.0)
- MaterialComponents/ShadowLayer (= 4.0.0)
- MaterialComponents/Slider (= 4.0.0)
- MaterialComponents/SpritedAnimationView (= 4.0.0)
- MaterialComponents/Switch (= 4.0.0)
- MaterialComponents/Typography (= 4.0.0)
- MaterialComponents/AppBar (4.0.0):
- MaterialComponents (4.0.1):
- MaterialComponents/AppBar (= 4.0.1)
- MaterialComponents/ButtonBar (= 4.0.1)
- MaterialComponents/Buttons (= 4.0.1)
- MaterialComponents/FlexibleHeader (= 4.0.1)
- MaterialComponents/FontDiskLoader (= 4.0.1)
- MaterialComponents/HeaderStackView (= 4.0.1)
- MaterialComponents/Ink (= 4.0.1)
- MaterialComponents/NavigationBar (= 4.0.1)
- MaterialComponents/PageControl (= 4.0.1)
- MaterialComponents/private (= 4.0.1)
- MaterialComponents/RobotoFontLoader (= 4.0.1)
- MaterialComponents/ScrollViewDelegateMultiplexer (= 4.0.1)
- MaterialComponents/ShadowElevations (= 4.0.1)
- MaterialComponents/ShadowLayer (= 4.0.1)
- MaterialComponents/Slider (= 4.0.1)
- MaterialComponents/SpritedAnimationView (= 4.0.1)
- MaterialComponents/Switch (= 4.0.1)
- MaterialComponents/Typography (= 4.0.1)
- MaterialComponents/AppBar (4.0.1):
- MaterialComponents/FlexibleHeader
- MaterialComponents/HeaderStackView
- MaterialComponents/NavigationBar
- MaterialComponents/private/Icons/ic_arrow_back
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ButtonBar (4.0.0):
- MaterialComponents/ButtonBar (4.0.1):
- MaterialComponents/Buttons
- MaterialComponents/Buttons (4.0.0):
- MaterialComponents/Buttons (4.0.1):
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/FlexibleHeader (4.0.0)
- MaterialComponents/FontDiskLoader (4.0.0)
- MaterialComponents/HeaderStackView (4.0.0)
- MaterialComponents/Ink (4.0.0)
- MaterialComponents/NavigationBar (4.0.0):
- MaterialComponents/FlexibleHeader (4.0.1)
- MaterialComponents/FontDiskLoader (4.0.1)
- MaterialComponents/HeaderStackView (4.0.1)
- MaterialComponents/Ink (4.0.1)
- MaterialComponents/NavigationBar (4.0.1):
- MaterialComponents/ButtonBar
- MaterialComponents/Typography
- MaterialComponents/PageControl (4.0.0)
- MaterialComponents/private (4.0.0):
- MaterialComponents/private/Color (= 4.0.0)
- MaterialComponents/private/Icons (= 4.0.0)
- MaterialComponents/private/ThumbTrack (= 4.0.0)
- MaterialComponents/private/Color (4.0.0)
- MaterialComponents/private/Icons (4.0.0):
- MaterialComponents/private/Icons/Base (= 4.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 4.0.0)
- MaterialComponents/private/Icons/Base (4.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (4.0.0):
- MaterialComponents/PageControl (4.0.1)
- MaterialComponents/private (4.0.1):
- MaterialComponents/private/Color (= 4.0.1)
- MaterialComponents/private/Icons (= 4.0.1)
- MaterialComponents/private/ThumbTrack (= 4.0.1)
- MaterialComponents/private/Color (4.0.1)
- MaterialComponents/private/Icons (4.0.1):
- MaterialComponents/private/Icons/Base (= 4.0.1)
- MaterialComponents/private/Icons/ic_arrow_back (= 4.0.1)
- MaterialComponents/private/Icons/Base (4.0.1)
- MaterialComponents/private/Icons/ic_arrow_back (4.0.1):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/ThumbTrack (4.0.0):
- MaterialComponents/private/ThumbTrack (4.0.1):
- MaterialComponents/Ink
- MaterialComponents/private/Color
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/RobotoFontLoader (4.0.0):
- MaterialComponents/RobotoFontLoader (4.0.1):
- MaterialComponents/FontDiskLoader
- MaterialComponents/Typography
- MaterialComponents/ScrollViewDelegateMultiplexer (4.0.0)
- MaterialComponents/ShadowElevations (4.0.0)
- MaterialComponents/ShadowLayer (4.0.0)
- MaterialComponents/Slider (4.0.0):
- MaterialComponents/ScrollViewDelegateMultiplexer (4.0.1)
- MaterialComponents/ShadowElevations (4.0.1)
- MaterialComponents/ShadowLayer (4.0.1)
- MaterialComponents/Slider (4.0.1):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/SpritedAnimationView (4.0.0)
- MaterialComponents/Switch (4.0.0):
- MaterialComponents/SpritedAnimationView (4.0.1)
- MaterialComponents/Switch (4.0.1):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Typography (4.0.0)
- MaterialComponents/Typography (4.0.1)

DEPENDENCIES:
- MaterialComponents (from `../../`)
Expand All @@ -78,6 +78,6 @@ EXTERNAL SOURCES:
:path: ../../

SPEC CHECKSUMS:
MaterialComponents: b9f68b528c394b14b774591be1de18e25648c38a
MaterialComponents: 0f57dfb792eee175d9c287e6b5778cbeb60fcf0b

COCOAPODS: 0.39.0
Loading

0 comments on commit 55afa3a

Please sign in to comment.