Skip to content

Commit

Permalink
Merge branch 'release-candidate' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Verkoeyen committed Aug 3, 2020
2 parents 63bb5db + 3c8cf5d commit a865bcd
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 84 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 112.0.1

This patch release fixes the broken podspec configuration.

---

# 112.0.0

This major releases deletes several deprecated APIs, expands Ripple support, and fixes several bugs.
Expand Down
73 changes: 2 additions & 71 deletions 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 = "112.0.0"
mdc.version = "112.0.1"
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 Expand Up @@ -435,7 +435,6 @@ Pod::Spec.new do |mdc|
unit_tests.resources = "components/#{component.base_name}/tests/unit/resources/*"
unit_tests.dependency "MaterialComponents/Buttons+ShapeThemer"
unit_tests.dependency "MaterialComponents/Buttons+ColorThemer"
unit_tests.dependency "MaterialComponents/Buttons+TitleColorAccessibilityMutator"
unit_tests.dependency "MaterialComponents/Buttons+ButtonThemer"
end
end
Expand All @@ -453,20 +452,6 @@ Pod::Spec.new do |mdc|
extension.dependency "MaterialComponents/schemes/Color"
end

mdc.subspec "Buttons+TitleColorAccessibilityMutator" do |extension|
extension.ios.deployment_target = '9.0'
extension.public_header_files = [
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
]
extension.source_files = [
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}",
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/private/*.{h,m}"
]

extension.dependency 'MDFTextAccessibility'
extension.dependency "MaterialComponents/#{extension.base_name.split('+')[0]}"
end

mdc.subspec "Buttons+ShapeThemer" do |extension|
extension.ios.deployment_target = '9.0'
extension.public_header_files = [
Expand Down Expand Up @@ -862,7 +847,6 @@ Pod::Spec.new do |mdc|
]
unit_tests.resources = "components/#{component.base_name}/tests/unit/resources/*"
unit_tests.dependency "MaterialComponents/FeatureHighlight+ColorThemer"
unit_tests.dependency "MaterialComponents/FeatureHighlight+FeatureHighlightAccessibilityMutator"
end
end

Expand All @@ -879,19 +863,6 @@ Pod::Spec.new do |mdc|
extension.dependency "MaterialComponents/Themes"
end

mdc.subspec "FeatureHighlight+FeatureHighlightAccessibilityMutator" do |extension|
extension.ios.deployment_target = '9.0'
extension.public_header_files = [
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
]
extension.source_files = [
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}"
]

extension.dependency "MaterialComponents/#{extension.base_name.split('+')[0]}"
extension.dependency 'MDFTextAccessibility'
end

# FlexibleHeader

mdc.subspec "FlexibleHeader" do |component|
Expand Down Expand Up @@ -973,19 +944,6 @@ Pod::Spec.new do |mdc|
end
end

mdc.subspec "HeaderStackView+ColorThemer" do |extension|
extension.ios.deployment_target = '9.0'
extension.public_header_files = [
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
]
extension.source_files = [
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}"
]

extension.dependency "MaterialComponents/#{extension.base_name.split('+')[0]}"
extension.dependency "MaterialComponents/Themes"
end

# Ink

mdc.subspec "Ink" do |component|
Expand Down Expand Up @@ -1448,38 +1406,10 @@ Pod::Spec.new do |mdc|
"components/#{component.base_name}/tests/unit/supplemental/*.{h,m,swift}"
]
unit_tests.resources = "components/#{component.base_name}/tests/unit/resources/*"
unit_tests.dependency "MaterialComponents/Snackbar+FontThemer"
unit_tests.dependency "MaterialComponents/Snackbar+TypographyThemer"
unit_tests.dependency "MaterialComponents/Themes"
end
end

mdc.subspec "Snackbar+FontThemer" do |extension|
extension.ios.deployment_target = '9.0'
extension.public_header_files = [
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
]
extension.source_files = [
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}"
]

extension.dependency "MaterialComponents/#{extension.base_name.split('+')[0]}"
extension.dependency "MaterialComponents/Themes"
end

mdc.subspec "Snackbar+TypographyThemer" do |extension|
extension.ios.deployment_target = '9.0'
extension.public_header_files = [
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
]
extension.source_files = [
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}"
]

extension.dependency "MaterialComponents/#{extension.base_name.split('+')[0]}"
extension.dependency "MaterialComponents/schemes/Typography"
end

# Tabs

mdc.subspec "Tabs" do |component|
Expand Down Expand Up @@ -2155,6 +2085,7 @@ Pod::Spec.new do |mdc|
component.dependency "MaterialComponents/Ripple"
component.dependency "MaterialComponents/ShadowElevations"
component.dependency "MaterialComponents/ShadowLayer"
component.dependency "MaterialComponents/ShapeLibrary"
component.dependency "MaterialComponents/Typography"
component.dependency "MDFInternationalization"
component.dependency "MaterialComponents/private/Math"
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsBeta.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |mdc|
mdc.name = "MaterialComponentsBeta"
mdc.version = "112.0.0"
mdc.version = "112.0.1"
mdc.authors = "The Material Components authors."
mdc.summary = "A collection of stand-alone alpha UI libraries that are not yet guaranteed to be ready for general production use. Use with caution."
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 = "112.0.0"
s.version = "112.0.1"
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 = "112.0.0"
s.version = "112.0.1"
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 MaterialComponentsSnapshotTests.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ end

Pod::Spec.new do |s|
s.name = "MaterialComponentsSnapshotTests"
s.version = "112.0.0"
s.version = "112.0.1"
s.authors = "The Material Components authors."
s.summary = "This spec is an aggregate of all the Material Components snapshot tests."
s.homepage = "https://github.com/material-components/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
112.0.0
112.0.1
4 changes: 2 additions & 2 deletions catalog/MDCCatalog/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>112.0.0</string>
<string>112.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>112.0.0</string>
<string>112.0.1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIAppFonts</key>
Expand Down
4 changes: 2 additions & 2 deletions catalog/MDCDragons/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>112.0.0</string>
<string>112.0.1</string>
<key>CFBundleVersion</key>
<string>112.0.0</string>
<string>112.0.1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</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 = "112.0.0"
s.version = "112.0.1"
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 @@ -19,7 +19,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 kMDCLibraryInfoVersionString = @"112.0.0";
static NSString* const kMDCLibraryInfoVersionString = @"112.0.1";

@implementation MDCLibraryInfo

Expand Down
2 changes: 1 addition & 1 deletion components/LibraryInfo/tests/unit/LibraryInfoTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ - (void)testVersionFormat {
// Given

// This regex pattern does the following:
// Accept: "112.0.0", etc.
// Accept: "112.0.1", 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 = "112.0.0"
s.version = "112.0.1"
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 a865bcd

Please sign in to comment.