Skip to content

Commit 15a7678

Browse files
dzenbotSlaunchaMan
dzenbot
authored and
SlaunchaMan
committed
Updates AFNetworking dependency to 3.0 (AFNetworking#38)
* Updating project for 3.0 * Cleaned up repo structure * Refactored for more scalable logging Added unit tests Added travis support Updated documentation * Added watchOS and tvOS support to podspec * Fixed travis fastlane * Updated travis to run on Xcode 7.3 * Removed AFNetworking from being directly checked in * Converted to using a Submodule for the AF dependency * Add setLogLevel method. Cleanup Carthage integration. * Update Fastlane configuration. * Update Fastlane documentation. * Update Fastlane environments. * Perform recommended Xcode changes. * Update copyright. * Update Carthage checkout. * More environment updates * Bump Fastfile import version. * Attempt to fix Fastlane error. * Remove beta Xcode content. * Synchronize with main AFNetworking travis.yml * Update environments. * Build AFNetworking first.
1 parent 4faefc2 commit 15a7678

35 files changed

+2622
-163
lines changed

‎.gitignore

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Created by https://www.gitignore.io/api/xcode
2+
3+
### Xcode ###
4+
# Xcode
5+
#
6+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
7+
.DS_Store
8+
## Build generated
9+
#build/
10+
DerivedData
11+
12+
## Various settings
13+
*.pbxuser
14+
!default.pbxuser
15+
*.mode1v3
16+
!default.mode1v3
17+
*.mode2v3
18+
!default.mode2v3
19+
*.perspectivev3
20+
!default.perspectivev3
21+
xcuserdata
22+
23+
## Other
24+
*.xccheckout
25+
*.moved-aside
26+
*.xcuserstate
27+
28+
# Fastlane
29+
/fastlane/report.xml
30+
/fastlane/.env*private*
31+
fastlane/test-output/*
32+
Carthage/Build

‎.gitmodules

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

‎.travis.yml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
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+
- LANGUAGE=en_US.UTF-8
9+
- FASTLANE_LANE=test_framework
10+
matrix:
11+
include:
12+
- osx_image: xcode9.2
13+
env: FASTLANE_LANE=code_coverage FASTLANE_ENV=default
14+
- osx_image: xcode9.2
15+
env: FASTLANE_ENV=ios11_xcode9
16+
- osx_image: xcode9.2
17+
env: FASTLANE_ENV=tvos11_xcode9
18+
- osx_image: xcode9.2
19+
env: FASTLANE_ENV=osx
20+
- osx_image: xcode8.3
21+
env: FASTLANE_ENV=ios10_xcode8
22+
- osx_image: xcode7.3
23+
env: FASTLANE_ENV=ios9_xcode7
24+
- osx_image: xcode7.3
25+
env: FASTLANE_ENV=ios8_xcode7
26+
before_install:
27+
# Force bundler 1.12.5 because version 1.13 has issues, see https://github.com/fastlane/fastlane/issues/6065#issuecomment-246044617
28+
- gem uninstall bundler -v '>1.12.5' --force --executables || echo "bundler >1.12.5 is not installed"
29+
- gem install bundler -v 1.12.5 --no-rdoc --no-ri --no-document --quiet
30+
- gem install fastlane --no-rdoc --no-ri --no-document --quiet
31+
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
32+
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
33+
script:
34+
- set -o pipefail
35+
- carthage build
36+
- fastlane $FASTLANE_LANE configuration:Debug --env $FASTLANE_ENV
37+
- fastlane $FASTLANE_LANE configuration:Release --env $FASTLANE_ENV
38+
after_success:
39+
- if [ "$FASTLANE_LANE" == "code_coverage" ]; then
40+
bash <(curl -s https://codecov.io/bash);
41+
fi
42+
after_failure:
43+
- cat -n ~/Library/Logs/scan/*
44+
- cat -n $TMPDIR/com.apple.dt.XCTest-status/Session*.log
45+
- cat -n ~/Library/Logs/DiagnosticReports/xctest*.crash
46+
# deploy:
47+
# provider: script
48+
# script: fastlane complete_framework_release --env deploy
49+
# on:
50+
# tags: true

‎AFNetworkActivityLogger.podspec

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
Pod::Spec.new do |s|
22
s.name = 'AFNetworkActivityLogger'
3-
s.version = '2.0.4'
3+
s.version = '3.0.0'
44
s.license = 'MIT'
5-
s.summary = 'AFNetworking 2.0 Extension for Network Request Logging'
5+
s.summary = 'AFNetworking 3.0 Extension for Network Request Logging'
66
s.homepage = 'https://github.com/AFNetworking/AFNetworkActivityLogger'
77
s.authors = { 'Mattt Thompson' => '[email protected]' }
88
s.source = { :git => 'https://github.com/AFNetworking/AFNetworkActivityLogger.git', :tag => s.version }
99
s.source_files = 'AFNetworkActivityLogger'
1010
s.requires_arc = true
11-
s.ios.deployment_target = '6.0'
12-
s.osx.deployment_target = '10.8'
11+
s.ios.deployment_target = '7.0'
12+
s.osx.deployment_target = '10.9'
13+
s.watchos.deployment_target = '2.0'
14+
s.tvos.deployment_target = '9.0'
1315

14-
s.dependency 'AFNetworking/NSURLSession', '~> 2.0'
15-
s.dependency 'AFNetworking/NSURLConnection', '~> 2.0'
16+
s.dependency 'AFNetworking/NSURLSession', '~> 3.0'
1617
end

‎AFNetworkActivityLogger.xcodeproj/project.pbxproj

+1,181
Large diffs are not rendered by default.

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

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+103
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0920"
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 = "29D77AA11BCC49C9005B1EF5"
18+
BuildableName = "AFNetworkActivityLogger.framework"
19+
BlueprintName = "AFNetworkActivityLogger OS X"
20+
ReferencedContainer = "container:AFNetworkActivityLogger.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+
enableThreadSanitizer = "YES"
30+
enableUBSanitizer = "YES"
31+
language = ""
32+
shouldUseLaunchSchemeArgsEnv = "YES">
33+
<Testables>
34+
<TestableReference
35+
skipped = "NO">
36+
<BuildableReference
37+
BuildableIdentifier = "primary"
38+
BlueprintIdentifier = "29F28C3B1C1F2C54006BD785"
39+
BuildableName = "AFNetworkActivityLoggerTests OS X Tests.xctest"
40+
BlueprintName = "AFNetworkActivityLoggerTests OS X Tests"
41+
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
42+
</BuildableReference>
43+
</TestableReference>
44+
</Testables>
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "29D77AA11BCC49C9005B1EF5"
49+
BuildableName = "AFNetworkActivityLogger.framework"
50+
BlueprintName = "AFNetworkActivityLogger OS X"
51+
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</TestAction>
57+
<LaunchAction
58+
buildConfiguration = "Debug"
59+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
60+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
61+
language = ""
62+
launchStyle = "0"
63+
useCustomWorkingDirectory = "NO"
64+
ignoresPersistentStateOnLaunch = "NO"
65+
debugDocumentVersioning = "YES"
66+
debugServiceExtension = "internal"
67+
allowLocationSimulation = "YES">
68+
<MacroExpansion>
69+
<BuildableReference
70+
BuildableIdentifier = "primary"
71+
BlueprintIdentifier = "29D77AA11BCC49C9005B1EF5"
72+
BuildableName = "AFNetworkActivityLogger.framework"
73+
BlueprintName = "AFNetworkActivityLogger OS X"
74+
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
75+
</BuildableReference>
76+
</MacroExpansion>
77+
<AdditionalOptions>
78+
</AdditionalOptions>
79+
</LaunchAction>
80+
<ProfileAction
81+
buildConfiguration = "Release"
82+
shouldUseLaunchSchemeArgsEnv = "YES"
83+
savedToolIdentifier = ""
84+
useCustomWorkingDirectory = "NO"
85+
debugDocumentVersioning = "YES">
86+
<MacroExpansion>
87+
<BuildableReference
88+
BuildableIdentifier = "primary"
89+
BlueprintIdentifier = "29D77AA11BCC49C9005B1EF5"
90+
BuildableName = "AFNetworkActivityLogger.framework"
91+
BlueprintName = "AFNetworkActivityLogger OS X"
92+
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
93+
</BuildableReference>
94+
</MacroExpansion>
95+
</ProfileAction>
96+
<AnalyzeAction
97+
buildConfiguration = "Debug">
98+
</AnalyzeAction>
99+
<ArchiveAction
100+
buildConfiguration = "Release"
101+
revealArchiveInOrganizer = "YES">
102+
</ArchiveAction>
103+
</Scheme>

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

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0920"
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 = "29D96E641BCC34CD00F571A5"
18+
BuildableName = "AFNetworkActivityLogger.framework"
19+
BlueprintName = "AFNetworkActivityLogger iOS"
20+
ReferencedContainer = "container:AFNetworkActivityLogger.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+
enableThreadSanitizer = "YES"
30+
enableUBSanitizer = "YES"
31+
language = ""
32+
shouldUseLaunchSchemeArgsEnv = "YES"
33+
codeCoverageEnabled = "YES">
34+
<Testables>
35+
<TestableReference
36+
skipped = "NO">
37+
<BuildableReference
38+
BuildableIdentifier = "primary"
39+
BlueprintIdentifier = "297DF5801C1F1CA2001FA807"
40+
BuildableName = "AFNetworkActivityLoggerTests iOS Tests.xctest"
41+
BlueprintName = "AFNetworkActivityLoggerTests iOS Tests"
42+
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
43+
</BuildableReference>
44+
</TestableReference>
45+
</Testables>
46+
<MacroExpansion>
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "29D96E641BCC34CD00F571A5"
50+
BuildableName = "AFNetworkActivityLogger.framework"
51+
BlueprintName = "AFNetworkActivityLogger iOS"
52+
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
53+
</BuildableReference>
54+
</MacroExpansion>
55+
<AdditionalOptions>
56+
</AdditionalOptions>
57+
</TestAction>
58+
<LaunchAction
59+
buildConfiguration = "Debug"
60+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
61+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
62+
language = ""
63+
launchStyle = "0"
64+
useCustomWorkingDirectory = "NO"
65+
ignoresPersistentStateOnLaunch = "NO"
66+
debugDocumentVersioning = "YES"
67+
debugServiceExtension = "internal"
68+
allowLocationSimulation = "YES">
69+
<MacroExpansion>
70+
<BuildableReference
71+
BuildableIdentifier = "primary"
72+
BlueprintIdentifier = "29D96E641BCC34CD00F571A5"
73+
BuildableName = "AFNetworkActivityLogger.framework"
74+
BlueprintName = "AFNetworkActivityLogger iOS"
75+
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
76+
</BuildableReference>
77+
</MacroExpansion>
78+
<AdditionalOptions>
79+
</AdditionalOptions>
80+
</LaunchAction>
81+
<ProfileAction
82+
buildConfiguration = "Release"
83+
shouldUseLaunchSchemeArgsEnv = "YES"
84+
savedToolIdentifier = ""
85+
useCustomWorkingDirectory = "NO"
86+
debugDocumentVersioning = "YES">
87+
<MacroExpansion>
88+
<BuildableReference
89+
BuildableIdentifier = "primary"
90+
BlueprintIdentifier = "29D96E641BCC34CD00F571A5"
91+
BuildableName = "AFNetworkActivityLogger.framework"
92+
BlueprintName = "AFNetworkActivityLogger iOS"
93+
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
94+
</BuildableReference>
95+
</MacroExpansion>
96+
</ProfileAction>
97+
<AnalyzeAction
98+
buildConfiguration = "Debug">
99+
</AnalyzeAction>
100+
<ArchiveAction
101+
buildConfiguration = "Release"
102+
revealArchiveInOrganizer = "YES">
103+
</ArchiveAction>
104+
</Scheme>

0 commit comments

Comments
 (0)