Skip to content

Commit

Permalink
Merge pull request mrackwitz#115 from mrackwitz/features/afnetworking3
Browse files Browse the repository at this point in the history 
AFNetworking v3 support
  • Loading branch information
@mrackwitz
mrackwitz committed Dec 29, 2015
2 parents c9eaaef + ba9d2e0 commit 135de5d
Show file tree
Hide file tree
Showing 72 changed files with 2,554 additions and 4,533 deletions.
6 changes: 0 additions & 6 deletions Example.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
7111E5B81806116B00016A43 /* aquarium-fish1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 7111E5B71806116B00016A43 /* aquarium-fish1.jpg */; };
71135B79197D296800BE73F2 /* MRAppearanceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71135B78197D296800BE73F2 /* MRAppearanceViewController.m */; };
711417391976ABC4005A1DAD /* MRAFNetworkingSupportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 711417381976ABC4005A1DAD /* MRAFNetworkingSupportViewController.m */; };
71B0F8B5197967EC000DE699 /* MRAFNetworkingSupportOperationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71B0F8B4197967EC000DE699 /* MRAFNetworkingSupportOperationViewController.m */; };
71E898CF1814506B0035F290 /* MRActivityIndicatorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E898CE1814506B0035F290 /* MRActivityIndicatorViewController.m */; };
71E898D2181451710035F290 /* MRColorPaletteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E898D1181451710035F290 /* MRColorPaletteViewController.m */; };
71E898D518158B450035F290 /* MRCircularProgressViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E898D418158B450035F290 /* MRCircularProgressViewController.m */; };
Expand All @@ -35,8 +34,6 @@
71135B78197D296800BE73F2 /* MRAppearanceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MRAppearanceViewController.m; sourceTree = "<group>"; };
711417371976ABC4005A1DAD /* MRAFNetworkingSupportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRAFNetworkingSupportViewController.h; sourceTree = "<group>"; };
711417381976ABC4005A1DAD /* MRAFNetworkingSupportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MRAFNetworkingSupportViewController.m; sourceTree = "<group>"; };
71B0F8B3197967EC000DE699 /* MRAFNetworkingSupportOperationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRAFNetworkingSupportOperationViewController.h; sourceTree = "<group>"; };
71B0F8B4197967EC000DE699 /* MRAFNetworkingSupportOperationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MRAFNetworkingSupportOperationViewController.m; sourceTree = "<group>"; };
71E898CD1814506B0035F290 /* MRActivityIndicatorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRActivityIndicatorViewController.h; sourceTree = "<group>"; };
71E898CE1814506B0035F290 /* MRActivityIndicatorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MRActivityIndicatorViewController.m; sourceTree = "<group>"; };
71E898D0181451710035F290 /* MRColorPaletteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRColorPaletteViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -119,8 +116,6 @@
71E898CE1814506B0035F290 /* MRActivityIndicatorViewController.m */,
711417371976ABC4005A1DAD /* MRAFNetworkingSupportViewController.h */,
711417381976ABC4005A1DAD /* MRAFNetworkingSupportViewController.m */,
71B0F8B3197967EC000DE699 /* MRAFNetworkingSupportOperationViewController.h */,
71B0F8B4197967EC000DE699 /* MRAFNetworkingSupportOperationViewController.m */,
71135B77197D296800BE73F2 /* MRAppearanceViewController.h */,
71135B78197D296800BE73F2 /* MRAppearanceViewController.m */,
71E898D318158B450035F290 /* MRCircularProgressViewController.h */,
Expand Down Expand Up @@ -279,7 +274,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
71B0F8B5197967EC000DE699 /* MRAFNetworkingSupportOperationViewController.m in Sources */,
71EC367D1805BB7100C85C5B /* main.m in Sources */,
71EC36811805BB7100C85C5B /* MRAppDelegate.m in Sources */,
71135B79197D296800BE73F2 /* MRAppearanceViewController.m in Sources */,
Expand Down
348 changes: 180 additions & 168 deletions Example/Base.lproj/Main_iPhone.storyboard
View file

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions Example/MRAFNetworkingSupportOperationViewController.h
View file

This file was deleted.

129 changes: 0 additions & 129 deletions Example/MRAFNetworkingSupportOperationViewController.m
View file

This file was deleted.

6 changes: 4 additions & 2 deletions Example/MRAFNetworkingSupportViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ - (void)viewDidLoad {
}

