Skip to content

Commit

Permalink
Merge branch 2.0 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
mattt committed Sep 25, 2013
1 parent ce1ebf3 commit 9a40c0d
Show file tree
Hide file tree
Showing 97 changed files with 7,429 additions and 3,659 deletions.
7 changes: 0 additions & 7 deletions .travis.yml

This file was deleted.

73 changes: 49 additions & 24 deletions AFNetworking.podspec
Original file line number Diff line number Diff line change
@@ -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' => '[email protected]', 'Scott Raymond' => '[email protected]' }
s.source = { :git => 'https://github.com/AFNetworking/AFNetworking.git', :tag => '1.3.3' }
s.source_files = 'AFNetworking'
s.authors = { 'Mattt Thompson' => '[email protected]', 'Scott Raymond' => '[email protected]' }
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
120 changes: 93 additions & 27 deletions AFNetworking.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9a40c0d

Please sign in to comment.