Skip to content

Commit d9be311

Browse files
AliSoftwareAliSoftware
committed
Merge branch 'tvos'
2 parents 6631c08 + d8cd6fc commit d9be311

File tree

93 files changed

+4354
-4154
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+4354
-4154
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode7
2+
osx_image: xcode7.1
33

44
before_install:
55
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
@@ -10,6 +10,7 @@ env:
1010
- RAKETASK="ios[iOS StaticLib,latest,test]"
1111
- RAKETASK="ios[iOS Framework,latest,test]"
1212
- RAKETASK="osx[Mac Framework,x86_64,test]"
13+
- RAKETASK="tvos[tvOS Framework,latest,test]"
1314

1415
script:
1516
- rake "$RAKETASK"

‎OHHTTPStubs.podspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Pod::Spec.new do |s|
3131
s.ios.deployment_target = '5.0'
3232
s.osx.deployment_target = '10.7'
3333
s.watchos.deployment_target = '2.0'
34+
s.tvos.deployment_target = '9.0'
3435

3536
s.default_subspec = 'Default'
3637

‎OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj‎

Lines changed: 349 additions & 5 deletions
Large diffs are not rendered by default.

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

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0710"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "EAA4368D1BE1598D000E9E99"
18+
BuildableName = "OHHTTPStubs.framework"
19+
BlueprintName = "OHHTTPStubs tvOS Framework"
20+
ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "NO"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "EA100AB61BE15BE400129352"
32+
BuildableName = "OHHTTPStubs tvOS Fmk Tests.xctest"
33+
BlueprintName = "OHHTTPStubs tvOS Fmk Tests"
34+
ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
</BuildActionEntries>
38+
</BuildAction>
39+
<TestAction
40+
buildConfiguration = "Debug"
41+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
42+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<Testables>
45+
<TestableReference
46+
skipped = "NO">
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "EA100AB61BE15BE400129352"
50+
BuildableName = "OHHTTPStubs tvOS Fmk Tests.xctest"
51+
BlueprintName = "OHHTTPStubs tvOS Fmk Tests"
52+
ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
53+
</BuildableReference>
54+
</TestableReference>
55+
</Testables>
56+
<MacroExpansion>
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "EAA4368D1BE1598D000E9E99"
60+
BuildableName = "OHHTTPStubs.framework"
61+
BlueprintName = "OHHTTPStubs tvOS Framework"
62+
ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
63+
</BuildableReference>
64+
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
67+
</TestAction>
68+
<LaunchAction
69+
buildConfiguration = "Debug"
70+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
71+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
72+
launchStyle = "0"
73+
useCustomWorkingDirectory = "NO"
74+
ignoresPersistentStateOnLaunch = "NO"
75+
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
77+
allowLocationSimulation = "YES">
78+
<MacroExpansion>
79+
<BuildableReference
80+
BuildableIdentifier = "primary"
81+
BlueprintIdentifier = "EAA4368D1BE1598D000E9E99"
82+
BuildableName = "OHHTTPStubs.framework"
83+
BlueprintName = "OHHTTPStubs tvOS Framework"
84+
ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
85+
</BuildableReference>
86+
</MacroExpansion>
87+
<AdditionalOptions>
88+
</AdditionalOptions>
89+
</LaunchAction>
90+
<ProfileAction
91+
buildConfiguration = "Release"
92+
shouldUseLaunchSchemeArgsEnv = "YES"
93+
savedToolIdentifier = ""
94+
useCustomWorkingDirectory = "NO"
95+
debugDocumentVersioning = "YES">
96+
<MacroExpansion>
97+
<BuildableReference
98+
BuildableIdentifier = "primary"
99+
BlueprintIdentifier = "EAA4368D1BE1598D000E9E99"
100+
BuildableName = "OHHTTPStubs.framework"
101+
BlueprintName = "OHHTTPStubs tvOS Framework"
102+
ReferencedContainer = "container:OHHTTPStubs.xcodeproj">
103+
</BuildableReference>
104+
</MacroExpansion>
105+
</ProfileAction>
106+
<AnalyzeAction
107+
buildConfiguration = "Debug">
108+
</AnalyzeAction>
109+
<ArchiveAction
110+
buildConfiguration = "Release"
111+
revealArchiveInOrganizer = "YES">
112+
</ArchiveAction>
113+
</Scheme>

