Merge the tvOS spec into the iOS spec to ease integration in downstream projects. (#196)

Example-tvOS/Podfile

@@ -1,5 +1,5 @@
 use_frameworks!
 
 target 'PINRemoteImage.tvOSExample', :exclusive => true do
-  pod "PINRemoteImage/tvOS", :path => "../"
+  pod "PINRemoteImage/iOS", :path => "../"
 end

Example-tvOS/Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
   - PINCache (2.2.2)
-  - PINRemoteImage/Core (2.1.2):
+  - PINRemoteImage/Core (3.0.0-beta):
     - PINCache (>= 2.1)
-  - PINRemoteImage/tvOS (2.1.2):
+  - PINRemoteImage/iOS (3.0.0-beta):
     - PINRemoteImage/Core
 
 DEPENDENCIES:
-  - PINRemoteImage/tvOS (from `../`)
+  - PINRemoteImage/iOS (from `../`)
 
 EXTERNAL SOURCES:
   PINRemoteImage:
@@ -14,6 +14,6 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   PINCache: 078426d356ab95ef875e9e62e5c35a2ea3333c28
-  PINRemoteImage: cee13f6a46c58d6ebfa1975da97f7674c7e6f305
+  PINRemoteImage: 43b7123d7cc96a8394b3c6afaa20101679e6d463
 
 COCOAPODS: 0.39.0

Example-tvOS/Pods/Local Podspecs/PINRemoteImage.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "PINRemoteImage",
-  "version": "2.1.2",
+  "version": "3.0.0-beta",
   "summary": "A thread safe, performant, feature rich image fetcher",
   "homepage": "https://github.com/pinterest/PINRemoteImage",
   "license": "Apache 2.0",
@@ -9,12 +9,11 @@
   },
   "source": {
     "git": "https://github.com/pinterest/PINRemoteImage.git",
-    "tag": "2.1.2"
+    "tag": "3.0.0-beta"
   },
   "social_media_url": "https://twitter.com/garrettmoon",
   "platforms": {
     "ios": "6.0",
-    "osx": "10.8",
     "tvos": "9.0"
   },
   "requires_arc": true,
@@ -22,6 +21,11 @@
   "subspecs": [
     {
       "name": "Core",
+      "platforms": {
+        "ios": "6.0",
+        "tvos": "9.0",
+        "osx": "10.8"
+      },
       "source_files": "Pod/Classes/**/*.{h,m}",
       "exclude_files": [
         "Pod/Classes/Image Categories/FLAnimatedImageView+PINRemoteImage.h",
@@ -40,20 +44,22 @@
     },
     {
       "name": "iOS",
-      "platforms": "ios",
+      "platforms": {
+        "ios": "6.0",
+        "tvos": "9.0"
+      },
       "dependencies": {
         "PINRemoteImage/Core": [
 
         ]
       },
-      "frameworks": [
-        "UIKit",
-        "MobileCoreServices"
-      ]
+      "frameworks": "UIKit"
     },
     {
       "name": "OSX",
-      "platforms": "osx",
+      "platforms": {
+        "osx": "10.8"
+      },
       "dependencies": {
         "PINRemoteImage/Core": [
 
@@ -64,16 +70,6 @@
         "CoreServices"
       ]
     },
-    {
-      "name": "tvOS",
-      "platforms": "tvos",
-      "dependencies": {
-        "PINRemoteImage/Core": [
-
-        ]
-      },
-      "frameworks": "UIKit"
-    },
     {
       "name": "FLAnimatedImage",
       "platforms": "ios",

Example-tvOS/Pods/Manifest.lock

@@ -1,12 +1,12 @@
 PODS:
   - PINCache (2.2.2)
-  - PINRemoteImage/Core (2.1.2):
+  - PINRemoteImage/Core (3.0.0-beta):
     - PINCache (>= 2.1)
-  - PINRemoteImage/tvOS (2.1.2):
+  - PINRemoteImage/iOS (3.0.0-beta):
     - PINRemoteImage/Core
 
 DEPENDENCIES:
-  - PINRemoteImage/tvOS (from `../`)
+  - PINRemoteImage/iOS (from `../`)
 
 EXTERNAL SOURCES:
   PINRemoteImage:
@@ -14,6 +14,6 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   PINCache: 078426d356ab95ef875e9e62e5c35a2ea3333c28
-  PINRemoteImage: cee13f6a46c58d6ebfa1975da97f7674c7e6f305
+  PINRemoteImage: 43b7123d7cc96a8394b3c6afaa20101679e6d463
 
 COCOAPODS: 0.39.0

Example-tvOS/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-PINRemoteImage.tvOSExample-PINRemoteImage.xcscheme

@@ -14,7 +14,7 @@
             buildForArchiving = "YES">
             <BuildableReference
                BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'B5C33D4796881144E1CAFF01'
+               BlueprintIdentifier = '84519317A7DBA6B463EF7834'
                BlueprintName = 'Pods-PINRemoteImage.tvOSExample-PINRemoteImage'
                ReferencedContainer = 'container:Pods.xcodeproj'
                BuildableName = 'PINRemoteImage.framework'>

Example-tvOS/Pods/Target Support Files/Pods-PINRemoteImage.tvOSExample-PINRemoteImage/Info.plist

@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>2.1.2</string>
+  <string>3.0.0-beta</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

PINRemoteImage.podspec

@@ -18,7 +18,6 @@ Pod::Spec.new do |s|
   s.social_media_url = 'https://twitter.com/garrettmoon'
 
   s.ios.deployment_target = "6.0"
-  s.osx.deployment_target = "10.8"
   s.tvos.deployment_target = "9.0"
   s.requires_arc = true
   
@@ -27,6 +26,9 @@ Pod::Spec.new do |s|
   
   ### Subspecs
   s.subspec 'Core' do |cs|
+    cs.ios.deployment_target = "6.0"
+    cs.tvos.deployment_target = "9.0"
+    cs.osx.deployment_target = "10.8"
     cs.source_files = 'Pod/Classes/**/*.{h,m}'
     cs.exclude_files = 'Pod/Classes/Image Categories/FLAnimatedImageView+PINRemoteImage.h', 'Pod/Classes/Image Categories/FLAnimatedImageView+PINRemoteImage.m'
     cs.public_header_files = 'Pod/Classes/**/*.h'
@@ -35,21 +37,21 @@ Pod::Spec.new do |s|
   end
   
   s.subspec 'iOS' do |ios|
-    ios.platforms = "ios"
+    ios.ios.deployment_target = "6.0"
+    ios.tvos.deployment_target = "9.0"
     ios.dependency 'PINRemoteImage/Core'
-    ios.frameworks = 'UIKit', 'MobileCoreServices'
+    ios.frameworks = 'UIKit'
   end
 
   s.subspec 'OSX' do |cs|
-    cs.platforms = "osx"
+    cs.osx.deployment_target = "10.8"
     cs.dependency 'PINRemoteImage/Core'
     cs.frameworks = 'Cocoa', 'CoreServices'
   end
 
+  # The tvOS spec is no longer necessary, iOS should be used instead.
   s.subspec 'tvOS' do |tvos|
-    tvos.platforms = "tvos"
-    tvos.dependency 'PINRemoteImage/Core'
-    tvos.frameworks = 'UIKit'
+    tvos.dependency 'PINRemoteImage/iOS'
   end
 
   s.subspec "FLAnimatedImage" do |fs|