Merge pull request #1 from AFNetworking/master

Update master
AFNetworking · Jul 11, 2019 · 146bfa1 · 146bfa1
2 parents 9dfe990 + cafa193
commit 146bfa1
Show file tree

Hide file tree

Showing 116 changed files with 27,598 additions and 450 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 .DS_Store
 ## Build generated
-build/
 DerivedData
 
 ## Various settings
@@ -25,3 +24,6 @@ xcuserdata
 *.moved-aside
 *.xcuserstate
 
+fastlane/test-output/*
+fastlane/report.xml
+
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Carthage/Checkouts/AFNetworking"]
+	path = Carthage/Checkouts/AFNetworking
+	url = https://github.com/AFNetworking/AFNetworking.git
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,55 @@
+language: objective-c
+osx_image: xcode7.1
+sudo: false
+env:
+  global:
+  - LC_CTYPE=en_US.UTF-8
+  - LANG=en_US.UTF-8
+  - FASTLANE_LANE=test_framework
+matrix:
+  include:
+    - osx_image: xcode7.3
+      env: FASTLANE_LANE=code_coverage FASTLANE_ENV=default
+    - osx_image: xcode7.3
+      env: FASTLANE_ENV=ios82
+    - osx_image: xcode7.3
+      env: FASTLANE_ENV=ios83
+    - osx_image: xcode7.3
+      env: FASTLANE_ENV=ios84
+    - osx_image: xcode7.3
+      env: FASTLANE_ENV=ios92
+    - osx_image: xcode7.3
+      env: FASTLANE_ENV=ios93
+    - osx_image: xcode7.3
+      env: FASTLANE_ENV=tvos91	  
+    - osx_image: xcode7.3
+      env: FASTLANE_ENV=osx
+    - osx_image: xcode7.1
+      env: FASTLANE_ENV=ios91_xcode71	  
+    - osx_image: xcode7.1
+      env: FASTLANE_ENV=tvos90_xcode71
+    - osx_image: xcode7
+      env: FASTLANE_ENV=ios81_xcode7	  
+    - osx_image: xcode7
+      env: FASTLANE_ENV=ios90_xcode7	  
+before_install:
+  - 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
+  - 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
diff --git a/AFOAuth2Manager.podspec b/AFOAuth2Manager.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AFOAuth2Manager'
-  s.version  = '2.2.1'
+  s.version  = '3.0.0'
   s.license  = 'MIT'
   s.summary  = 'AFNetworking Extension for OAuth 2 Authentication.'
   s.homepage = 'https://github.com/AFNetworking/AFOAuth2Manager'
@@ -11,10 +11,12 @@ Pod::Spec.new do |s|
   s.source_files = 'AFOAuth2Manager'
   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.tvos.deployment_target = '9.0'
+  s.watchos.deployment_target = '2.0'
 
-  s.dependency 'AFNetworking/NSURLConnection', '~>2.2'
+  s.dependency 'AFNetworking/NSURLSession', '~>3.0'
 
   s.ios.frameworks = 'Security'
 end
diff --git a/AFOAuth2Manager.xcodeproj/project.pbxproj b/AFOAuth2Manager.xcodeproj/project.pbxproj
diff --git a/AFOAuth2Manager.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/AFOAuth2Manager.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/AFOAuth2Manager.xcodeproj/xcshareddata/xcschemes/AFOAuth2Manager OS X.xcscheme b/AFOAuth2Manager.xcodeproj/xcshareddata/xcschemes/AFOAuth2Manager OS X.xcscheme
@@ -0,0 +1,100 @@
+<?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 = "2934F3431C161603008B8AE4"
+               BuildableName = "AFOAuth2Manager.framework"
+               BlueprintName = "AFOAuth2Manager OS X"
+               ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2934F3551C161652008B8AE4"
+               BuildableName = "AFOAuth2Manager OS X Tests.xctest"
+               BlueprintName = "AFOAuth2Manager OS X Tests"
+               ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2934F3431C161603008B8AE4"
+            BuildableName = "AFOAuth2Manager.framework"
+            BlueprintName = "AFOAuth2Manager OS X"
+            ReferencedContainer = "container:AFOAuth2Manager.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 = "2934F3431C161603008B8AE4"
+            BuildableName = "AFOAuth2Manager.framework"
+            BlueprintName = "AFOAuth2Manager OS X"
+            ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2934F3431C161603008B8AE4"
+            BuildableName = "AFOAuth2Manager.framework"
+            BlueprintName = "AFOAuth2Manager OS X"
+            ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/AFOAuth2Manager.xcodeproj/xcshareddata/xcschemes/AFOAuth2Manager iOS.xcscheme b/AFOAuth2Manager.xcodeproj/xcshareddata/xcschemes/AFOAuth2Manager iOS.xcscheme
@@ -0,0 +1,100 @@
+<?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 = "29490FC41BE11BD700893BE1"
+               BuildableName = "AFOAuth2Manager.framework"
+               BlueprintName = "AFOAuth2Manager iOS"
+               ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2934F2CA1C15F373008B8AE4"
+               BuildableName = "AFOAuth2Manager iOS Tests.xctest"
+               BlueprintName = "AFOAuth2Manager iOS Tests"
+               ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "29490FC41BE11BD700893BE1"
+            BuildableName = "AFOAuth2Manager.framework"
+            BlueprintName = "AFOAuth2Manager iOS"
+            ReferencedContainer = "container:AFOAuth2Manager.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 = "29490FC41BE11BD700893BE1"
+            BuildableName = "AFOAuth2Manager.framework"
+            BlueprintName = "AFOAuth2Manager iOS"
+            ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "29490FC41BE11BD700893BE1"
+            BuildableName = "AFOAuth2Manager.framework"
+            BlueprintName = "AFOAuth2Manager iOS"
+            ReferencedContainer = "container:AFOAuth2Manager.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>