Merge branch 'tvos'

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7
+osx_image: xcode7.1
 
 before_install:
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
@@ -10,6 +10,7 @@ env:
   - RAKETASK="ios[iOS StaticLib,latest,test]"
   - RAKETASK="ios[iOS Framework,latest,test]"
   - RAKETASK="osx[Mac Framework,x86_64,test]"
+  - RAKETASK="tvos[tvOS Framework,latest,test]"
 
 script:
   - rake "$RAKETASK"

OHHTTPStubs.podspec

@@ -31,6 +31,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '5.0'
   s.osx.deployment_target = '10.7'
   s.watchos.deployment_target = '2.0'
+  s.tvos.deployment_target = '9.0'
 
   s.default_subspec = 'Default'
 

OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs tvOS Framework.xcscheme

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0710"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EAA4368D1BE1598D000E9E99"
+               BuildableName = "OHHTTPStubs.framework"
+               BlueprintName = "OHHTTPStubs tvOS Framework"
+               ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EA100AB61BE15BE400129352"
+               BuildableName = "OHHTTPStubs tvOS Fmk Tests.xctest"
+               BlueprintName = "OHHTTPStubs tvOS Fmk Tests"
+               ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EA100AB61BE15BE400129352"
+               BuildableName = "OHHTTPStubs tvOS Fmk Tests.xctest"
+               BlueprintName = "OHHTTPStubs tvOS Fmk Tests"
+               ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EAA4368D1BE1598D000E9E99"
+            BuildableName = "OHHTTPStubs.framework"
+            BlueprintName = "OHHTTPStubs tvOS Framework"
+            ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EAA4368D1BE1598D000E9E99"
+            BuildableName = "OHHTTPStubs.framework"
+            BlueprintName = "OHHTTPStubs tvOS Framework"
+            ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EAA4368D1BE1598D000E9E99"
+            BuildableName = "OHHTTPStubs.framework"
+            BlueprintName = "OHHTTPStubs tvOS Framework"
+            ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

OHHTTPStubs/Podfile

@@ -3,17 +3,26 @@ source 'https://github.com/CocoaPods/Specs.git'
 xcodeproj 'OHHTTPStubs.xcodeproj'
 inhibit_all_warnings!
 
+def pod_afnetworking
+    pod 'AFNetworking', :git => 'https://github.com/AFNetworking/AFNetworking.git', :branch => '3_0_0_branch'
+end
+
 target 'OHHTTPStubs iOS Lib Tests' do
-    platform :ios, '6.0'
-    pod 'AFNetworking', '2.5.0'
+    platform :ios, '7.0'
+    pod_afnetworking
 end
 
 target 'OHHTTPStubs iOS Fmk Tests' do
     platform :ios, '8.0'
-    pod 'AFNetworking', '2.5.0'
+    pod_afnetworking
 end
 
 target 'OHHTTPStubs Mac Tests' do
-    platform :osx, '10.8'
-    pod 'AFNetworking', '2.5.0'
+    platform :osx, '10.9'
+    pod_afnetworking
+end
+
+target 'OHHTTPStubs tvOS Fmk Tests' do
+    platform :tvos, '9.0'
+    pod_afnetworking
 end

OHHTTPStubs/Podfile.lock

@@ -1,30 +1,35 @@
 PODS:
-  - AFNetworking (2.5.0):
-    - AFNetworking/NSURLConnection (= 2.5.0)
-    - AFNetworking/NSURLSession (= 2.5.0)
-    - AFNetworking/Reachability (= 2.5.0)
-    - AFNetworking/Security (= 2.5.0)
-    - AFNetworking/Serialization (= 2.5.0)
-    - AFNetworking/UIKit (= 2.5.0)
-  - AFNetworking/NSURLConnection (2.5.0):
+  - AFNetworking (3.0.0-beta.1):
+    - AFNetworking/NSURLSession (= 3.0.0-beta.1)
+    - AFNetworking/Reachability (= 3.0.0-beta.1)
+    - AFNetworking/Security (= 3.0.0-beta.1)
+    - AFNetworking/Serialization (= 3.0.0-beta.1)
+    - AFNetworking/UIKit (= 3.0.0-beta.1)
+  - AFNetworking/NSURLSession (3.0.0-beta.1):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/NSURLSession (2.5.0):
-    - AFNetworking/Reachability
-    - AFNetworking/Security
-    - AFNetworking/Serialization
-  - AFNetworking/Reachability (2.5.0)
-  - AFNetworking/Security (2.5.0)
-  - AFNetworking/Serialization (2.5.0)
-  - AFNetworking/UIKit (2.5.0):
-    - AFNetworking/NSURLConnection
+  - AFNetworking/Reachability (3.0.0-beta.1)
+  - AFNetworking/Security (3.0.0-beta.1)
+  - AFNetworking/Serialization (3.0.0-beta.1)
+  - AFNetworking/UIKit (3.0.0-beta.1):
     - AFNetworking/NSURLSession
 
 DEPENDENCIES:
-  - AFNetworking (= 2.5.0)
+  - AFNetworking (from `https://github.com/AFNetworking/AFNetworking.git`, branch
+    `3_0_0_branch`)
+
+EXTERNAL SOURCES:
+  AFNetworking:
+    :branch: 3_0_0_branch
+    :git: https://github.com/AFNetworking/AFNetworking.git
+
+CHECKOUT OPTIONS:
+  AFNetworking:
+    :commit: ef7d55b9556707d80af9edd83e504a91f9df2490
+    :git: https://github.com/AFNetworking/AFNetworking.git
 
 SPEC CHECKSUMS:
-  AFNetworking: 96ac9bf3eda33582701cb1fcc5b896aa1e20311e
+  AFNetworking: 1100906802d9479aa0949e8e2cbc1d4e6beba327
 
 COCOAPODS: 0.39.0