From b2454bec5db6a04a943456be549b86d303dee975 Mon Sep 17 00:00:00 2001 From: Ian Gordon Date: Wed, 20 Jul 2016 17:38:39 -0400 Subject: [PATCH] At iOS version to each component. Test Plan: ./scripts/release/manage_pods.py update Worked as expected. Reviewers: randallli, O1 Material components iOS Reviewed By: randallli, O1 Material components iOS Tags: #material_components_ios Differential Revision: http://codereview.cc/D1285 --- MaterialComponents.podspec | 33 +++++++++++++++++++++++++++++++-- catalog/Podfile.lock | 2 +- demos/Pesto/Podfile.lock | 2 +- demos/Shrine/Podfile.lock | 2 +- 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec index 4be24a4924f..7164169167f 100644 --- a/MaterialComponents.podspec +++ b/MaterialComponents.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/google/material-components-ios" s.license = "Apache 2.0" s.source = { :git => "https://github.com/google/material-components-ios.git", :tag => s.version.to_s } - s.platform = :ios, "7.0" + s.platform = :ios s.requires_arc = true # # Subspec explanation @@ -39,12 +39,14 @@ Pod::Spec.new do |s| # s.subspec "ActivityIndicator" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src/*" end s.subspec "AppBar" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -64,6 +66,7 @@ Pod::Spec.new do |s| end s.subspec "Buttons" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -75,6 +78,7 @@ Pod::Spec.new do |s| end s.subspec "ButtonBar" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -84,6 +88,7 @@ Pod::Spec.new do |s| end s.subspec "CollectionCells" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -103,12 +108,14 @@ Pod::Spec.new do |s| end s.subspec "CollectionLayoutAttributes" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" end s.subspec "Collections" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -127,10 +134,10 @@ Pod::Spec.new do |s| end s.subspec "Dialogs" do |ss| + ss.ios.deployment_target = '8.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" - ss.dependency "MaterialComponents/Buttons" ss.dependency "MaterialComponents/ShadowElevations" ss.dependency "MaterialComponents/ShadowLayer" @@ -138,12 +145,14 @@ Pod::Spec.new do |s| end s.subspec "FlexibleHeader" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" end s.subspec "FontDiskLoader" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -152,18 +161,21 @@ Pod::Spec.new do |s| end s.subspec "HeaderStackView" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" end s.subspec "Ink" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" end s.subspec "NavigationBar" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -174,12 +186,14 @@ Pod::Spec.new do |s| end s.subspec "OverlayWindow" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" end s.subspec "PageControl" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -189,12 +203,14 @@ Pod::Spec.new do |s| end s.subspec "Palettes" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" end s.subspec "ProgressView" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -203,6 +219,7 @@ Pod::Spec.new do |s| end s.subspec "RobotoFontLoader" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -217,18 +234,21 @@ Pod::Spec.new do |s| end s.subspec "ShadowElevations" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" end s.subspec "ShadowLayer" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" end s.subspec "Slider" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -237,6 +257,7 @@ Pod::Spec.new do |s| end s.subspec "Snackbar" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -248,12 +269,14 @@ Pod::Spec.new do |s| end s.subspec "SpritedAnimationView" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" end s.subspec "Switch" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -265,6 +288,7 @@ Pod::Spec.new do |s| end s.subspec "Typography" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/#{ss.base_name}/src/*.h" ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src" @@ -278,30 +302,35 @@ Pod::Spec.new do |s| registerIcons(pss) pss.subspec "Color" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/private/#{ss.base_name}/src/*.h" ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/private/#{ss.base_name}/src" end pss.subspec "KeyboardWatcher" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/private/#{ss.base_name}/src/*.h" ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/private/#{ss.base_name}/src" end pss.subspec "Overlay" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/private/#{ss.base_name}/src/*.h" ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}", "components/private/#{ss.base_name}/src/private/*.{h,m}" ss.header_mappings_dir = "components/private/#{ss.base_name}/src" end pss.subspec "RTL" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/private/#{ss.base_name}/src/*.h" ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/private/#{ss.base_name}/src" end pss.subspec "ThumbTrack" do |ss| + ss.ios.deployment_target = '7.0' ss.public_header_files = "components/private/#{ss.base_name}/src/*.h" ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/private/#{ss.base_name}/src" diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock index cd8cb39e29a..ab1178b25fb 100644 --- a/catalog/Podfile.lock +++ b/catalog/Podfile.lock @@ -159,7 +159,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec - MaterialComponents: aad22d3473a7b32c8477be45e493c8b6f5d06edb + MaterialComponents: dc641f565bbf36b134427bf24fea1e02016d657c MaterialComponentsCatalog: 2b5f51302ffd2b444b5ec1f3cf6097d9377944d8 MaterialComponentsUnitTests: '0288b5f4d98079b22c62ad04072875ebc44c7769' diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock index bce20a3643a..6c2bbd56903 100644 --- a/demos/Pesto/Podfile.lock +++ b/demos/Pesto/Podfile.lock @@ -146,7 +146,7 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - MaterialComponents: aad22d3473a7b32c8477be45e493c8b6f5d06edb + MaterialComponents: dc641f565bbf36b134427bf24fea1e02016d657c PODFILE CHECKSUM: f138be16d4835113ff672258fc7529fad3f90e91 diff --git a/demos/Shrine/Podfile.lock b/demos/Shrine/Podfile.lock index 3dcb68bf0bc..8f64fe639a1 100644 --- a/demos/Shrine/Podfile.lock +++ b/demos/Shrine/Podfile.lock @@ -146,7 +146,7 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - MaterialComponents: aad22d3473a7b32c8477be45e493c8b6f5d06edb + MaterialComponents: dc641f565bbf36b134427bf24fea1e02016d657c PODFILE CHECKSUM: b585ca32a2884e050823cc1f861e8b7246f7dcc1