- (NSURLSessionDownloadTask *)bytesDownloadTask {
NSProgress *downloadProgress = nil;
NSURLSessionDownloadTask *task = [self.sessionManager downloadTaskWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"/bytes/1000000" relativeToURL:self.sessionManager.baseURL]]
progress:&downloadProgress
progress:nil
destination:nil
completionHandler:^(NSURLResponse *response, NSURL *filePath, NSError *error){
NSLog(@"Task completed with error: %@", error);
Expand All @@ -56,6 +55,7 @@ - (NSURLSessionDownloadTask *)bytesDownloadTask {
- (IBAction)onActivityIndicatorGo:(id)sender {
NSURLSessionDataTask *task = [self.sessionManager GET:@"/delay/3"
parameters:nil
progress:nil
success:nil
failure:^(NSURLSessionDataTask *task, NSError *error) {
NSLog(@"Task %@ failed with error: %@", task, error);
Expand All @@ -71,6 +71,7 @@ - (IBAction)onCircularProgressViewGo:(id)sender {
- (IBAction)onOverlayViewGo:(id)sender {
NSURLSessionDataTask *task = [self.sessionManager GET:@"/delay/2"
parameters:nil
progress:nil
success:nil
failure:^(NSURLSessionDataTask *task, NSError *error) {
if ([error.domain isEqualToString:NSURLErrorDomain] && error.code == NSURLErrorCancelled) {
Expand Down Expand Up @@ -138,6 +139,7 @@ - (IBAction)onOverlayViewUpload:(id)sender {
- (IBAction)onOverlayViewError:(id)sender {
NSURLSessionDataTask *task = [self.sessionManager GET:@"/status/418"
parameters:nil
progress:nil
success:nil
failure:^(NSURLSessionDataTask *task, NSError *error) {
NSLog(@"Task %@ failed, as expected, with error: %@", task, error);
Expand Down
2 changes: 1 addition & 1 deletion MRProgress.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Pod::Spec.new do |s|
s.subspec 'AFNetworking' do |subs|
subs.subspec 'Base' do |subs|
subs.dependency 'MRProgress/MethodCopier'
subs.dependency 'AFNetworking', '~> 2.6.3'
subs.dependency 'AFNetworking', '~> 3.0.4'
subs.dependency 'AFNetworking/UIKit'
end

Expand Down
94 changes: 44 additions & 50 deletions Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,73 @@
PODS:
- AFNetworking (2.6.3):
- AFNetworking/NSURLConnection (= 2.6.3)
- AFNetworking/NSURLSession (= 2.6.3)
- AFNetworking/Reachability (= 2.6.3)
- AFNetworking/Security (= 2.6.3)
- AFNetworking/Serialization (= 2.6.3)
- AFNetworking/UIKit (= 2.6.3)
- AFNetworking/NSURLConnection (2.6.3):
- AFNetworking (3.0.4):
- AFNetworking/NSURLSession (= 3.0.4)
- AFNetworking/Reachability (= 3.0.4)
- AFNetworking/Security (= 3.0.4)
- AFNetworking/Serialization (= 3.0.4)
- AFNetworking/UIKit (= 3.0.4)
- AFNetworking/NSURLSession (3.0.4):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/NSURLSession (2.6.3):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/Reachability (2.6.3)
- AFNetworking/Security (2.6.3)
- AFNetworking/Serialization (2.6.3)
- AFNetworking/UIKit (2.6.3):
- AFNetworking/NSURLConnection
- AFNetworking/Reachability (3.0.4)
- AFNetworking/Security (3.0.4)
- AFNetworking/Serialization (3.0.4)
- AFNetworking/UIKit (3.0.4):
- AFNetworking/NSURLSession
- MRProgress (0.8.2):
- MRProgress/ActivityIndicator (= 0.8.2)
- MRProgress/Blur (= 0.8.2)
- MRProgress/Circular (= 0.8.2)
- MRProgress/Icons (= 0.8.2)
- MRProgress/NavigationBarProgress (= 0.8.2)
- MRProgress/Overlay (= 0.8.2)
- MRProgress/ActivityIndicator (0.8.2):
- MRProgress (0.8.3):
- MRProgress/ActivityIndicator (= 0.8.3)
- MRProgress/Blur (= 0.8.3)
- MRProgress/Circular (= 0.8.3)
- MRProgress/Icons (= 0.8.3)
- MRProgress/NavigationBarProgress (= 0.8.3)
- MRProgress/Overlay (= 0.8.3)
- MRProgress/ActivityIndicator (0.8.3):
- MRProgress/Stopable
- MRProgress/AFNetworking (0.8.2):
- MRProgress/AFNetworking/ActivityIndicator (= 0.8.2)
- MRProgress/AFNetworking/Base (= 0.8.2)
- MRProgress/AFNetworking/Circular (= 0.8.2)
- MRProgress/AFNetworking/NavigationBarProgress (= 0.8.2)
- MRProgress/AFNetworking/Overlay (= 0.8.2)
- MRProgress/AFNetworking/ProgressBaseClass (= 0.8.2)
- MRProgress/AFNetworking/ActivityIndicator (0.8.2):
- MRProgress/AFNetworking (0.8.3):
- MRProgress/AFNetworking/ActivityIndicator (= 0.8.3)
- MRProgress/AFNetworking/Base (= 0.8.3)
- MRProgress/AFNetworking/Circular (= 0.8.3)
- MRProgress/AFNetworking/NavigationBarProgress (= 0.8.3)
- MRProgress/AFNetworking/Overlay (= 0.8.3)
- MRProgress/AFNetworking/ProgressBaseClass (= 0.8.3)
- MRProgress/AFNetworking/ActivityIndicator (0.8.3):
- MRProgress/ActivityIndicator
- MRProgress/AFNetworking/Base
- MRProgress/AFNetworking/Base (0.8.2):
- AFNetworking (~> 2.6.3)
- MRProgress/AFNetworking/Base (0.8.3):
- AFNetworking (~> 3.0.4)
- AFNetworking/UIKit
- MRProgress/MethodCopier
- MRProgress/AFNetworking/Circular (0.8.2):
- MRProgress/AFNetworking/Circular (0.8.3):
- MRProgress/AFNetworking/ProgressBaseClass
- MRProgress/AFNetworking/NavigationBarProgress (0.8.2):
- MRProgress/AFNetworking/NavigationBarProgress (0.8.3):
- MRProgress/AFNetworking/ProgressBaseClass
- MRProgress/AFNetworking/Overlay (0.8.2):
- MRProgress/AFNetworking/Overlay (0.8.3):
- MRProgress/AFNetworking/ActivityIndicator
- MRProgress/AFNetworking/Base
- MRProgress/AFNetworking/Circular
- MRProgress/Overlay
- MRProgress/AFNetworking/ProgressBaseClass (0.8.2):
- MRProgress/AFNetworking/ProgressBaseClass (0.8.3):
- MRProgress/AFNetworking/Base
- MRProgress/ProgressBaseClass
- MRProgress/Blur (0.8.2):
- MRProgress/Blur (0.8.3):
- MRProgress/Helper
- MRProgress/Circular (0.8.2):
- MRProgress/Circular (0.8.3):
- MRProgress/Helper
- MRProgress/ProgressBaseClass
- MRProgress/Stopable
- MRProgress/Helper (0.8.2)
- MRProgress/Icons (0.8.2)
- MRProgress/MethodCopier (0.8.2)
- MRProgress/NavigationBarProgress (0.8.2):
- MRProgress/Helper (0.8.3)
- MRProgress/Icons (0.8.3)
- MRProgress/MethodCopier (0.8.3)
- MRProgress/NavigationBarProgress (0.8.3):
- MRProgress/ProgressBaseClass
- MRProgress/Overlay (0.8.2):
- MRProgress/Overlay (0.8.3):
- MRProgress/ActivityIndicator
- MRProgress/Blur
- MRProgress/Circular
- MRProgress/Helper
- MRProgress/Icons
- MRProgress/ProgressBaseClass (0.8.2)
- MRProgress/Stopable (0.8.2):
- MRProgress/ProgressBaseClass (0.8.3)
- MRProgress/Stopable (0.8.3):
- MRProgress/Helper

DEPENDENCIES:
Expand All @@ -86,7 +80,7 @@ EXTERNAL SOURCES:
:path: "."

SPEC CHECKSUMS:
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
MRProgress: 7bb71dff43b296b905635ecee91ebe59e3100901
AFNetworking: a0075feb321559dc78d9d85b55d11caa19eabb93
MRProgress: b0c2bcff94ee700ac2aea810e1f51720c059cbd3

COCOAPODS: 0.39.0
Loading

0 comments on commit 135de5d

Please sign in to comment.