Permalink
Browse files

Updates AFNetworking dependency to 3.0 (#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.
  • Loading branch information...
dzenbot authored and SlaunchaMan committed Mar 23, 2018
1 parent 4faefc2 commit 15a767816c74badded8ec554eb202617b7d2c5d9
Showing with 2,622 additions and 163 deletions.
  1. +32 −0 .gitignore
  2. +3 −0 .gitmodules
  3. +50 −0 .travis.yml
  4. +7 −6 AFNetworkActivityLogger.podspec
  5. +1,181 −0 AFNetworkActivityLogger.xcodeproj/project.pbxproj
  6. +7 −0 AFNetworkActivityLogger.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  7. +103 −0 AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger OS X.xcscheme
  8. +104 −0 AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger iOS.xcscheme
  9. +103 −0 AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger tvOS.xcscheme
  10. +82 −0 AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger watchOS.xcscheme
  11. +3 −10 AFNetworkActivityLogger.xcworkspace/contents.xcworkspacedata
  12. +34 −0 AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.h
  13. +90 −0 AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m
  14. +18 −55 AFNetworkActivityLogger/AFNetworkActivityLogger.h
  15. +46 −83 AFNetworkActivityLogger/AFNetworkActivityLogger.m
  16. +92 −0 AFNetworkActivityLogger/AFNetworkActivityLoggerProtocol.h
  17. +1 −0 Cartfile
  18. +1 −0 Cartfile.resolved
  19. +1 −0 Carthage/Checkouts/AFNetworking
  20. +31 −9 README.md
  21. +36 −0 Supporting Files/AFNetworkActivityLogger.h
  22. +26 −0 Supporting Files/Info.plist
  23. +16 −0 Supporting Files/modulemap.module
  24. +269 −0 Tests/AFNetworkActivityLoggerTests.m
  25. +24 −0 Tests/Info.plist
  26. +5 −0 fastlane/.env
  27. +10 −0 fastlane/.env.default
  28. +3 −0 fastlane/.env.ios10_xcode8
  29. +3 −0 fastlane/.env.ios11_xcode9
  30. +3 −0 fastlane/.env.ios8_xcode7
  31. +3 −0 fastlane/.env.ios9_xcode7
  32. +3 −0 fastlane/.env.osx
  33. +3 −0 fastlane/.env.tvos11_xcode9
  34. +4 −0 fastlane/Fastfile
  35. +225 −0 fastlane/README.md
View
@@ -0,0 +1,32 @@
# Created by https://www.gitignore.io/api/xcode
### Xcode ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
.DS_Store
## Build generated
#build/
DerivedData
## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
## Other
*.xccheckout
*.moved-aside
*.xcuserstate
# Fastlane
/fastlane/report.xml
/fastlane/.env*private*
fastlane/test-output/*
Carthage/Build
View
@@ -0,0 +1,3 @@
[submodule "Carthage/Checkouts/AFNetworking"]
url = https://github.com/AFNetworking/AFNetworking.git
path = Carthage/Checkouts/AFNetworking
View
@@ -0,0 +1,50 @@
language: objective-c
osx_image: xcode7.1
sudo: false
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8
- FASTLANE_LANE=test_framework
matrix:
include:
- osx_image: xcode9.2
env: FASTLANE_LANE=code_coverage FASTLANE_ENV=default
- osx_image: xcode9.2
env: FASTLANE_ENV=ios11_xcode9
- osx_image: xcode9.2
env: FASTLANE_ENV=tvos11_xcode9
- osx_image: xcode9.2
env: FASTLANE_ENV=osx
- osx_image: xcode8.3
env: FASTLANE_ENV=ios10_xcode8
- osx_image: xcode7.3
env: FASTLANE_ENV=ios9_xcode7
- osx_image: xcode7.3
env: FASTLANE_ENV=ios8_xcode7
before_install:
# Force bundler 1.12.5 because version 1.13 has issues, see https://github.com/fastlane/fastlane/issues/6065#issuecomment-246044617
- gem uninstall bundler -v '>1.12.5' --force --executables || echo "bundler >1.12.5 is not installed"
- gem install bundler -v 1.12.5 --no-rdoc --no-ri --no-document --quiet
- gem install fastlane --no-rdoc --no-ri --no-document --quiet
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
script:
- set -o pipefail
- carthage build
- fastlane $FASTLANE_LANE configuration:Debug --env $FASTLANE_ENV
- fastlane $FASTLANE_LANE configuration:Release --env $FASTLANE_ENV
after_success:
- if [ "$FASTLANE_LANE" == "code_coverage" ]; then
bash <(curl -s https://codecov.io/bash);
fi
after_failure:
- cat -n ~/Library/Logs/scan/*
- cat -n $TMPDIR/com.apple.dt.XCTest-status/Session*.log
- cat -n ~/Library/Logs/DiagnosticReports/xctest*.crash
# deploy:
# provider: script
# script: fastlane complete_framework_release --env deploy
# on:
# tags: true
@@ -1,16 +1,17 @@
Pod::Spec.new do |s|
s.name = 'AFNetworkActivityLogger'
s.version = '2.0.4'
s.version = '3.0.0'
s.license = 'MIT'
s.summary = 'AFNetworking 2.0 Extension for Network Request Logging'
s.summary = 'AFNetworking 3.0 Extension for Network Request Logging'
s.homepage = 'https://github.com/AFNetworking/AFNetworkActivityLogger'
s.authors = { 'Mattt Thompson' => 'm@mattt.me' }
s.source = { :git => 'https://github.com/AFNetworking/AFNetworkActivityLogger.git', :tag => s.version }
s.source_files = 'AFNetworkActivityLogger'
s.requires_arc = true
s.ios.deployment_target = '6.0'
s.osx.deployment_target = '10.8'
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.watchos.deployment_target = '2.0'
s.tvos.deployment_target = '9.0'
s.dependency 'AFNetworking/NSURLSession', '~> 2.0'
s.dependency 'AFNetworking/NSURLConnection', '~> 2.0'
s.dependency 'AFNetworking/NSURLSession', '~> 3.0'
end

Large diffs are not rendered by default.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29D77AA11BCC49C9005B1EF5"
BuildableName = "AFNetworkActivityLogger.framework"
BlueprintName = "AFNetworkActivityLogger OS X"
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
enableThreadSanitizer = "YES"
enableUBSanitizer = "YES"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29F28C3B1C1F2C54006BD785"
BuildableName = "AFNetworkActivityLoggerTests OS X Tests.xctest"
BlueprintName = "AFNetworkActivityLoggerTests OS X Tests"
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29D77AA11BCC49C9005B1EF5"
BuildableName = "AFNetworkActivityLogger.framework"
BlueprintName = "AFNetworkActivityLogger OS X"
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29D77AA11BCC49C9005B1EF5"
BuildableName = "AFNetworkActivityLogger.framework"
BlueprintName = "AFNetworkActivityLogger OS X"
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29D77AA11BCC49C9005B1EF5"
BuildableName = "AFNetworkActivityLogger.framework"
BlueprintName = "AFNetworkActivityLogger OS X"
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29D96E641BCC34CD00F571A5"
BuildableName = "AFNetworkActivityLogger.framework"
BlueprintName = "AFNetworkActivityLogger iOS"
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
enableThreadSanitizer = "YES"
enableUBSanitizer = "YES"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "297DF5801C1F1CA2001FA807"
BuildableName = "AFNetworkActivityLoggerTests iOS Tests.xctest"
BlueprintName = "AFNetworkActivityLoggerTests iOS Tests"
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29D96E641BCC34CD00F571A5"
BuildableName = "AFNetworkActivityLogger.framework"
BlueprintName = "AFNetworkActivityLogger iOS"
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29D96E641BCC34CD00F571A5"
BuildableName = "AFNetworkActivityLogger.framework"
BlueprintName = "AFNetworkActivityLogger iOS"
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29D96E641BCC34CD00F571A5"
BuildableName = "AFNetworkActivityLogger.framework"
BlueprintName = "AFNetworkActivityLogger iOS"
ReferencedContainer = "container:AFNetworkActivityLogger.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Oops, something went wrong.

0 comments on commit 15a7678

Please sign in to comment.