From 3eb6b7755910690449091df82069a872af5883ed Mon Sep 17 00:00:00 2001 From: Randall Li Date: Fri, 14 Feb 2020 00:07:48 -0500 Subject: [PATCH 1/3] Automatic changelog preparation for release. --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 442dab688e4..2966d9e12ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +# #develop# + +Replace this text with a summarized description of this release's contents. +## Breaking changes + +Replace this explanations for how to resolve the breaking changes. +## New deprecations + +Replace this text with links to deprecation guides. +## New features + +Replace this text with example code for each new feature. +## API changes + +## Component changes + +--- + # 104.0.0 In this major release we removed the deprecated MDCFloatingActionButtonThemer, added APIs to AppBar flexible header, alert controllers, bottom drawers and sliders to make the more configurable for clients. From ed3d6306e6bbe25e1a486fa5853391343eb0e39c Mon Sep 17 00:00:00 2001 From: Randall Li Date: Thu, 13 Feb 2020 12:17:57 -0500 Subject: [PATCH 2/3] [buttons] Fix tvOS target bug. (#9705) PiperOrigin-RevId: 294713878 --- components/Buttons/src/MDCButton.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/Buttons/src/MDCButton.m b/components/Buttons/src/MDCButton.m index 2cc6de86751..0770f701fc5 100644 --- a/components/Buttons/src/MDCButton.m +++ b/components/Buttons/src/MDCButton.m @@ -170,7 +170,7 @@ - (void)commonMDCButtonInit { // Disable default highlight state. self.adjustsImageWhenHighlighted = NO; -#ifndef TARGET_OS_TV +#if (!defined(TARGET_OS_TV) || TARGET_OS_TV == 0) self.showsTouchWhenHighlighted = NO; #endif @@ -198,7 +198,7 @@ - (void)commonMDCButtonInit { action:@selector(touchDragExit:forEvent:) forControlEvents:UIControlEventTouchDragExit]; -#ifndef TARGET_OS_TV +#if (!defined(TARGET_OS_TV) || TARGET_OS_TV == 0) // Block users from activating multiple buttons simultaneously by default. self.exclusiveTouch = YES; #endif From 46462d825cb692cecdde2d0d5c04f1f720b6971b Mon Sep 17 00:00:00 2001 From: Randall Li Date: Fri, 14 Feb 2020 00:16:07 -0500 Subject: [PATCH 3/3] Bumped version number to 104.0.1. --- CHANGELOG.md | 17 +++++------------ MaterialComponents.podspec | 2 +- MaterialComponentsBeta.podspec | 2 +- MaterialComponentsEarlGreyTests.podspec | 2 +- MaterialComponentsExamples.podspec | 2 +- MaterialComponentsSnapshotTests.podspec | 2 +- VERSION | 2 +- catalog/MDCCatalog/Info.plist | 4 ++-- catalog/MDCDragons/Info.plist | 4 ++-- catalog/MaterialCatalog/MaterialCatalog.podspec | 2 +- components/LibraryInfo/src/MDCLibraryInfo.m | 2 +- .../LibraryInfo/tests/unit/LibraryInfoTests.m | 2 +- .../RemoteImageServiceForMDCDemos.podspec | 2 +- 13 files changed, 19 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2966d9e12ed..a775615d381 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,12 @@ -# #develop# +# 104.0.1 -Replace this text with a summarized description of this release's contents. -## Breaking changes - -Replace this explanations for how to resolve the breaking changes. -## New deprecations - -Replace this text with links to deprecation guides. -## New features - -Replace this text with example code for each new feature. -## API changes +In this patch release we fixed the syntax of the TV_OS macro. ## Component changes +### Buttons + +* [Fix tvOS target bug. (#9705)](https://github.com/material-components/material-components-ios/commit/ed3d6306e6bbe25e1a486fa5853391343eb0e39c) (Randall Li) --- # 104.0.0 diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec index 1fadbe2b80a..de282bb2eae 100644 --- a/MaterialComponents.podspec +++ b/MaterialComponents.podspec @@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb' Pod::Spec.new do |mdc| mdc.name = "MaterialComponents" - mdc.version = "104.0.0" + mdc.version = "104.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" diff --git a/MaterialComponentsBeta.podspec b/MaterialComponentsBeta.podspec index 533c793b9e5..18d7ab51cea 100644 --- a/MaterialComponentsBeta.podspec +++ b/MaterialComponentsBeta.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |mdc| mdc.name = "MaterialComponentsBeta" - mdc.version = "104.0.0" + mdc.version = "104.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" diff --git a/MaterialComponentsEarlGreyTests.podspec b/MaterialComponentsEarlGreyTests.podspec index 965bc1a3fb3..2cdedd16dab 100644 --- a/MaterialComponentsEarlGreyTests.podspec +++ b/MaterialComponentsEarlGreyTests.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsEarlGreyTests" - s.version = "104.0.0" + s.version = "104.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." diff --git a/MaterialComponentsExamples.podspec b/MaterialComponentsExamples.podspec index 061c8c426cc..7d67b4bc050 100644 --- a/MaterialComponentsExamples.podspec +++ b/MaterialComponentsExamples.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsExamples" - s.version = "104.0.0" + s.version = "104.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." diff --git a/MaterialComponentsSnapshotTests.podspec b/MaterialComponentsSnapshotTests.podspec index da1122a7d05..c7770aa9282 100644 --- a/MaterialComponentsSnapshotTests.podspec +++ b/MaterialComponentsSnapshotTests.podspec @@ -53,7 +53,7 @@ end Pod::Spec.new do |s| s.name = "MaterialComponentsSnapshotTests" - s.version = "104.0.0" + s.version = "104.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" diff --git a/VERSION b/VERSION index 18cf10229f9..5fa45906ac2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -104.0.0 +104.0.1 diff --git a/catalog/MDCCatalog/Info.plist b/catalog/MDCCatalog/Info.plist index 3e277d3ca13..25974291108 100644 --- a/catalog/MDCCatalog/Info.plist +++ b/catalog/MDCCatalog/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 104.0.0 + 104.0.1 CFBundleSignature ???? CFBundleVersion - 104.0.0 + 104.0.1 LSRequiresIPhoneOS UIAppFonts diff --git a/catalog/MDCDragons/Info.plist b/catalog/MDCDragons/Info.plist index 2186a8d35e7..159c2023639 100644 --- a/catalog/MDCDragons/Info.plist +++ b/catalog/MDCDragons/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 104.0.0 + 104.0.1 CFBundleVersion - 104.0.0 + 104.0.1 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/catalog/MaterialCatalog/MaterialCatalog.podspec b/catalog/MaterialCatalog/MaterialCatalog.podspec index 7f9a98a1f03..804ed57c42a 100644 --- a/catalog/MaterialCatalog/MaterialCatalog.podspec +++ b/catalog/MaterialCatalog/MaterialCatalog.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialCatalog" - s.version = "104.0.0" + s.version = "104.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" diff --git a/components/LibraryInfo/src/MDCLibraryInfo.m b/components/LibraryInfo/src/MDCLibraryInfo.m index 7e901a748c6..8bd002ffd5d 100644 --- a/components/LibraryInfo/src/MDCLibraryInfo.m +++ b/components/LibraryInfo/src/MDCLibraryInfo.m @@ -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 *MDCLibraryInfoVersionString = @"104.0.0"; +static NSString const *MDCLibraryInfoVersionString = @"104.0.1"; @implementation MDCLibraryInfo diff --git a/components/LibraryInfo/tests/unit/LibraryInfoTests.m b/components/LibraryInfo/tests/unit/LibraryInfoTests.m index b181011affd..d92d80eadd7 100644 --- a/components/LibraryInfo/tests/unit/LibraryInfoTests.m +++ b/components/LibraryInfo/tests/unit/LibraryInfoTests.m @@ -26,7 +26,7 @@ - (void)testVersionFormat { // Given // This regex pattern does the following: - // Accept: "104.0.0", etc. + // Accept: "104.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 diff --git a/demos/supplemental/RemoteImageServiceForMDCDemos.podspec b/demos/supplemental/RemoteImageServiceForMDCDemos.podspec index 89b98c033c7..8463c6194ad 100644 --- a/demos/supplemental/RemoteImageServiceForMDCDemos.podspec +++ b/demos/supplemental/RemoteImageServiceForMDCDemos.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RemoteImageServiceForMDCDemos" - s.version = "104.0.0" + s.version = "104.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"