Skip to content

feat：AFNetworking 支持 4.0.0 #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunjinshuai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat：AFNetworking 支持 4.0.0 #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions YTKNetwork.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ Pod::Spec.new do |s|

s.private_header_files = "YTKNetwork/YTKNetworkPrivate.h"

s.ios.deployment_target = "7.0"
s.osx.deployment_target = "10.9"
s.ios.deployment_target = "9.0"
s.osx.deployment_target = "10.10"
s.watchos.deployment_target = "2.0"
s.tvos.deployment_target = "9.0"
s.framework = "CFNetwork"

s.dependency "AFNetworking/NSURLSession", "~> 3.0"
s.dependency "AFNetworking/NSURLSession"
end
14 changes: 9 additions & 5 deletions YTKNetwork/YTKNetworkAgent.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,10 @@ - (void)addRequest:(YTKBaseRequest *)request {
NSURLRequest *customUrlRequest= [request buildCustomUrlRequest];
if (customUrlRequest) {
__block NSURLSessionDataTask *dataTask = nil;
dataTask = [_manager dataTaskWithRequest:customUrlRequest completionHandler:^(NSURLResponse * _Nonnull response, id _Nullable responseObject, NSError * _Nullable error) {
dataTask = [_manager dataTaskWithRequest:customUrlRequest
uploadProgress:nil
downloadProgress:nil
completionHandler:^(NSURLResponse * _Nonnull response, id _Nullable responseObject, NSError * _Nullable error) {
[self handleRequestResult:dataTask responseObject:responseObject error:error];
}];
request.requestTask = dataTask;
Expand Down Expand Up @@ -458,10 +461,11 @@ - (NSURLSessionDataTask *)dataTaskWithHTTPMethod:(NSString *)method

__block NSURLSessionDataTask *dataTask = nil;
dataTask = [_manager dataTaskWithRequest:request
completionHandler:^(NSURLResponse * __unused response, id responseObject, NSError *_error) {
[self handleRequestResult:dataTask responseObject:responseObject error:_error];
}];

uploadProgress:nil
downloadProgress:nil
completionHandler:^(NSURLResponse * _Nonnull response, id _Nullable responseObject, NSError * _Nullable error) {
[self handleRequestResult:dataTask responseObject:responseObject error:error];
}];
return dataTask;
}

Expand Down
4 changes: 3 additions & 1 deletion YTKNetworkDemo/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
platform :ios, '9.0'

target 'YTKNetworkDemo' do
pod 'YTKNetwork', :path => '../'
pod 'AFNetworking', '~> 3.1'
pod 'AFNetworking', '~> 4.0.0'
end

target 'YTKNetworkDemoTests' do
Expand Down
40 changes: 22 additions & 18 deletions YTKNetworkDemo/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
PODS:
- AFNetworking (3.1.0):
- AFNetworking/NSURLSession (= 3.1.0)
- AFNetworking/Reachability (= 3.1.0)
- AFNetworking/Security (= 3.1.0)
- AFNetworking/Serialization (= 3.1.0)
- AFNetworking/UIKit (= 3.1.0)
- AFNetworking/NSURLSession (3.1.0):
- AFNetworking (4.0.0):
- AFNetworking/NSURLSession (= 4.0.0)
- AFNetworking/Reachability (= 4.0.0)
- AFNetworking/Security (= 4.0.0)
- AFNetworking/Serialization (= 4.0.0)
- AFNetworking/UIKit (= 4.0.0)
- AFNetworking/NSURLSession (4.0.0):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/Reachability (3.1.0)
- AFNetworking/Security (3.1.0)
- AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0):
- AFNetworking/Reachability (4.0.0)
- AFNetworking/Security (4.0.0)
- AFNetworking/Serialization (4.0.0)
- AFNetworking/UIKit (4.0.0):
- AFNetworking/NSURLSession
- YTKNetwork (2.1.4):
- AFNetworking/NSURLSession
- YTKNetwork (2.0.1):
- AFNetworking (~> 3.0)

DEPENDENCIES:
- AFNetworking (~> 3.1)
- AFNetworking (~> 4.0.0)
- YTKNetwork (from `../`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- AFNetworking

EXTERNAL SOURCES:
YTKNetwork:
:path: "../"

SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
YTKNetwork: f21ad2073b3353a11d257593a2859f2904bbec75
AFNetworking: d9fdf484a3c723ec3c558a41cc5754c7e845ee77
YTKNetwork: a87d8bf6c341c137032819aa54a847e11797d4e2

PODFILE CHECKSUM: fac6c10b171443ed76dffcc019afa1046783a5cd
PODFILE CHECKSUM: ce9a4bbf23c85f00dc8999c160555bd945e34a2a

COCOAPODS: 1.0.1
COCOAPODS: 1.7.3