From 9cfe8a5e073a2c50e12abb345857b3798e8a7f41 Mon Sep 17 00:00:00 2001 From: djjliang Date: Wed, 22 Mar 2017 16:09:33 -0400 Subject: [PATCH 1/2] Update podspec to build on tvOS. --- CatalogByConvention.podspec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CatalogByConvention.podspec b/CatalogByConvention.podspec index 2f97646..32af195 100644 --- a/CatalogByConvention.podspec +++ b/CatalogByConvention.podspec @@ -6,7 +6,9 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/material-foundation/cocoapods-catalog-by-convention" s.license = 'Apache 2.0' s.source = { :git => "https://github.com/material-foundation/cocoapods-catalog-by-convention.git", :tag => "v#{s.version}" } - s.platform = :ios, '8.0' + s.platform = :ios,:tvos + s.ios.deployment_target = '8.0' + s.tvos.deployment_target = '9.0' s.requires_arc = true s.public_header_files = "src/*.h" From 43cdf5ef6d3c9e3aad8fa733d7f1f2bcd381cd54 Mon Sep 17 00:00:00 2001 From: Ian Gordon Date: Wed, 22 Mar 2017 17:31:11 -0400 Subject: [PATCH 2/2] Bump Version to 2.1.0 --- CHANGELOG.md | 4 ++++ CatalogByConvention.podspec | 2 +- example/Podfile.lock | 6 +++--- example/catalog/Catalog.xcodeproj/project.pbxproj | 2 +- example/catalog/UnitTests.xcodeproj/project.pbxproj | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8069156..fe6acea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 2.1.0 + +- Add tvOS as a platform. + # 2.0.1 - Fixed some warnings. diff --git a/CatalogByConvention.podspec b/CatalogByConvention.podspec index 32af195..451a5a1 100644 --- a/CatalogByConvention.podspec +++ b/CatalogByConvention.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "CatalogByConvention" - s.version = "2.0.1" + s.version = "2.1.0" s.authors = "Google Inc." s.summary = "Tools for building a Catalog by Convention." s.homepage = "https://github.com/material-foundation/cocoapods-catalog-by-convention" diff --git a/example/Podfile.lock b/example/Podfile.lock index 58d2a67..ec6fed0 100644 --- a/example/Podfile.lock +++ b/example/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - CatalogByConvention (2.0.1) + - CatalogByConvention (2.1.0) - CatalogExamples (1.0.0) - CatalogUnitTests (1.0.0): - Resistor @@ -22,11 +22,11 @@ EXTERNAL SOURCES: :path: components/Resistor SPEC CHECKSUMS: - CatalogByConvention: 7427d8ac03d5bc1eebcf2898de2b6e27a5876310 + CatalogByConvention: ef0913973b86b4234bcadf22aa84037c4a47cbbd CatalogExamples: cafe3e4eae3abc948d96beb626657455c1dfb327 CatalogUnitTests: b7a746f12abb31a905654521ee926ea007ab7275 Resistor: 36a9ae98666be3b4f34d8133fad442fa87fdbce2 PODFILE CHECKSUM: bb59c09c71f8777bbe79af5ae920e3d58849ab41 -COCOAPODS: 1.0.1 +COCOAPODS: 1.2.0 diff --git a/example/catalog/Catalog.xcodeproj/project.pbxproj b/example/catalog/Catalog.xcodeproj/project.pbxproj index 977e63d..af1ea0e 100644 --- a/example/catalog/Catalog.xcodeproj/project.pbxproj +++ b/example/catalog/Catalog.xcodeproj/project.pbxproj @@ -170,7 +170,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; 526A63F3210C836C577F3F5D /* [CP] Copy Pods Resources */ = { diff --git a/example/catalog/UnitTests.xcodeproj/project.pbxproj b/example/catalog/UnitTests.xcodeproj/project.pbxproj index 259c33c..3fb6c17 100644 --- a/example/catalog/UnitTests.xcodeproj/project.pbxproj +++ b/example/catalog/UnitTests.xcodeproj/project.pbxproj @@ -175,7 +175,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; E2A6B4BD8988E7DF3FD232F4 /* [CP] Copy Pods Resources */ = {