‎OHHTTPStubs/OHHTTPStubs.xcworkspace/contents.xcworkspacedata‎

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OHHTTPStubs/Podfile‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,26 @@ source 'https://github.com/CocoaPods/Specs.git'
33
xcodeproj 'OHHTTPStubs.xcodeproj'
44
inhibit_all_warnings!
55

6+
def pod_afnetworking
7+
pod 'AFNetworking', :git => 'https://github.com/AFNetworking/AFNetworking.git', :branch => '3_0_0_branch'
8+
end
9+
610
target 'OHHTTPStubs iOS Lib Tests' do
7-
platform :ios, '6.0'
8-
pod 'AFNetworking', '2.5.0'
11+
platform :ios, '7.0'
12+
pod_afnetworking
913
end
1014

1115
target 'OHHTTPStubs iOS Fmk Tests' do
1216
platform :ios, '8.0'
13-
pod 'AFNetworking', '2.5.0'
17+
pod_afnetworking
1418
end
1519

1620
target 'OHHTTPStubs Mac Tests' do
17-
platform :osx, '10.8'
18-
pod 'AFNetworking', '2.5.0'
21+
platform :osx, '10.9'
22+
pod_afnetworking
23+
end
24+
25+
target 'OHHTTPStubs tvOS Fmk Tests' do
26+
platform :tvos, '9.0'
27+
pod_afnetworking
1928
end

‎OHHTTPStubs/Podfile.lock‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,35 @@
11
PODS:
2-
- AFNetworking (2.5.0):
3-
- AFNetworking/NSURLConnection (= 2.5.0)
4-
- AFNetworking/NSURLSession (= 2.5.0)
5-
- AFNetworking/Reachability (= 2.5.0)
6-
- AFNetworking/Security (= 2.5.0)
7-
- AFNetworking/Serialization (= 2.5.0)
8-
- AFNetworking/UIKit (= 2.5.0)
9-
- AFNetworking/NSURLConnection (2.5.0):
2+
- AFNetworking (3.0.0-beta.1):
3+
- AFNetworking/NSURLSession (= 3.0.0-beta.1)
4+
- AFNetworking/Reachability (= 3.0.0-beta.1)
5+
- AFNetworking/Security (= 3.0.0-beta.1)
6+
- AFNetworking/Serialization (= 3.0.0-beta.1)
7+
- AFNetworking/UIKit (= 3.0.0-beta.1)
8+
- AFNetworking/NSURLSession (3.0.0-beta.1):
109
- AFNetworking/Reachability
1110
- AFNetworking/Security
1211
- AFNetworking/Serialization
13-
- AFNetworking/NSURLSession (2.5.0):
14-
- AFNetworking/Reachability
15-
- AFNetworking/Security
16-
- AFNetworking/Serialization
17-
- AFNetworking/Reachability (2.5.0)
18-
- AFNetworking/Security (2.5.0)
19-
- AFNetworking/Serialization (2.5.0)
20-
- AFNetworking/UIKit (2.5.0):
21-
- AFNetworking/NSURLConnection
12+
- AFNetworking/Reachability (3.0.0-beta.1)
13+
- AFNetworking/Security (3.0.0-beta.1)
14+
- AFNetworking/Serialization (3.0.0-beta.1)
15+
- AFNetworking/UIKit (3.0.0-beta.1):
2216
- AFNetworking/NSURLSession
2317

2418
DEPENDENCIES:
25-
- AFNetworking (= 2.5.0)
19+
- AFNetworking (from `https://github.com/AFNetworking/AFNetworking.git`, branch
20+
`3_0_0_branch`)
21+
22+
EXTERNAL SOURCES:
23+
AFNetworking:
24+
:branch: 3_0_0_branch
25+
:git: https://github.com/AFNetworking/AFNetworking.git
26+
27+
CHECKOUT OPTIONS:
28+
AFNetworking:
29+
:commit: ef7d55b9556707d80af9edd83e504a91f9df2490
30+
:git: https://github.com/AFNetworking/AFNetworking.git
2631

2732
SPEC CHECKSUMS:
28-
AFNetworking: 96ac9bf3eda33582701cb1fcc5b896aa1e20311e
33+
AFNetworking: 1100906802d9479aa0949e8e2cbc1d4e6beba327
2934

3035
COCOAPODS: 0.39.0

‎OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)