Permalink
Browse files

Merge branch 2.0 into master

  • Loading branch information...
1 parent ce1ebf3 commit 9a40c0dc0f27e9a547fb173a0b1b5a06072e91f9 @mattt mattt committed Sep 25, 2013
Showing with 7,429 additions and 3,659 deletions.
  1. +0 −7 .travis.yml
  2. +49 −24 AFNetworking.podspec
  3. +93 −27 AFNetworking.xcworkspace/contents.xcworkspacedata
  4. +0 −641 AFNetworking/AFHTTPClient.h
  5. +7 −77 AFNetworking/AFHTTPRequestOperation.h
  6. +77 −248 AFNetworking/AFHTTPRequestOperation.m
  7. +276 −0 AFNetworking/AFHTTPRequestOperationManager.h
  8. +235 −0 AFNetworking/AFHTTPRequestOperationManager.m
  9. +234 −0 AFNetworking/AFHTTPSessionManager.h
  10. +315 −0 AFNetworking/AFHTTPSessionManager.m
  11. +0 −113 AFNetworking/AFImageRequestOperation.h
  12. +0 −321 AFNetworking/AFImageRequestOperation.m
  13. +0 −71 AFNetworking/AFJSONRequestOperation.h
  14. +0 −150 AFNetworking/AFJSONRequestOperation.m
  15. +167 −0 AFNetworking/AFNetworkReachabilityManager.h
  16. +224 −0 AFNetworking/AFNetworkReachabilityManager.m
  17. +9 −12 AFNetworking/AFNetworking.h
  18. +0 −68 AFNetworking/AFPropertyListRequestOperation.h
  19. +0 −143 AFNetworking/AFPropertyListRequestOperation.m
  20. +74 −0 AFNetworking/AFSecurityPolicy.h
  21. +214 −0 AFNetworking/AFSecurityPolicy.m
  22. +37 −31 AFNetworking/AFURLConnectionOperation.h
  23. +104 −226 AFNetworking/AFURLConnectionOperation.m
  24. +346 −0 AFNetworking/AFURLRequestSerialization.h
  25. +234 −503 AFNetworking/{AFHTTPClient.m → AFURLRequestSerialization.m}
  26. +258 −0 AFNetworking/AFURLResponseSerialization.h
  27. +713 −0 AFNetworking/AFURLResponseSerialization.m
  28. +429 −0 AFNetworking/AFURLSessionManager.h
  29. +839 −0 AFNetworking/AFURLSessionManager.m
  30. +0 −89 AFNetworking/AFXMLRequestOperation.h
  31. +0 −167 AFNetworking/AFXMLRequestOperation.m
  32. +6 −30 Example/AFNetworking Mac Example.xcodeproj/project.pbxproj
  33. +96 −0 Example/AFNetworking Mac Example.xcodeproj/xcshareddata/xcschemes/AFNetworking Example.xcscheme
  34. +150 −50 Example/AFNetworking iOS Example.xcodeproj/project.pbxproj
  35. +96 −0 Example/AFNetworking iOS Example.xcodeproj/xcshareddata/xcschemes/AFNetworking iOS Example.xcscheme
  36. +0 −6 Example/AppDelegate.m
  37. +3 −3 Example/Classes/AFAppDotNetAPIClient.h
  38. +3 −26 Example/Classes/AFAppDotNetAPIClient.m
  39. +13 −23 Example/Classes/Controllers/GlobalTimelineViewController.m
  40. +5 −5 Example/Classes/Models/Post.h
  41. +8 −11 Example/Classes/Models/Post.m
  42. +1 −1 Example/Classes/Models/User.h
  43. +39 −42 Example/Classes/Models/User.m
  44. +7 −7 Example/Classes/Views/PostTableViewCell.m
  45. BIN Example/adn.cer
  46. +4 −0 Example/iOS-Info.plist
  47. +1 −1 LICENSE
  48. +24 −131 README.md
  49. +343 −177 Tests/AFNetworking Tests.xcodeproj/project.pbxproj
  50. +22 −0 Tests/OS X Tests/OS X Tests-Info.plist
  51. +10 −0 Tests/OS X Tests/OS X Tests-Prefix.pch
  52. +2 −0 Tests/OS X Tests/en.lproj/InfoPlist.strings
  53. +2 −3 Tests/Podfile
  54. +15 −9 Tests/Podfile.lock
  55. BIN Tests/Resources/ADN.net/ADNNetServerTrustChain/adn_0.cer
  56. BIN Tests/Resources/ADN.net/ADNNetServerTrustChain/adn_1.cer
  57. BIN Tests/Resources/ADN.net/ADNNetServerTrustChain/adn_2.cer
  58. BIN Tests/Resources/HTTPBin.org/HTTPBinOrgServerTrustChain/httpbin_0.cer
  59. BIN Tests/Resources/HTTPBin.org/HTTPBinOrgServerTrustChain/httpbin_1.cer
  60. BIN Tests/Resources/HTTPBin.org/HTTPBinOrgServerTrustChain/httpbin_2.cer
  61. BIN Tests/Resources/HTTPBin.org/httpbinorg_10242013.cer
  62. BIN Tests/Resources/ca.cer
  63. BIN Tests/Resources/derived.cert
  64. BIN Tests/Resources/root_certificate.cer
  65. +0 −15 Tests/Resources/root_certificate.key
  66. +5 −124 Tests/{ → Tests/1.0 Tests}/AFHTTPClientTests.m
  67. +0 −3 Tests/{ → Tests/1.0 Tests}/AFHTTPRequestOperationTests.m
  68. +1 −4 Tests/{ → Tests/1.0 Tests}/AFImageRequestOperationTests.m
  69. +0 −1 Tests/{ → Tests/1.0 Tests}/AFJSONRequestOperationTests.m
  70. 0 Tests/{ → Tests/1.0 Tests}/AFMockURLProtocol.h
  71. 0 Tests/{ → Tests/1.0 Tests}/AFMockURLProtocol.m
  72. +1 −0 Tests/{ → Tests/1.0 Tests}/AFNetworkingTests.h
  73. 0 Tests/{ → Tests/1.0 Tests}/AFNetworkingTests.m
  74. +0 −1 Tests/{ → Tests/1.0 Tests}/AFURLConnectionOperationTests.m
  75. +278 −0 Tests/Tests/AFHTTPRequestOperationTests.m
  76. +62 −0 Tests/Tests/AFHTTPSerializationTests.m
  77. +99 −0 Tests/Tests/AFJSONSerializationTests.m
  78. +168 −0 Tests/Tests/AFSecurityPolicyTests.m
  79. +35 −0 Tests/Tests/AFTestCase.h
  80. +45 −0 Tests/Tests/AFTestCase.m
  81. +2 −0 Tests/iOS Tests/en.lproj/InfoPlist.strings
  82. +22 −0 Tests/iOS Tests/iOS Tests-Info.plist
  83. +10 −0 Tests/iOS Tests/iOS Tests-Prefix.pch
  84. +1 −1 {AFNetworking → UIKit+AFNetworking}/AFNetworkActivityIndicatorManager.h
  85. +25 −20 {AFNetworking → UIKit+AFNetworking}/AFNetworkActivityIndicatorManager.m
  86. +44 −0 UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
  87. +68 −0 UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m
  88. +70 −0 UIKit+AFNetworking/UIAlertView+AFNetworking.h
  89. +99 −0 UIKit+AFNetworking/UIAlertView+AFNetworking.m
  90. +100 −0 UIKit+AFNetworking/UIButton+AFNetworking.h
  91. +134 −0 UIKit+AFNetworking/UIButton+AFNetworking.m
  92. +12 −2 {AFNetworking → UIKit+AFNetworking}/UIImageView+AFNetworking.h
  93. +55 −45 {AFNetworking → UIKit+AFNetworking}/UIImageView+AFNetworking.m
  94. +60 −0 UIKit+AFNetworking/UIProgressView+AFNetworking.h
  95. +134 −0 UIKit+AFNetworking/UIProgressView+AFNetworking.m
  96. +38 −0 UIKit+AFNetworking/UIWebView+AFNetworking.h
  97. +77 −0 UIKit+AFNetworking/UIWebView+AFNetworking.m
