Skip to content
This repository was archived by the owner on Jan 17, 2023. It is now read-only.

Commit 542a876

Browse files
kcharwoodkcharwood
committed
Merge pull request #110 from AFNetworking/3_0_0_branch
3.0.0
2 parents 9dfe990 + 494ec25 commit 542a876

File tree

115 files changed

+27575
-449
lines changed

Some content is hidden

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

115 files changed

+27575
-449
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
77
.DS_Store
88
## Build generated
9-
build/
109
DerivedData
1110

1211
## Various settings
@@ -25,3 +24,6 @@ xcuserdata
2524
*.moved-aside
2625
*.xcuserstate
2726

27+
fastlane/test-output/*
28+
fastlane/report.xml
29+

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Carthage/Checkouts/AFNetworking"]
2+
path = Carthage/Checkouts/AFNetworking
3+
url = https://github.com/AFNetworking/AFNetworking.git

‎.travis.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
language: objective-c
2+
osx_image: xcode7.1
3+
sudo: false
4+
env:
5+
global:
6+
- LC_CTYPE=en_US.UTF-8
7+
- LANG=en_US.UTF-8
8+
- FASTLANE_LANE=test_framework
9+
matrix:
10+
include:
11+
- osx_image: xcode7.3
12+
env: FASTLANE_LANE=code_coverage FASTLANE_ENV=default
13+
- osx_image: xcode7.3
14+
env: FASTLANE_ENV=ios82
15+
- osx_image: xcode7.3
16+
env: FASTLANE_ENV=ios83
17+
- osx_image: xcode7.3
18+
env: FASTLANE_ENV=ios84
19+
- osx_image: xcode7.3
20+
env: FASTLANE_ENV=ios92
21+
- osx_image: xcode7.3
22+
env: FASTLANE_ENV=ios93
23+
- osx_image: xcode7.3
24+
env: FASTLANE_ENV=tvos91
25+
- osx_image: xcode7.3
26+
env: FASTLANE_ENV=osx
27+
- osx_image: xcode7.1
28+
env: FASTLANE_ENV=ios91_xcode71
29+
- osx_image: xcode7.1
30+
env: FASTLANE_ENV=tvos90_xcode71
31+
- osx_image: xcode7
32+
env: FASTLANE_ENV=ios81_xcode7
33+
- osx_image: xcode7
34+
env: FASTLANE_ENV=ios90_xcode7
35+
before_install:
36+
- gem install fastlane --no-rdoc --no-ri --no-document --quiet
37+
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
38+
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
39+
script:
40+
- set -o pipefail
41+
- fastlane $FASTLANE_LANE configuration:Debug --env $FASTLANE_ENV
42+
- fastlane $FASTLANE_LANE configuration:Release --env $FASTLANE_ENV
43+
after_success:
44+
- if [ "$FASTLANE_LANE" == "code_coverage" ]; then
45+
bash <(curl -s https://codecov.io/bash);
46+
fi
47+
after_failure:
48+
- cat -n ~/Library/Logs/scan/*
49+
- cat -n $TMPDIR/com.apple.dt.XCTest-status/Session*.log
50+
- cat -n ~/Library/Logs/DiagnosticReports/xctest*.crash
51+
# deploy:
52+
# provider: script
53+
# script: fastlane complete_framework_release --env deploy
54+
# on:
55+
# tags: true

‎AFOAuth2Manager.podspec

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'AFOAuth2Manager'
3-
s.version = '2.2.1'
3+
s.version = '3.0.0'
44
s.license = 'MIT'
55
s.summary = 'AFNetworking Extension for OAuth 2 Authentication.'
66
s.homepage = 'https://github.com/AFNetworking/AFOAuth2Manager'
@@ -11,10 +11,12 @@ Pod::Spec.new do |s|
1111
s.source_files = 'AFOAuth2Manager'
1212
s.requires_arc = true
1313

14-
s.ios.deployment_target = '6.0'
15-
s.osx.deployment_target = '10.8'
14+
s.ios.deployment_target = '7.0'
15+
s.osx.deployment_target = '10.9'
16+
s.tvos.deployment_target = '9.0'
17+
s.watchos.deployment_target = '2.0'
1618

17-
s.dependency 'AFNetworking/NSURLConnection', '~>2.2'
19+
s.dependency 'AFNetworking/NSURLSession', '~>3.0'
1820

1921
s.ios.frameworks = 'Security'
2022
end

‎AFOAuth2Manager.xcodeproj/project.pbxproj

Lines changed: 1087 additions & 0 deletions
Large diffs are not rendered by default.

‎AFOAuth2Manager.xcodeproj/project.xcworkspace/contents.xcworkspacedata

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

‎AFOAuth2Manager.xcodeproj/xcshareddata/xcschemes/AFOAuth2Manager OS X.xcscheme

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
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 = "2934F3431C161603008B8AE4"
18+
BuildableName = "AFOAuth2Manager.framework"
19+
BlueprintName = "AFOAuth2Manager OS X"
20+
ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<Testables>
32+
<TestableReference
33+
skipped = "NO">
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "2934F3551C161652008B8AE4"
37+
BuildableName = "AFOAuth2Manager OS X Tests.xctest"
38+
BlueprintName = "AFOAuth2Manager OS X Tests"
39+
ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
40+
</BuildableReference>
41+
</TestableReference>
42+
</Testables>
43+
<MacroExpansion>
44+
<BuildableReference
45+
BuildableIdentifier = "primary"
46+
BlueprintIdentifier = "2934F3431C161603008B8AE4"
47+
BuildableName = "AFOAuth2Manager.framework"
48+
BlueprintName = "AFOAuth2Manager OS X"
49+
ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
50+
</BuildableReference>
51+
</MacroExpansion>
52+
<AdditionalOptions>
53+
</AdditionalOptions>
54+
</TestAction>
55+
<LaunchAction
56+
buildConfiguration = "Debug"
57+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
58+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
launchStyle = "0"
60+
useCustomWorkingDirectory = "NO"
61+
ignoresPersistentStateOnLaunch = "NO"
62+
debugDocumentVersioning = "YES"
63+
debugServiceExtension = "internal"
64+
allowLocationSimulation = "YES">
65+
<MacroExpansion>
66+
<BuildableReference
67+
BuildableIdentifier = "primary"
68+
BlueprintIdentifier = "2934F3431C161603008B8AE4"
69+
BuildableName = "AFOAuth2Manager.framework"
70+
BlueprintName = "AFOAuth2Manager OS X"
71+
ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
72+
</BuildableReference>
73+
</MacroExpansion>
74+
<AdditionalOptions>
75+
</AdditionalOptions>
76+
</LaunchAction>
77+
<ProfileAction
78+
buildConfiguration = "Release"
79+
shouldUseLaunchSchemeArgsEnv = "YES"
80+
savedToolIdentifier = ""
81+
useCustomWorkingDirectory = "NO"
82+
debugDocumentVersioning = "YES">
83+
<MacroExpansion>
84+
<BuildableReference
85+
BuildableIdentifier = "primary"
86+
BlueprintIdentifier = "2934F3431C161603008B8AE4"
87+
BuildableName = "AFOAuth2Manager.framework"
88+
BlueprintName = "AFOAuth2Manager OS X"
89+
ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
90+
</BuildableReference>
91+
</MacroExpansion>
92+
</ProfileAction>
93+
<AnalyzeAction
94+
buildConfiguration = "Debug">
95+
</AnalyzeAction>
96+
<ArchiveAction
97+
buildConfiguration = "Release"
98+
revealArchiveInOrganizer = "YES">
99+
</ArchiveAction>
100+
</Scheme>

‎AFOAuth2Manager.xcodeproj/xcshareddata/xcschemes/AFOAuth2Manager iOS.xcscheme

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
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 = "29490FC41BE11BD700893BE1"
18+
BuildableName = "AFOAuth2Manager.framework"
19+
BlueprintName = "AFOAuth2Manager iOS"
20+
ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<Testables>
32+
<TestableReference
33+
skipped = "NO">
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "2934F2CA1C15F373008B8AE4"
37+
BuildableName = "AFOAuth2Manager iOS Tests.xctest"
38+
BlueprintName = "AFOAuth2Manager iOS Tests"
39+
ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
40+
</BuildableReference>
41+
</TestableReference>
42+
</Testables>
43+
<MacroExpansion>
44+
<BuildableReference
45+
BuildableIdentifier = "primary"
46+
BlueprintIdentifier = "29490FC41BE11BD700893BE1"
47+
BuildableName = "AFOAuth2Manager.framework"
48+
BlueprintName = "AFOAuth2Manager iOS"
49+
ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
50+
</BuildableReference>
51+
</MacroExpansion>
52+
<AdditionalOptions>
53+
</AdditionalOptions>
54+
</TestAction>
55+
<LaunchAction
56+
buildConfiguration = "Debug"
57+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
58+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
launchStyle = "0"
60+
useCustomWorkingDirectory = "NO"
61+
ignoresPersistentStateOnLaunch = "NO"
62+
debugDocumentVersioning = "YES"
63+
debugServiceExtension = "internal"
64+
allowLocationSimulation = "YES">
65+
<MacroExpansion>
66+
<BuildableReference
67+
BuildableIdentifier = "primary"
68+
BlueprintIdentifier = "29490FC41BE11BD700893BE1"
69+
BuildableName = "AFOAuth2Manager.framework"
70+
BlueprintName = "AFOAuth2Manager iOS"
71+
ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
72+
</BuildableReference>
73+
</MacroExpansion>
74+
<AdditionalOptions>
75+
</AdditionalOptions>
76+
</LaunchAction>
77+
<ProfileAction
78+
buildConfiguration = "Release"
79+
shouldUseLaunchSchemeArgsEnv = "YES"
80+
savedToolIdentifier = ""
81+
useCustomWorkingDirectory = "NO"
82+
debugDocumentVersioning = "YES">
83+
<MacroExpansion>
84+
<BuildableReference
85+
BuildableIdentifier = "primary"
86+
BlueprintIdentifier = "29490FC41BE11BD700893BE1"
87+
BuildableName = "AFOAuth2Manager.framework"
88+
BlueprintName = "AFOAuth2Manager iOS"
89+
ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
90+
</BuildableReference>
91+
</MacroExpansion>
92+
</ProfileAction>
93+
<AnalyzeAction
94+
buildConfiguration = "Debug">
95+
</AnalyzeAction>
96+
<ArchiveAction
97+
buildConfiguration = "Release"
98+
revealArchiveInOrganizer = "YES">
99+
</ArchiveAction>
100+
</Scheme>

0 commit comments

Comments
 (0)