View
@@ -1,7 +0,0 @@
-language: objective-c
-before_install:
- - brew update
- - brew uninstall xctool && brew install https://raw.github.com/fpotter/homebrew/246a1439dab49542d4531ad7e1bac7048151f601/Library/Formula/xctool.rb
- - gem install cocoapods -v 0.22.2
- - cd Tests && pod install && cd $TRAVIS_BUILD_DIR
-script: rake test
View
@@ -1,31 +1,56 @@
Pod::Spec.new do |s|
s.name = 'AFNetworking'
- s.version = '1.3.3'
+ s.version = '2.0.0-RC3'
s.license = 'MIT'
s.summary = 'A delightful iOS and OS X networking framework.'
s.homepage = 'https://github.com/AFNetworking/AFNetworking'
- s.authors = { 'Mattt Thompson' => 'm@mattt.me', 'Scott Raymond' => 'sco@gowalla.com' }
- s.source = { :git => 'https://github.com/AFNetworking/AFNetworking.git', :tag => '1.3.3' }
- s.source_files = 'AFNetworking'
+ s.authors = { 'Mattt Thompson' => 'm@mattt.me', 'Scott Raymond' => 'sco@scottraymond.net' }
+ s.source = { :git => 'https://github.com/AFNetworking/AFNetworking.git', :tag => '2.0.0-RC3', :submodules => true }
s.requires_arc = true
- s.ios.deployment_target = '5.0'
- s.ios.frameworks = 'MobileCoreServices', 'SystemConfiguration', 'Security', 'CoreGraphics'
-
- s.osx.deployment_target = '10.7'
- s.osx.frameworks = 'CoreServices', 'SystemConfiguration', 'Security'
-
- s.prefix_header_contents = <<-EOS
-#import <Availability.h>
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
- #import <SystemConfiguration/SystemConfiguration.h>
- #import <MobileCoreServices/MobileCoreServices.h>
- #import <Security/Security.h>
-#else
- #import <SystemConfiguration/SystemConfiguration.h>
- #import <CoreServices/CoreServices.h>
- #import <Security/Security.h>
-#endif
-EOS
-end
+ s.ios.deployment_target = '6.0'
+ s.osx.deployment_target = '10.8'
+
+ s.default_subspec = 'Core'
+
+ s.subspec 'Core' do |ss|
+ ss.source_files = 'AFNetworking'
+
+ ss.dependency 'AFNetworking/Serialization'
+ ss.dependency 'AFNetworking/Reachability'
+ ss.dependency 'AFNetworking/Security'
+
+ ss.dependency 'AFNetworking/NSURLConnection'
+ end
+
+ s.subspec 'Serialization' do |ss|
+ ss.source_files = 'AFNetworking/AFURL{Request,Response}Serialization.{h,m}'
+ ss.ios.frameworks = 'MobileCoreServices', 'CoreGraphics'
+ ss.osx.frameworks = 'CoreServices'
+ end
+
+ s.subspec 'Security' do |ss|
+ ss.source_files = 'AFNetworking/AFSecurityPolicy.{h,m}'
+ ss.frameworks = 'Security'
+ end
+
+ s.subspec 'Reachability' do |ss|
+ ss.source_files = 'AFNetworking/AFNetworkReachabilityManager.{h,m}'
+ ss.frameworks = 'SystemConfiguration'
+ end
+
+ s.subspec 'NSURLConnection' do |ss|
+ ss.source_files = 'AFNetworking/AFURLConnectionOperation.{h,m}', 'AFNetworking/AFHTTPRequestOperation.{h,m}', 'AFNetworking/AFHTTPRequestOperationManager.{h,m}'
+ end
+
+ s.subspec 'NSURLSession' do |ss|
+ ss.ios.deployment_target = '7.0'
+ ss.osx.deployment_target = '10.9'
+
+ ss.source_files = 'AFNetworking/AFURLSessionManager.{h,m}', 'AFNetworking/AFHTTPSessionManager.{h,m}'
+ end
+
+ s.subspec 'UIKit' do |ss|
+ ss.ios.source_files = 'UIKit+AFNetworking'
+ end
+end
@@ -5,61 +5,127 @@
location = "group:AFNetworking"
name = "AFNetworking">
<FileRef
- location = "group:AFHTTPClient.h">
- </FileRef>
- <FileRef
- location = "group:AFHTTPClient.m">
- </FileRef>
- <FileRef
- location = "group:AFHTTPRequestOperation.h">
- </FileRef>
- <FileRef
- location = "group:AFHTTPRequestOperation.m">
- </FileRef>
- <FileRef
- location = "group:AFImageRequestOperation.h">
+ location = "group:AFNetworking.h">
</FileRef>
+ <Group
+ location = "container:"
+ name = "NSURLConnection">
+ <FileRef
+ location = "group:AFNetworking/AFURLConnectionOperation.h">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFURLConnectionOperation.m">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFHTTPRequestOperation.h">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFHTTPRequestOperation.m">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFHTTPRequestOperationManager.h">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFHTTPRequestOperationManager.m">
+ </FileRef>
+ </Group>
+ <Group
+ location = "container:"
+ name = "NSURLSession">
+ <FileRef
+ location = "group:AFNetworking/AFURLSessionManager.h">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFURLSessionManager.m">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFHTTPSessionManager.h">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFHTTPSessionManager.m">
+ </FileRef>
+ </Group>
+ <Group
+ location = "container:"
+ name = "Security">
+ <FileRef
+ location = "group:AFNetworking/AFSecurityPolicy.h">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFSecurityPolicy.m">
+ </FileRef>
+ </Group>
+ <Group
+ location = "container:"
+ name = "Reachability">
+ <FileRef
+ location = "group:AFNetworking/AFNetworkReachabilityManager.h">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFNetworkReachabilityManager.m">
+ </FileRef>
+ </Group>
+ <Group
+ location = "container:"
+ name = "Serialization">
+ <FileRef
+ location = "group:AFNetworking/AFURLRequestSerialization.h">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFURLRequestSerialization.m">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFURLResponseSerialization.h">
+ </FileRef>
+ <FileRef
+ location = "group:AFNetworking/AFURLResponseSerialization.m">
+ </FileRef>
+ </Group>
+ </Group>
+ <Group
+ location = "group:UIKit+AFNetworking"
+ name = "UIKit+AFNetworking">
<FileRef
- location = "group:AFImageRequestOperation.m">
+ location = "group:AFNetworkActivityIndicatorManager.h">
</FileRef>
<FileRef
- location = "group:AFJSONRequestOperation.h">
+ location = "group:AFNetworkActivityIndicatorManager.m">
</FileRef>
<FileRef
- location = "group:AFJSONRequestOperation.m">
+ location = "group:UIActivityIndicatorView+AFNetworking.h">
</FileRef>
<FileRef
- location = "group:AFNetworkActivityIndicatorManager.h">
+ location = "group:UIActivityIndicatorView+AFNetworking.m">
</FileRef>
<FileRef
- location = "group:AFNetworkActivityIndicatorManager.m">
+ location = "group:UIAlertView+AFNetworking.h">
</FileRef>
<FileRef
- location = "group:AFNetworking.h">
+ location = "group:UIAlertView+AFNetworking.m">
</FileRef>
<FileRef
- location = "group:AFPropertyListRequestOperation.h">
+ location = "group:UIButton+AFNetworking.h">
</FileRef>
<FileRef
- location = "group:AFPropertyListRequestOperation.m">
+ location = "group:UIButton+AFNetworking.m">
</FileRef>
<FileRef
- location = "group:AFURLConnectionOperation.h">
+ location = "group:UIImageView+AFNetworking.h">
</FileRef>
<FileRef
- location = "group:AFURLConnectionOperation.m">
+ location = "group:UIImageView+AFNetworking.m">
</FileRef>
<FileRef
- location = "group:AFXMLRequestOperation.h">
+ location = "group:UIProgressView+AFNetworking.h">
</FileRef>
<FileRef
- location = "group:AFXMLRequestOperation.m">
+ location = "group:UIProgressView+AFNetworking.m">
</FileRef>
<FileRef
- location = "group:UIImageView+AFNetworking.h">
+ location = "group:UIWebView+AFNetworking.h">
</FileRef>
<FileRef
- location = "group:UIImageView+AFNetworking.m">
+ location = "group:UIWebView+AFNetworking.m">
</FileRef>
</Group>
<FileRef
Oops, something went wrong.

0 comments on commit 9a40c0d

Please sign in to comment.