From ddb7550abdd9e774714b69ade273fef730e0b26a Mon Sep 17 00:00:00 2001 From: leleliu008 <792793182@qq.com> Date: Fri, 8 Jun 2018 15:08:24 +0800 Subject: [PATCH 01/10] optimization: when responseSerializer is set a AFHTTPResponseSerializer instance --- .../AFNetworkActivityConsoleLogger.m | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m b/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m index bcf922b..53d8e4d 100644 --- a/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m +++ b/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m @@ -74,9 +74,24 @@ - (void)URLSessionTaskDidFinish:(NSURLSessionTask *)task withResponseObject:(id) break; } } else { + id responseBody = responseObject; + + if(responseHeaderFields != nil && [responseObject isKindOfClass:[NSData class]]) { + id contentTypeObj = [responseHeaderFields objectForKey:@"Content-Type"]; + if([contentTypeObj isKindOfClass:[NSString class]]) { + NSString *contentType = contentTypeObj; + if([contentType containsString:@"application/json"] + || [contentType containsString:@"application/xml"] + || [contentType containsString:@"application/x-www-form-urlencoded"] + || [contentType containsString:@"text/html"]) { + responseBody = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; + } + } + } + switch (self.level) { case AFLoggerLevelDebug: - NSLog(@"%ld '%@' [%.04f s]: %@ %@", (long)responseStatusCode, [[task.response URL] absoluteString], elapsedTime, responseHeaderFields, responseObject); + NSLog(@"%ld '%@' [%.04f s]: %@ %@", (long)responseStatusCode, [[task.response URL] absoluteString], elapsedTime, responseHeaderFields, responseBody); break; case AFLoggerLevelInfo: NSLog(@"%ld '%@' [%.04f s]", (long)responseStatusCode, [[task.response URL] absoluteString], elapsedTime); From 502c0c7eae1221303592d64c4bac9684dd437022 Mon Sep 17 00:00:00 2001 From: leleliu008 <792793182@qq.com> Date: Sat, 9 Jun 2018 13:35:00 +0800 Subject: [PATCH 02/10] optimization:when log level is AFLoggerLevelDebug apply the optimization, add some test cases --- .../AFNetworkActivityConsoleLogger.m | 34 +++++++------- Tests/AFNetworkActivityLoggerTests.m | 47 +++++++++++++++++++ 2 files changed, 64 insertions(+), 17 deletions(-) diff --git a/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m b/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m index 53d8e4d..faf9817 100644 --- a/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m +++ b/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m @@ -74,25 +74,25 @@ - (void)URLSessionTaskDidFinish:(NSURLSessionTask *)task withResponseObject:(id) break; } } else { - id responseBody = responseObject; - - if(responseHeaderFields != nil && [responseObject isKindOfClass:[NSData class]]) { - id contentTypeObj = [responseHeaderFields objectForKey:@"Content-Type"]; - if([contentTypeObj isKindOfClass:[NSString class]]) { - NSString *contentType = contentTypeObj; - if([contentType containsString:@"application/json"] - || [contentType containsString:@"application/xml"] - || [contentType containsString:@"application/x-www-form-urlencoded"] - || [contentType containsString:@"text/html"]) { - responseBody = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; - } - } - } - switch (self.level) { - case AFLoggerLevelDebug: + case AFLoggerLevelDebug: { + id responseBody = responseObject; + + if(responseHeaderFields != nil && [responseObject isKindOfClass:[NSData class]]) { + id contentTypeObj = [responseHeaderFields objectForKey:@"Content-Type"]; + if([contentTypeObj isKindOfClass:[NSString class]]) { + NSString *contentType = contentTypeObj; + if([contentType containsString:@"application/json"] + || [contentType containsString:@"application/xml"] + || [contentType containsString:@"application/x-www-form-urlencoded"] + || [contentType containsString:@"text/html"]) { + responseBody = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; + } + } + } NSLog(@"%ld '%@' [%.04f s]: %@ %@", (long)responseStatusCode, [[task.response URL] absoluteString], elapsedTime, responseHeaderFields, responseBody); - break; + } + break; case AFLoggerLevelInfo: NSLog(@"%ld '%@' [%.04f s]", (long)responseStatusCode, [[task.response URL] absoluteString], elapsedTime); break; diff --git a/Tests/AFNetworkActivityLoggerTests.m b/Tests/AFNetworkActivityLoggerTests.m index f5ad10d..8697c65 100644 --- a/Tests/AFNetworkActivityLoggerTests.m +++ b/Tests/AFNetworkActivityLoggerTests.m @@ -265,5 +265,52 @@ - (void)testThatIndividualLoggerIsNotCalledWhenLoggerIsNilledOut { [manager invalidateSessionCancelingTasks:YES]; } +- (void)testThatResponseSerializerIsAFHTTPResponseSerializerAndResponseBodyIsText { + NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; + AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; + manager.responseSerializer = [AFHTTPResponseSerializer serializer]; + AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + + XCTestExpectation *expectation = [self expectationWithDescription:@"Finish Block Should Be Called"]; + [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elpasedTime, NSError *error) { + [expectation fulfill]; + }]; + [self.logger addLogger:testLogger]; + [self.logger setLogLevel:AFLoggerLevelDebug]; + [self.logger startLogging]; + + [manager + GET:@"ip" + parameters:nil + progress:nil + success:nil + failure:nil]; + [self waitForExpectationsWithTimeout:10.0 handler:nil]; + [manager invalidateSessionCancelingTasks:YES]; +} + +- (void)testThatResponseSerializerIsAFHTTPResponseSerializerAndResponseBodyIsNotText { + NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; + AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; + manager.responseSerializer = [AFJSONResponseSerializer serializer]; + AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + + XCTestExpectation *expectation = [self expectationWithDescription:@"Finish Block Should Be Called"]; + [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elpasedTime, NSError *error) { + [expectation fulfill]; + }]; + [self.logger addLogger:testLogger]; + [self.logger setLogLevel:AFLoggerLevelDebug]; + [self.logger startLogging]; + + [manager + GET:@"image/jpeg" + parameters:nil + progress:nil + success:nil + failure:nil]; + [self waitForExpectationsWithTimeout:10.0 handler:nil]; + [manager invalidateSessionCancelingTasks:YES]; +} @end From 8cd2614c4437689b0a6b6ea9bf9d6186e8cb0025 Mon Sep 17 00:00:00 2001 From: leleliu008 <792793182@qq.com> Date: Sun, 10 Jun 2018 22:00:22 +0800 Subject: [PATCH 03/10] modify testcase: choose a HTTP POST request has HTTP Body cover the code if ([request HTTPBody]) in AFNetworkActivityConsoleLogger.m --- Tests/AFNetworkActivityLoggerTests.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/AFNetworkActivityLoggerTests.m b/Tests/AFNetworkActivityLoggerTests.m index 8697c65..c83e46a 100644 --- a/Tests/AFNetworkActivityLoggerTests.m +++ b/Tests/AFNetworkActivityLoggerTests.m @@ -280,8 +280,8 @@ - (void)testThatResponseSerializerIsAFHTTPResponseSerializerAndResponseBodyIsTex [self.logger startLogging]; [manager - GET:@"ip" - parameters:nil + POST:@"post" + parameters:@"x=y" progress:nil success:nil failure:nil]; From 1e55cf0d4e629eaf66f5eb6dc8c81a68182ff7a4 Mon Sep 17 00:00:00 2001 From: leleliu008 <792793182@qq.com> Date: Mon, 25 Mar 2019 12:42:02 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../AFNetworkActivityLogger iOS.xcscheme | 6 +- .../AFNetworkActivityConsoleLogger.m | 135 +++++++++++------- Cartfile.resolved | 2 +- Carthage/Checkouts/AFNetworking | 2 +- Tests/AFNetworkActivityLoggerTests.m | 53 ++++++- 6 files changed, 141 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index 92b7727..2269128 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ xcuserdata /fastlane/.env*private* fastlane/test-output/* Carthage/Build +Build diff --git a/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger iOS.xcscheme b/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger iOS.xcscheme index f9c537f..2b28fb3 100644 --- a/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger iOS.xcscheme +++ b/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger iOS.xcscheme @@ -28,9 +28,8 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" enableThreadSanitizer = "YES" enableUBSanitizer = "YES" - language = "" - shouldUseLaunchSchemeArgsEnv = "YES" - codeCoverageEnabled = "YES"> + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -59,7 +58,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m b/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m index faf9817..0d549d8 100644 --- a/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m +++ b/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m @@ -29,77 +29,112 @@ - (id)init { if (!self) { return nil; } - + self.level = AFLoggerLevelInfo; - + return self; } - (void)URLSessionTaskDidStart:(NSURLSessionTask *)task { NSURLRequest *request = task.originalRequest; - - NSString *body = nil; - if ([request HTTPBody]) { - body = [[NSString alloc] initWithData:[request HTTPBody] encoding:NSUTF8StringEncoding]; + + NSString *requestMethod = [request HTTPMethod]; + + NSURL *url = [request URL]; + + NSString *urlPath = [url path]; + NSString *query = [url query]; + if (query) { + urlPath = [NSString stringWithFormat:@"%@?%@", urlPath, query]; } - - switch (self.level) { - case AFLoggerLevelDebug: - NSLog(@"%@ '%@': %@ %@", [request HTTPMethod], [[request URL] absoluteString], [request allHTTPHeaderFields], body); - break; - case AFLoggerLevelInfo: - NSLog(@"%@ '%@'", [request HTTPMethod], [[request URL] absoluteString]); - break; - default: - break; + + NSString *portStr; + NSNumber *port = [url port]; + if (port) { + portStr = [NSString stringWithFormat:@"%@", port]; + } else { + portStr = @"80"; + } + NSString *host = [NSString stringWithFormat:@"%@://%@:%@", [url scheme], [url host], portStr]; + + NSString *format = @"\n--------------------------------------------------\n%@ %@ HTTP/1.1\nHost: %@\n"; + NSString *str = [NSString stringWithFormat:format, requestMethod, urlPath, host]; + + NSDictionary *headers = [request allHTTPHeaderFields]; + NSArray *keys = headers.allKeys; + for (int i = 0; i < keys.count; i++) { + NSString *key = keys[i]; + NSString *value = [headers valueForKey:key]; + str = [NSString stringWithFormat:@"%@%@: %@\n", str, key, value]; } + + NSString *bodyStr; + NSData *requestBody = [request HTTPBody]; + if (requestBody) { + bodyStr = [[NSString alloc] initWithData:requestBody encoding:NSUTF8StringEncoding]; + } else { + bodyStr = @""; + } + + str = [NSString stringWithFormat:@"%@\n%@\n--------------------------------------------------\n", str, bodyStr]; + + NSLog(@"%@", str); } - (void)URLSessionTaskDidFinish:(NSURLSessionTask *)task withResponseObject:(id)responseObject inElapsedTime:(NSTimeInterval )elapsedTime withError:(NSError *)error { - NSUInteger responseStatusCode = 0; - NSDictionary *responseHeaderFields = nil; + + NSString *str = @"\n----------------------------------------------------------------\n"; + + NSString *url = [[task.response URL] absoluteString]; + + str = [NSString stringWithFormat:@"%@%@--->\nHTTP/1.1 ", str, url]; + if ([task.response isKindOfClass:[NSHTTPURLResponse class]]) { - responseStatusCode = (NSUInteger)[(NSHTTPURLResponse *)task.response statusCode]; - responseHeaderFields = [(NSHTTPURLResponse *)task.response allHeaderFields]; - } - - if (error) { - switch (self.level) { - case AFLoggerLevelDebug: - case AFLoggerLevelInfo: - case AFLoggerLevelError: - NSLog(@"[Error] %@ '%@' (%ld) [%.04f s]: %@", [task.originalRequest HTTPMethod], [[task.response URL] absoluteString], (long)responseStatusCode, elapsedTime, error); - default: - break; + NSHTTPURLResponse *response = (NSHTTPURLResponse *)task.response; + + NSUInteger responseStatusCode = (NSUInteger)[response statusCode]; + str = [NSString stringWithFormat:@"%@%lu\n", str, responseStatusCode]; + + NSString *contentType = nil; + NSDictionary *responseHeaderFields = [response allHeaderFields]; + if (responseHeaderFields) { + NSArray *fields = [responseHeaderFields allKeys]; + for (int i = 0; i < fields.count; i++) { + NSString *key = fields[i]; + NSString *value = [responseHeaderFields valueForKey:key]; + str = [NSString stringWithFormat:@"%@%@: %@\n", str, key, value]; + if ([@"Content-Type" isEqualToString:key]) { + contentType = value; + } + } } - } else { - switch (self.level) { - case AFLoggerLevelDebug: { - id responseBody = responseObject; - - if(responseHeaderFields != nil && [responseObject isKindOfClass:[NSData class]]) { - id contentTypeObj = [responseHeaderFields objectForKey:@"Content-Type"]; - if([contentTypeObj isKindOfClass:[NSString class]]) { - NSString *contentType = contentTypeObj; - if([contentType containsString:@"application/json"] + + id responseBody = responseObject; + + if(contentType && ([contentType containsString:@"application/json"] || [contentType containsString:@"application/xml"] || [contentType containsString:@"application/x-www-form-urlencoded"] - || [contentType containsString:@"text/html"]) { - responseBody = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; - } + || [contentType containsString:@"text/html"])) { + if ([responseObject isKindOfClass:[NSData class]]) { + responseBody = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; + } else if ([responseObject isKindOfClass:[NSDictionary class]]) { + if ([NSJSONSerialization isValidJSONObject:responseObject]) { + NSError *error; + NSData *jsonData = [NSJSONSerialization dataWithJSONObject:responseObject options:NSJSONWritingPrettyPrinted error:&error]; + if (error) { + NSLog(@"Error:%@" , error); + } else { + responseBody =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; } } - NSLog(@"%ld '%@' [%.04f s]: %@ %@", (long)responseStatusCode, [[task.response URL] absoluteString], elapsedTime, responseHeaderFields, responseBody); } - break; - case AFLoggerLevelInfo: - NSLog(@"%ld '%@' [%.04f s]", (long)responseStatusCode, [[task.response URL] absoluteString], elapsedTime); - break; - default: - break; } + + str = [NSString stringWithFormat:@"%@%@\n------------------------------------------------\n", str, responseBody]; } + + NSLog(@"%@", str); } @end diff --git a/Cartfile.resolved b/Cartfile.resolved index b0813f1..1766e87 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "AFNetworking/AFNetworking" "3.2.0" +github "AFNetworking/AFNetworking" "3.2.1" diff --git a/Carthage/Checkouts/AFNetworking b/Carthage/Checkouts/AFNetworking index e976d63..746f6c3 160000 --- a/Carthage/Checkouts/AFNetworking +++ b/Carthage/Checkouts/AFNetworking @@ -1 +1 @@ -Subproject commit e976d63ed220ebe0a6d7c9292ebc0624988c0567 +Subproject commit 746f6c3a1e2c3a3dfbac1c3d18c08a5d121c8df3 diff --git a/Tests/AFNetworkActivityLoggerTests.m b/Tests/AFNetworkActivityLoggerTests.m index c83e46a..67780a5 100644 --- a/Tests/AFNetworkActivityLoggerTests.m +++ b/Tests/AFNetworkActivityLoggerTests.m @@ -280,8 +280,8 @@ - (void)testThatResponseSerializerIsAFHTTPResponseSerializerAndResponseBodyIsTex [self.logger startLogging]; [manager - POST:@"post" - parameters:@"x=y" + GET:@"ip" + parameters:nil progress:nil success:nil failure:nil]; @@ -313,4 +313,53 @@ - (void)testThatResponseSerializerIsAFHTTPResponseSerializerAndResponseBodyIsNot [manager invalidateSessionCancelingTasks:YES]; } +- (void)testYY { + NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; + AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; + manager.responseSerializer = [AFHTTPResponseSerializer serializer]; + AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + + XCTestExpectation *expectation = [self expectationWithDescription:@"Finish Block Should Be Called"]; + [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elpasedTime, NSError *error) { + [expectation fulfill]; + }]; + [self.logger addLogger:testLogger]; + [self.logger setLogLevel:AFLoggerLevelDebug]; + [self.logger startLogging]; + + [manager + POST:@"post" + parameters:@"x=y" + progress:nil + success:nil + failure:nil]; + [self waitForExpectationsWithTimeout:10.0 handler:nil]; + [manager invalidateSessionCancelingTasks:YES]; +} + +- (void)testZZ { + NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; + AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; + manager.responseSerializer = [AFHTTPResponseSerializer serializer]; + AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + + XCTestExpectation *expectation = [self expectationWithDescription:@"Finish Block Should Be Called"]; + [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elpasedTime, NSError *error) { + [expectation fulfill]; + }]; + + [self.logger addLogger:testLogger]; + [self.logger setLogLevel:AFLoggerLevelError]; + [self.logger startLogging]; + + [manager + POST:@"status/404" + parameters:@"x=y" + progress:nil + success:nil + failure:nil]; + [self waitForExpectationsWithTimeout:10.0 handler:nil]; + [manager invalidateSessionCancelingTasks:YES]; +} + @end From ad064d2b5d3049b1c103ad6579f9e63bdab5820e Mon Sep 17 00:00:00 2001 From: leleliu008 <792793182@qq.com> Date: Mon, 25 Mar 2019 13:41:34 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AFNetworkActivityLogger.podspec | 17 - AFNetworkingLogger.podspec | 17 + .../project.pbxproj | 334 +++++++++--------- .../contents.xcworkspacedata | 2 +- .../AFNetworkingLogger OS X.xcscheme | 30 +- .../xcschemes/AFNetworkingLogger iOS.xcscheme | 30 +- .../AFNetworkingLogger tvOS.xcscheme | 30 +- .../AFNetworkingLogger watchOS.xcscheme | 18 +- .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../AFNetworkingConsoleLogger.h | 8 +- .../AFNetworkingConsoleLogger.m | 6 +- .../AFNetworkingLogger.h | 22 +- .../AFNetworkingLogger.m | 24 +- .../AFNetworkingLoggerProtocol.h | 12 +- CHANGELOG.md | 6 +- README.md | 22 +- ...kActivityLogger.h => AFNetworkingLogger.h} | 18 +- Supporting Files/Info.plist | 4 +- Supporting Files/modulemap.module | 14 +- ...oggerTests.m => AFNetworkingLoggerTests.m} | 54 +-- fastlane/.env | 8 +- fastlane/.env.deploy | 6 +- 23 files changed, 350 insertions(+), 342 deletions(-) delete mode 100644 AFNetworkActivityLogger.podspec create mode 100644 AFNetworkingLogger.podspec rename {AFNetworkActivityLogger.xcodeproj => AFNetworkingLogger.xcodeproj}/project.pbxproj (66%) rename {AFNetworkActivityLogger.xcodeproj => AFNetworkingLogger.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (64%) rename AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger OS X.xcscheme => AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger OS X.xcscheme (73%) rename AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger iOS.xcscheme => AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger iOS.xcscheme (73%) rename AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger tvOS.xcscheme => AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger tvOS.xcscheme (73%) rename AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger watchOS.xcscheme => AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger watchOS.xcscheme (79%) rename {AFNetworkActivityLogger.xcworkspace => AFNetworkingLogger.xcworkspace}/contents.xcworkspacedata (64%) create mode 100644 AFNetworkingLogger.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.h => AFNetworkingLogger/AFNetworkingConsoleLogger.h (83%) rename AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m => AFNetworkingLogger/AFNetworkingConsoleLogger.m (97%) rename AFNetworkActivityLogger/AFNetworkActivityLogger.h => AFNetworkingLogger/AFNetworkingLogger.h (62%) rename AFNetworkActivityLogger/AFNetworkActivityLogger.m => AFNetworkingLogger/AFNetworkingLogger.m (86%) rename AFNetworkActivityLogger/AFNetworkActivityLoggerProtocol.h => AFNetworkingLogger/AFNetworkingLoggerProtocol.h (83%) rename Supporting Files/{AFNetworkActivityLogger.h => AFNetworkingLogger.h} (68%) rename Tests/{AFNetworkActivityLoggerTests.m => AFNetworkingLoggerTests.m} (85%) diff --git a/AFNetworkActivityLogger.podspec b/AFNetworkActivityLogger.podspec deleted file mode 100644 index 47dae0b..0000000 --- a/AFNetworkActivityLogger.podspec +++ /dev/null @@ -1,17 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'AFNetworkActivityLogger' - s.version = '3.0.0' - s.license = 'MIT' - s.summary = 'AFNetworking 3.0 Extension for Network Request Logging' - s.homepage = 'https://github.com/AFNetworking/AFNetworkActivityLogger' - s.authors = { 'Mattt Thompson' => 'm@mattt.me' } - s.source = { :git => 'https://github.com/AFNetworking/AFNetworkActivityLogger.git', :tag => s.version } - s.source_files = 'AFNetworkActivityLogger' - s.requires_arc = true - s.ios.deployment_target = '7.0' - s.osx.deployment_target = '10.9' - s.watchos.deployment_target = '2.0' - s.tvos.deployment_target = '9.0' - - s.dependency 'AFNetworking/NSURLSession', '~> 3.0' -end diff --git a/AFNetworkingLogger.podspec b/AFNetworkingLogger.podspec new file mode 100644 index 0000000..e87c19e --- /dev/null +++ b/AFNetworkingLogger.podspec @@ -0,0 +1,17 @@ +Pod::Spec.new do |s| + s.name = 'AFNetworkingLogger' + s.version = '1.0.0' + s.license = 'MIT' + s.summary = 'AFNetworking 3.0 Extension for Network Request Logging' + s.homepage = 'https://github.com/leleliu008/AFNetworkingLogger' + s.authors = { 'fpliu' => '792793182@qq.com' } + s.source = { :git => 'https://github.com/leleliu008/AFNetworkingLogger.git', :tag => s.version } + s.source_files = 'AFNetworkingLogger' + s.requires_arc = true + s.ios.deployment_target = '7.0' + s.osx.deployment_target = '10.9' + s.watchos.deployment_target = '2.0' + s.tvos.deployment_target = '9.0' + + s.dependency 'AFNetworking/NSURLSession', '~> 3.0' +end diff --git a/AFNetworkActivityLogger.xcodeproj/project.pbxproj b/AFNetworkingLogger.xcodeproj/project.pbxproj similarity index 66% rename from AFNetworkActivityLogger.xcodeproj/project.pbxproj rename to AFNetworkingLogger.xcodeproj/project.pbxproj index 1615f51..8dc875f 100644 --- a/AFNetworkActivityLogger.xcodeproj/project.pbxproj +++ b/AFNetworkingLogger.xcodeproj/project.pbxproj @@ -7,44 +7,44 @@ objects = { /* Begin PBXBuildFile section */ - 297DF56B1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5691C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 297DF56C1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5691C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 297DF56D1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5691C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 297DF56E1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5691C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 297DF5751C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5731C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 297DF5761C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5731C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 297DF5771C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5731C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 297DF5781C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5731C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 297DF5791C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5741C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m */; }; - 297DF57A1C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5741C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m */; }; - 297DF57B1C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5741C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m */; }; - 297DF57C1C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5741C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m */; }; - 297DF5841C1F1CA2001FA807 /* AFNetworkActivityLoggerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5831C1F1CA2001FA807 /* AFNetworkActivityLoggerTests.m */; }; - 297DF5861C1F1CA2001FA807 /* AFNetworkActivityLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D96E651BCC34CD00F571A5 /* AFNetworkActivityLogger.framework */; }; + 297DF56B1C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5691C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 297DF56C1C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5691C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 297DF56D1C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5691C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 297DF56E1C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5691C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 297DF5751C1F1058001FA807 /* AFNetworkingConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5731C1F1058001FA807 /* AFNetworkingConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 297DF5761C1F1058001FA807 /* AFNetworkingConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5731C1F1058001FA807 /* AFNetworkingConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 297DF5771C1F1058001FA807 /* AFNetworkingConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5731C1F1058001FA807 /* AFNetworkingConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 297DF5781C1F1058001FA807 /* AFNetworkingConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 297DF5731C1F1058001FA807 /* AFNetworkingConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 297DF5791C1F1058001FA807 /* AFNetworkingConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5741C1F1058001FA807 /* AFNetworkingConsoleLogger.m */; }; + 297DF57A1C1F1058001FA807 /* AFNetworkingConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5741C1F1058001FA807 /* AFNetworkingConsoleLogger.m */; }; + 297DF57B1C1F1058001FA807 /* AFNetworkingConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5741C1F1058001FA807 /* AFNetworkingConsoleLogger.m */; }; + 297DF57C1C1F1058001FA807 /* AFNetworkingConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5741C1F1058001FA807 /* AFNetworkingConsoleLogger.m */; }; + 297DF5841C1F1CA2001FA807 /* AFNetworkingLoggerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5831C1F1CA2001FA807 /* AFNetworkingLoggerTests.m */; }; + 297DF5861C1F1CA2001FA807 /* AFNetworkingLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D96E651BCC34CD00F571A5 /* AFNetworkingLogger.framework */; }; 297DF58C1C1F1CF1001FA807 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D96E781BCC3B9B00F571A5 /* AFNetworking.framework */; }; - 29D77AAA1BCC49E9005B1EF5 /* AFNetworkActivityLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D96E721BCC357B00F571A5 /* AFNetworkActivityLogger.m */; }; + 29D77AAA1BCC49E9005B1EF5 /* AFNetworkingLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D96E721BCC357B00F571A5 /* AFNetworkingLogger.m */; }; 29D77AAC1BCC4A01005B1EF5 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D77AAB1BCC4A01005B1EF5 /* AFNetworking.framework */; }; - 29D77AAE1BCC4A68005B1EF5 /* AFNetworkActivityLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E711BCC357B00F571A5 /* AFNetworkActivityLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 29D77AAF1BCC4A6E005B1EF5 /* AFNetworkActivityLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E901BCC3F1D00F571A5 /* AFNetworkActivityLogger.h */; }; - 29D77ABD1BCC4C41005B1EF5 /* AFNetworkActivityLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D96E721BCC357B00F571A5 /* AFNetworkActivityLogger.m */; }; - 29D77ABE1BCC4C65005B1EF5 /* AFNetworkActivityLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E711BCC357B00F571A5 /* AFNetworkActivityLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 29D77ABF1BCC4C6C005B1EF5 /* AFNetworkActivityLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E901BCC3F1D00F571A5 /* AFNetworkActivityLogger.h */; }; + 29D77AAE1BCC4A68005B1EF5 /* AFNetworkingLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E711BCC357B00F571A5 /* AFNetworkingLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 29D77AAF1BCC4A6E005B1EF5 /* AFNetworkingLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E901BCC3F1D00F571A5 /* AFNetworkingLogger.h */; }; + 29D77ABD1BCC4C41005B1EF5 /* AFNetworkingLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D96E721BCC357B00F571A5 /* AFNetworkingLogger.m */; }; + 29D77ABE1BCC4C65005B1EF5 /* AFNetworkingLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E711BCC357B00F571A5 /* AFNetworkingLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 29D77ABF1BCC4C6C005B1EF5 /* AFNetworkingLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E901BCC3F1D00F571A5 /* AFNetworkingLogger.h */; }; 29D77AC21BCC4C8F005B1EF5 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D77AC11BCC4C8F005B1EF5 /* AFNetworking.framework */; }; - 29D77AD11BCC4D96005B1EF5 /* AFNetworkActivityLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D96E721BCC357B00F571A5 /* AFNetworkActivityLogger.m */; }; + 29D77AD11BCC4D96005B1EF5 /* AFNetworkingLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D96E721BCC357B00F571A5 /* AFNetworkingLogger.m */; }; 29D77AD31BCC4DA2005B1EF5 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D77AD21BCC4DA2005B1EF5 /* AFNetworking.framework */; }; - 29D77AD51BCC4DB9005B1EF5 /* AFNetworkActivityLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E711BCC357B00F571A5 /* AFNetworkActivityLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 29D77AD61BCC4DBF005B1EF5 /* AFNetworkActivityLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E901BCC3F1D00F571A5 /* AFNetworkActivityLogger.h */; }; - 29D96E731BCC357B00F571A5 /* AFNetworkActivityLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E711BCC357B00F571A5 /* AFNetworkActivityLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 29D96E741BCC357B00F571A5 /* AFNetworkActivityLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D96E721BCC357B00F571A5 /* AFNetworkActivityLogger.m */; }; + 29D77AD51BCC4DB9005B1EF5 /* AFNetworkingLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E711BCC357B00F571A5 /* AFNetworkingLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 29D77AD61BCC4DBF005B1EF5 /* AFNetworkingLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E901BCC3F1D00F571A5 /* AFNetworkingLogger.h */; }; + 29D96E731BCC357B00F571A5 /* AFNetworkingLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E711BCC357B00F571A5 /* AFNetworkingLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 29D96E741BCC357B00F571A5 /* AFNetworkingLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D96E721BCC357B00F571A5 /* AFNetworkingLogger.m */; }; 29D96E791BCC3B9B00F571A5 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D96E781BCC3B9B00F571A5 /* AFNetworking.framework */; }; - 29D96E921BCC3F1D00F571A5 /* AFNetworkActivityLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E901BCC3F1D00F571A5 /* AFNetworkActivityLogger.h */; }; + 29D96E921BCC3F1D00F571A5 /* AFNetworkingLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E901BCC3F1D00F571A5 /* AFNetworkingLogger.h */; }; 29F28C241C1F1D84006BD785 /* AFNetworking.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29D96E781BCC3B9B00F571A5 /* AFNetworking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 29F28C2E1C1F2628006BD785 /* AFNetworkActivityLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D77AC91BCC4D4D005B1EF5 /* AFNetworkActivityLogger.framework */; }; - 29F28C341C1F265C006BD785 /* AFNetworkActivityLoggerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5831C1F1CA2001FA807 /* AFNetworkActivityLoggerTests.m */; }; + 29F28C2E1C1F2628006BD785 /* AFNetworkingLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D77AC91BCC4D4D005B1EF5 /* AFNetworkingLogger.framework */; }; + 29F28C341C1F265C006BD785 /* AFNetworkingLoggerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5831C1F1CA2001FA807 /* AFNetworkingLoggerTests.m */; }; 29F28C351C1F2666006BD785 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D77AD21BCC4DA2005B1EF5 /* AFNetworking.framework */; }; 29F28C371C1F267A006BD785 /* AFNetworking.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29D77AD21BCC4DA2005B1EF5 /* AFNetworking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 29F28C411C1F2C54006BD785 /* AFNetworkActivityLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D77AA21BCC49C9005B1EF5 /* AFNetworkActivityLogger.framework */; }; - 29F28C471C1F2C76006BD785 /* AFNetworkActivityLoggerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5831C1F1CA2001FA807 /* AFNetworkActivityLoggerTests.m */; }; + 29F28C411C1F2C54006BD785 /* AFNetworkingLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D77AA21BCC49C9005B1EF5 /* AFNetworkingLogger.framework */; }; + 29F28C471C1F2C76006BD785 /* AFNetworkingLoggerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 297DF5831C1F1CA2001FA807 /* AFNetworkingLoggerTests.m */; }; 29F28C481C1F2C81006BD785 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D77AAB1BCC4A01005B1EF5 /* AFNetworking.framework */; }; 29F28C4B1C1F2C9D006BD785 /* AFNetworking.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 29D77AAB1BCC4A01005B1EF5 /* AFNetworking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ @@ -55,21 +55,21 @@ containerPortal = 29D96E5C1BCC34CD00F571A5 /* Project object */; proxyType = 1; remoteGlobalIDString = 29D96E641BCC34CD00F571A5; - remoteInfo = "AFNetworkActivityLogger iOS"; + remoteInfo = "AFNetworkingLogger iOS"; }; 29F28C2F1C1F2628006BD785 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29D96E5C1BCC34CD00F571A5 /* Project object */; proxyType = 1; remoteGlobalIDString = 29D77AC81BCC4D4D005B1EF5; - remoteInfo = "AFNetworkActivityLogger tvOS"; + remoteInfo = "AFNetworkingLogger tvOS"; }; 29F28C421C1F2C54006BD785 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29D96E5C1BCC34CD00F571A5 /* Project object */; proxyType = 1; remoteGlobalIDString = 29D77AA11BCC49C9005B1EF5; - remoteInfo = "AFNetworkActivityLogger OS X"; + remoteInfo = "AFNetworkingLogger OS X"; }; /* End PBXContainerItemProxy section */ @@ -116,26 +116,26 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 297DF5691C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFNetworkActivityLoggerProtocol.h; sourceTree = ""; }; - 297DF5731C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFNetworkActivityConsoleLogger.h; sourceTree = ""; }; - 297DF5741C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFNetworkActivityConsoleLogger.m; sourceTree = ""; }; - 297DF5811C1F1CA2001FA807 /* AFNetworkActivityLoggerTests iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AFNetworkActivityLoggerTests iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 297DF5831C1F1CA2001FA807 /* AFNetworkActivityLoggerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AFNetworkActivityLoggerTests.m; sourceTree = ""; }; + 297DF5691C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFNetworkingLoggerProtocol.h; sourceTree = ""; }; + 297DF5731C1F1058001FA807 /* AFNetworkingConsoleLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFNetworkingConsoleLogger.h; sourceTree = ""; }; + 297DF5741C1F1058001FA807 /* AFNetworkingConsoleLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFNetworkingConsoleLogger.m; sourceTree = ""; }; + 297DF5811C1F1CA2001FA807 /* AFNetworkingLoggerTests iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AFNetworkingLoggerTests iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 297DF5831C1F1CA2001FA807 /* AFNetworkingLoggerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AFNetworkingLoggerTests.m; sourceTree = ""; }; 297DF5851C1F1CA2001FA807 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 29D77AA21BCC49C9005B1EF5 /* AFNetworkActivityLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworkActivityLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 29D77AA21BCC49C9005B1EF5 /* AFNetworkingLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworkingLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 29D77AAB1BCC4A01005B1EF5 /* AFNetworking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AFNetworking.framework; path = Carthage/Build/Mac/AFNetworking.framework; sourceTree = ""; }; - 29D77AB51BCC4BDD005B1EF5 /* AFNetworkActivityLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworkActivityLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 29D77AB51BCC4BDD005B1EF5 /* AFNetworkingLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworkingLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 29D77AC11BCC4C8F005B1EF5 /* AFNetworking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AFNetworking.framework; path = Carthage/Build/watchOS/AFNetworking.framework; sourceTree = ""; }; - 29D77AC91BCC4D4D005B1EF5 /* AFNetworkActivityLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworkActivityLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 29D77AC91BCC4D4D005B1EF5 /* AFNetworkingLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworkingLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 29D77AD21BCC4DA2005B1EF5 /* AFNetworking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AFNetworking.framework; path = Carthage/Build/tvOS/AFNetworking.framework; sourceTree = ""; }; - 29D96E651BCC34CD00F571A5 /* AFNetworkActivityLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworkActivityLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 29D96E711BCC357B00F571A5 /* AFNetworkActivityLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFNetworkActivityLogger.h; sourceTree = ""; }; - 29D96E721BCC357B00F571A5 /* AFNetworkActivityLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFNetworkActivityLogger.m; sourceTree = ""; }; + 29D96E651BCC34CD00F571A5 /* AFNetworkingLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AFNetworkingLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 29D96E711BCC357B00F571A5 /* AFNetworkingLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFNetworkingLogger.h; sourceTree = ""; }; + 29D96E721BCC357B00F571A5 /* AFNetworkingLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFNetworkingLogger.m; sourceTree = ""; }; 29D96E781BCC3B9B00F571A5 /* AFNetworking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AFNetworking.framework; path = Carthage/Build/iOS/AFNetworking.framework; sourceTree = ""; }; - 29D96E901BCC3F1D00F571A5 /* AFNetworkActivityLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFNetworkActivityLogger.h; sourceTree = ""; }; + 29D96E901BCC3F1D00F571A5 /* AFNetworkingLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFNetworkingLogger.h; sourceTree = ""; }; 29D96E911BCC3F1D00F571A5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 29F28C291C1F2628006BD785 /* AFNetworkActivityLoggerTests tvOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AFNetworkActivityLoggerTests tvOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 29F28C3C1C1F2C54006BD785 /* AFNetworkActivityLoggerTests OS X Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AFNetworkActivityLoggerTests OS X Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 29F28C291C1F2628006BD785 /* AFNetworkingLoggerTests tvOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AFNetworkingLoggerTests tvOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 29F28C3C1C1F2C54006BD785 /* AFNetworkingLoggerTests OS X Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AFNetworkingLoggerTests OS X Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -143,7 +143,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 297DF5861C1F1CA2001FA807 /* AFNetworkActivityLogger.framework in Frameworks */, + 297DF5861C1F1CA2001FA807 /* AFNetworkingLogger.framework in Frameworks */, 297DF58C1C1F1CF1001FA807 /* AFNetworking.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -184,7 +184,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 29F28C2E1C1F2628006BD785 /* AFNetworkActivityLogger.framework in Frameworks */, + 29F28C2E1C1F2628006BD785 /* AFNetworkingLogger.framework in Frameworks */, 29F28C351C1F2666006BD785 /* AFNetworking.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -193,7 +193,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 29F28C411C1F2C54006BD785 /* AFNetworkActivityLogger.framework in Frameworks */, + 29F28C411C1F2C54006BD785 /* AFNetworkingLogger.framework in Frameworks */, 29F28C481C1F2C81006BD785 /* AFNetworking.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -201,13 +201,13 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 297DF5821C1F1CA2001FA807 /* AFNetworkActivityLoggerTests */ = { + 297DF5821C1F1CA2001FA807 /* AFNetworkingLoggerTests */ = { isa = PBXGroup; children = ( - 297DF5831C1F1CA2001FA807 /* AFNetworkActivityLoggerTests.m */, + 297DF5831C1F1CA2001FA807 /* AFNetworkingLoggerTests.m */, 297DF5851C1F1CA2001FA807 /* Info.plist */, ); - name = AFNetworkActivityLoggerTests; + name = AFNetworkingLoggerTests; path = Tests; sourceTree = ""; }; @@ -226,9 +226,9 @@ isa = PBXGroup; children = ( 29D77AD41BCC4DA8005B1EF5 /* Dependency */, - 29D96E701BCC357B00F571A5 /* AFNetworkActivityLogger */, + 29D96E701BCC357B00F571A5 /* AFNetworkingLogger */, 29D96E8F1BCC3F1D00F571A5 /* Supporting Files */, - 297DF5821C1F1CA2001FA807 /* AFNetworkActivityLoggerTests */, + 297DF5821C1F1CA2001FA807 /* AFNetworkingLoggerTests */, 29D96E661BCC34CD00F571A5 /* Products */, ); sourceTree = ""; @@ -236,33 +236,33 @@ 29D96E661BCC34CD00F571A5 /* Products */ = { isa = PBXGroup; children = ( - 29D96E651BCC34CD00F571A5 /* AFNetworkActivityLogger.framework */, - 29D77AA21BCC49C9005B1EF5 /* AFNetworkActivityLogger.framework */, - 29D77AB51BCC4BDD005B1EF5 /* AFNetworkActivityLogger.framework */, - 29D77AC91BCC4D4D005B1EF5 /* AFNetworkActivityLogger.framework */, - 297DF5811C1F1CA2001FA807 /* AFNetworkActivityLoggerTests iOS Tests.xctest */, - 29F28C291C1F2628006BD785 /* AFNetworkActivityLoggerTests tvOS Tests.xctest */, - 29F28C3C1C1F2C54006BD785 /* AFNetworkActivityLoggerTests OS X Tests.xctest */, + 29D96E651BCC34CD00F571A5 /* AFNetworkingLogger.framework */, + 29D77AA21BCC49C9005B1EF5 /* AFNetworkingLogger.framework */, + 29D77AB51BCC4BDD005B1EF5 /* AFNetworkingLogger.framework */, + 29D77AC91BCC4D4D005B1EF5 /* AFNetworkingLogger.framework */, + 297DF5811C1F1CA2001FA807 /* AFNetworkingLoggerTests iOS Tests.xctest */, + 29F28C291C1F2628006BD785 /* AFNetworkingLoggerTests tvOS Tests.xctest */, + 29F28C3C1C1F2C54006BD785 /* AFNetworkingLoggerTests OS X Tests.xctest */, ); name = Products; sourceTree = ""; }; - 29D96E701BCC357B00F571A5 /* AFNetworkActivityLogger */ = { + 29D96E701BCC357B00F571A5 /* AFNetworkingLogger */ = { isa = PBXGroup; children = ( - 29D96E711BCC357B00F571A5 /* AFNetworkActivityLogger.h */, - 29D96E721BCC357B00F571A5 /* AFNetworkActivityLogger.m */, - 297DF5691C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h */, - 297DF5731C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h */, - 297DF5741C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m */, + 29D96E711BCC357B00F571A5 /* AFNetworkingLogger.h */, + 29D96E721BCC357B00F571A5 /* AFNetworkingLogger.m */, + 297DF5691C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h */, + 297DF5731C1F1058001FA807 /* AFNetworkingConsoleLogger.h */, + 297DF5741C1F1058001FA807 /* AFNetworkingConsoleLogger.m */, ); - path = AFNetworkActivityLogger; + path = AFNetworkingLogger; sourceTree = ""; }; 29D96E8F1BCC3F1D00F571A5 /* Supporting Files */ = { isa = PBXGroup; children = ( - 29D96E901BCC3F1D00F571A5 /* AFNetworkActivityLogger.h */, + 29D96E901BCC3F1D00F571A5 /* AFNetworkingLogger.h */, 29D96E911BCC3F1D00F571A5 /* Info.plist */, ); path = "Supporting Files"; @@ -275,10 +275,10 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 297DF56C1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */, - 29D77AAE1BCC4A68005B1EF5 /* AFNetworkActivityLogger.h in Headers */, - 297DF5761C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */, - 29D77AAF1BCC4A6E005B1EF5 /* AFNetworkActivityLogger.h in Headers */, + 297DF56C1C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h in Headers */, + 29D77AAE1BCC4A68005B1EF5 /* AFNetworkingLogger.h in Headers */, + 297DF5761C1F1058001FA807 /* AFNetworkingConsoleLogger.h in Headers */, + 29D77AAF1BCC4A6E005B1EF5 /* AFNetworkingLogger.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -286,10 +286,10 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 297DF56D1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */, - 29D77ABE1BCC4C65005B1EF5 /* AFNetworkActivityLogger.h in Headers */, - 297DF5771C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */, - 29D77ABF1BCC4C6C005B1EF5 /* AFNetworkActivityLogger.h in Headers */, + 297DF56D1C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h in Headers */, + 29D77ABE1BCC4C65005B1EF5 /* AFNetworkingLogger.h in Headers */, + 297DF5771C1F1058001FA807 /* AFNetworkingConsoleLogger.h in Headers */, + 29D77ABF1BCC4C6C005B1EF5 /* AFNetworkingLogger.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -297,10 +297,10 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 297DF56E1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */, - 29D77AD51BCC4DB9005B1EF5 /* AFNetworkActivityLogger.h in Headers */, - 297DF5781C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */, - 29D77AD61BCC4DBF005B1EF5 /* AFNetworkActivityLogger.h in Headers */, + 297DF56E1C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h in Headers */, + 29D77AD51BCC4DB9005B1EF5 /* AFNetworkingLogger.h in Headers */, + 297DF5781C1F1058001FA807 /* AFNetworkingConsoleLogger.h in Headers */, + 29D77AD61BCC4DBF005B1EF5 /* AFNetworkingLogger.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -308,19 +308,19 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 297DF56B1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */, - 29D96E731BCC357B00F571A5 /* AFNetworkActivityLogger.h in Headers */, - 297DF5751C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */, - 29D96E921BCC3F1D00F571A5 /* AFNetworkActivityLogger.h in Headers */, + 297DF56B1C1F0F72001FA807 /* AFNetworkingLoggerProtocol.h in Headers */, + 29D96E731BCC357B00F571A5 /* AFNetworkingLogger.h in Headers */, + 297DF5751C1F1058001FA807 /* AFNetworkingConsoleLogger.h in Headers */, + 29D96E921BCC3F1D00F571A5 /* AFNetworkingLogger.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 297DF5801C1F1CA2001FA807 /* AFNetworkActivityLoggerTests iOS Tests */ = { + 297DF5801C1F1CA2001FA807 /* AFNetworkingLoggerTests iOS Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 297DF5891C1F1CA2001FA807 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLoggerTests iOS Tests" */; + buildConfigurationList = 297DF5891C1F1CA2001FA807 /* Build configuration list for PBXNativeTarget "AFNetworkingLoggerTests iOS Tests" */; buildPhases = ( 297DF57D1C1F1CA2001FA807 /* Sources */, 297DF57E1C1F1CA2001FA807 /* Frameworks */, @@ -332,14 +332,14 @@ dependencies = ( 297DF5881C1F1CA2001FA807 /* PBXTargetDependency */, ); - name = "AFNetworkActivityLoggerTests iOS Tests"; - productName = AFNetworkActivityLoggerTests; - productReference = 297DF5811C1F1CA2001FA807 /* AFNetworkActivityLoggerTests iOS Tests.xctest */; + name = "AFNetworkingLoggerTests iOS Tests"; + productName = AFNetworkingLoggerTests; + productReference = 297DF5811C1F1CA2001FA807 /* AFNetworkingLoggerTests iOS Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 29D77AA11BCC49C9005B1EF5 /* AFNetworkActivityLogger OS X */ = { + 29D77AA11BCC49C9005B1EF5 /* AFNetworkingLogger OS X */ = { isa = PBXNativeTarget; - buildConfigurationList = 29D77AA71BCC49C9005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLogger OS X" */; + buildConfigurationList = 29D77AA71BCC49C9005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkingLogger OS X" */; buildPhases = ( 29D77A9D1BCC49C9005B1EF5 /* Sources */, 29D77A9E1BCC49C9005B1EF5 /* Frameworks */, @@ -351,14 +351,14 @@ ); dependencies = ( ); - name = "AFNetworkActivityLogger OS X"; - productName = "AFNetworkActivityLogger OS X"; - productReference = 29D77AA21BCC49C9005B1EF5 /* AFNetworkActivityLogger.framework */; + name = "AFNetworkingLogger OS X"; + productName = "AFNetworkingLogger OS X"; + productReference = 29D77AA21BCC49C9005B1EF5 /* AFNetworkingLogger.framework */; productType = "com.apple.product-type.framework"; }; - 29D77AB41BCC4BDD005B1EF5 /* AFNetworkActivityLogger watchOS */ = { + 29D77AB41BCC4BDD005B1EF5 /* AFNetworkingLogger watchOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 29D77ABA1BCC4BDD005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLogger watchOS" */; + buildConfigurationList = 29D77ABA1BCC4BDD005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkingLogger watchOS" */; buildPhases = ( 29D77AB01BCC4BDD005B1EF5 /* Sources */, 29D77AB11BCC4BDD005B1EF5 /* Frameworks */, @@ -371,14 +371,14 @@ ); dependencies = ( ); - name = "AFNetworkActivityLogger watchOS"; - productName = "AFNetworkActivityLogger watchOS"; - productReference = 29D77AB51BCC4BDD005B1EF5 /* AFNetworkActivityLogger.framework */; + name = "AFNetworkingLogger watchOS"; + productName = "AFNetworkingLogger watchOS"; + productReference = 29D77AB51BCC4BDD005B1EF5 /* AFNetworkingLogger.framework */; productType = "com.apple.product-type.framework"; }; - 29D77AC81BCC4D4D005B1EF5 /* AFNetworkActivityLogger tvOS */ = { + 29D77AC81BCC4D4D005B1EF5 /* AFNetworkingLogger tvOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 29D77ACE1BCC4D4D005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLogger tvOS" */; + buildConfigurationList = 29D77ACE1BCC4D4D005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkingLogger tvOS" */; buildPhases = ( 29D77AC41BCC4D4D005B1EF5 /* Sources */, 29D77AC51BCC4D4D005B1EF5 /* Frameworks */, @@ -390,14 +390,14 @@ ); dependencies = ( ); - name = "AFNetworkActivityLogger tvOS"; - productName = AFNetworkActivityLogger; - productReference = 29D77AC91BCC4D4D005B1EF5 /* AFNetworkActivityLogger.framework */; + name = "AFNetworkingLogger tvOS"; + productName = AFNetworkingLogger; + productReference = 29D77AC91BCC4D4D005B1EF5 /* AFNetworkingLogger.framework */; productType = "com.apple.product-type.framework"; }; - 29D96E641BCC34CD00F571A5 /* AFNetworkActivityLogger iOS */ = { + 29D96E641BCC34CD00F571A5 /* AFNetworkingLogger iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 29D96E6D1BCC34CD00F571A5 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLogger iOS" */; + buildConfigurationList = 29D96E6D1BCC34CD00F571A5 /* Build configuration list for PBXNativeTarget "AFNetworkingLogger iOS" */; buildPhases = ( 29D96E601BCC34CD00F571A5 /* Sources */, 29D96E611BCC34CD00F571A5 /* Frameworks */, @@ -409,14 +409,14 @@ ); dependencies = ( ); - name = "AFNetworkActivityLogger iOS"; - productName = AFNetworkActivityLogger; - productReference = 29D96E651BCC34CD00F571A5 /* AFNetworkActivityLogger.framework */; + name = "AFNetworkingLogger iOS"; + productName = AFNetworkingLogger; + productReference = 29D96E651BCC34CD00F571A5 /* AFNetworkingLogger.framework */; productType = "com.apple.product-type.framework"; }; - 29F28C281C1F2628006BD785 /* AFNetworkActivityLoggerTests tvOS Tests */ = { + 29F28C281C1F2628006BD785 /* AFNetworkingLoggerTests tvOS Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 29F28C311C1F2628006BD785 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLoggerTests tvOS Tests" */; + buildConfigurationList = 29F28C311C1F2628006BD785 /* Build configuration list for PBXNativeTarget "AFNetworkingLoggerTests tvOS Tests" */; buildPhases = ( 29F28C251C1F2628006BD785 /* Sources */, 29F28C261C1F2628006BD785 /* Frameworks */, @@ -428,14 +428,14 @@ dependencies = ( 29F28C301C1F2628006BD785 /* PBXTargetDependency */, ); - name = "AFNetworkActivityLoggerTests tvOS Tests"; - productName = "AFNetworkActivityLoggerTests tvOS Tests"; - productReference = 29F28C291C1F2628006BD785 /* AFNetworkActivityLoggerTests tvOS Tests.xctest */; + name = "AFNetworkingLoggerTests tvOS Tests"; + productName = "AFNetworkingLoggerTests tvOS Tests"; + productReference = 29F28C291C1F2628006BD785 /* AFNetworkingLoggerTests tvOS Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 29F28C3B1C1F2C54006BD785 /* AFNetworkActivityLoggerTests OS X Tests */ = { + 29F28C3B1C1F2C54006BD785 /* AFNetworkingLoggerTests OS X Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 29F28C441C1F2C54006BD785 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLoggerTests OS X Tests" */; + buildConfigurationList = 29F28C441C1F2C54006BD785 /* Build configuration list for PBXNativeTarget "AFNetworkingLoggerTests OS X Tests" */; buildPhases = ( 29F28C381C1F2C54006BD785 /* Sources */, 29F28C391C1F2C54006BD785 /* Frameworks */, @@ -447,9 +447,9 @@ dependencies = ( 29F28C431C1F2C54006BD785 /* PBXTargetDependency */, ); - name = "AFNetworkActivityLoggerTests OS X Tests"; - productName = "AFNetworkActivityLoggerTests OS X Tests"; - productReference = 29F28C3C1C1F2C54006BD785 /* AFNetworkActivityLoggerTests OS X Tests.xctest */; + name = "AFNetworkingLoggerTests OS X Tests"; + productName = "AFNetworkingLoggerTests OS X Tests"; + productReference = 29F28C3C1C1F2C54006BD785 /* AFNetworkingLoggerTests OS X Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -484,7 +484,7 @@ }; }; }; - buildConfigurationList = 29D96E5F1BCC34CD00F571A5 /* Build configuration list for PBXProject "AFNetworkActivityLogger" */; + buildConfigurationList = 29D96E5F1BCC34CD00F571A5 /* Build configuration list for PBXProject "AFNetworkingLogger" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -496,13 +496,13 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 29D96E641BCC34CD00F571A5 /* AFNetworkActivityLogger iOS */, - 29D77AA11BCC49C9005B1EF5 /* AFNetworkActivityLogger OS X */, - 29D77AB41BCC4BDD005B1EF5 /* AFNetworkActivityLogger watchOS */, - 29D77AC81BCC4D4D005B1EF5 /* AFNetworkActivityLogger tvOS */, - 297DF5801C1F1CA2001FA807 /* AFNetworkActivityLoggerTests iOS Tests */, - 29F28C281C1F2628006BD785 /* AFNetworkActivityLoggerTests tvOS Tests */, - 29F28C3B1C1F2C54006BD785 /* AFNetworkActivityLoggerTests OS X Tests */, + 29D96E641BCC34CD00F571A5 /* AFNetworkingLogger iOS */, + 29D77AA11BCC49C9005B1EF5 /* AFNetworkingLogger OS X */, + 29D77AB41BCC4BDD005B1EF5 /* AFNetworkingLogger watchOS */, + 29D77AC81BCC4D4D005B1EF5 /* AFNetworkingLogger tvOS */, + 297DF5801C1F1CA2001FA807 /* AFNetworkingLoggerTests iOS Tests */, + 29F28C281C1F2628006BD785 /* AFNetworkingLoggerTests tvOS Tests */, + 29F28C3B1C1F2C54006BD785 /* AFNetworkingLoggerTests OS X Tests */, ); }; /* End PBXProject section */ @@ -623,7 +623,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 297DF5841C1F1CA2001FA807 /* AFNetworkActivityLoggerTests.m in Sources */, + 297DF5841C1F1CA2001FA807 /* AFNetworkingLoggerTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -631,8 +631,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 29D77AAA1BCC49E9005B1EF5 /* AFNetworkActivityLogger.m in Sources */, - 297DF57A1C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m in Sources */, + 29D77AAA1BCC49E9005B1EF5 /* AFNetworkingLogger.m in Sources */, + 297DF57A1C1F1058001FA807 /* AFNetworkingConsoleLogger.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -640,8 +640,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 29D77ABD1BCC4C41005B1EF5 /* AFNetworkActivityLogger.m in Sources */, - 297DF57B1C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m in Sources */, + 29D77ABD1BCC4C41005B1EF5 /* AFNetworkingLogger.m in Sources */, + 297DF57B1C1F1058001FA807 /* AFNetworkingConsoleLogger.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -649,8 +649,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 29D77AD11BCC4D96005B1EF5 /* AFNetworkActivityLogger.m in Sources */, - 297DF57C1C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m in Sources */, + 29D77AD11BCC4D96005B1EF5 /* AFNetworkingLogger.m in Sources */, + 297DF57C1C1F1058001FA807 /* AFNetworkingConsoleLogger.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -658,8 +658,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 29D96E741BCC357B00F571A5 /* AFNetworkActivityLogger.m in Sources */, - 297DF5791C1F1058001FA807 /* AFNetworkActivityConsoleLogger.m in Sources */, + 29D96E741BCC357B00F571A5 /* AFNetworkingLogger.m in Sources */, + 297DF5791C1F1058001FA807 /* AFNetworkingConsoleLogger.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -667,7 +667,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 29F28C341C1F265C006BD785 /* AFNetworkActivityLoggerTests.m in Sources */, + 29F28C341C1F265C006BD785 /* AFNetworkingLoggerTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -675,7 +675,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 29F28C471C1F2C76006BD785 /* AFNetworkActivityLoggerTests.m in Sources */, + 29F28C471C1F2C76006BD785 /* AFNetworkingLoggerTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -684,17 +684,17 @@ /* Begin PBXTargetDependency section */ 297DF5881C1F1CA2001FA807 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 29D96E641BCC34CD00F571A5 /* AFNetworkActivityLogger iOS */; + target = 29D96E641BCC34CD00F571A5 /* AFNetworkingLogger iOS */; targetProxy = 297DF5871C1F1CA2001FA807 /* PBXContainerItemProxy */; }; 29F28C301C1F2628006BD785 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 29D77AC81BCC4D4D005B1EF5 /* AFNetworkActivityLogger tvOS */; + target = 29D77AC81BCC4D4D005B1EF5 /* AFNetworkingLogger tvOS */; targetProxy = 29F28C2F1C1F2628006BD785 /* PBXContainerItemProxy */; }; 29F28C431C1F2C54006BD785 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 29D77AA11BCC49C9005B1EF5 /* AFNetworkActivityLogger OS X */; + target = 29D77AA11BCC49C9005B1EF5 /* AFNetworkingLogger OS X */; targetProxy = 29F28C421C1F2C54006BD785 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -710,7 +710,7 @@ INFOPLIST_FILE = Tests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.alamofire.AFNetworkActivityLoggerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.alamofire.AFNetworkingLoggerTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -725,7 +725,7 @@ INFOPLIST_FILE = Tests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.alamofire.AFNetworkActivityLoggerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.alamofire.AFNetworkingLoggerTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -748,7 +748,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; - PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkActivityLogger-OS-X"; + PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkingLogger-OS-X"; PRODUCT_NAME = "$(inherited)"; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -773,7 +773,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; - PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkActivityLogger-OS-X"; + PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkingLogger-OS-X"; PRODUCT_NAME = "$(inherited)"; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -796,7 +796,7 @@ INFOPLIST_FILE = "$(inherited)"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkActivityLogger-watchOS"; + PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkingLogger-watchOS"; PRODUCT_NAME = "$(inherited)"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -821,7 +821,7 @@ INFOPLIST_FILE = "$(inherited)"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkActivityLogger-watchOS"; + PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkingLogger-watchOS"; PRODUCT_NAME = "$(inherited)"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -845,7 +845,7 @@ INFOPLIST_FILE = "$(inherited)"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.alamofire.AFNetworkActivityLogger; + PRODUCT_BUNDLE_IDENTIFIER = com.alamofire.AFNetworkingLogger; PRODUCT_NAME = "$(inherited)"; SDKROOT = appletvos; SKIP_INSTALL = YES; @@ -869,7 +869,7 @@ INFOPLIST_FILE = "$(inherited)"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.alamofire.AFNetworkActivityLogger; + PRODUCT_BUNDLE_IDENTIFIER = com.alamofire.AFNetworkingLogger; PRODUCT_NAME = "$(inherited)"; SDKROOT = appletvos; SKIP_INSTALL = YES; @@ -928,7 +928,7 @@ MODULEMAP_FILE = "$(PROJECT_DIR)/Supporting Files/modulemap.module"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = AFNetworkActivityLogger; + PRODUCT_NAME = AFNetworkingLogger; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -979,7 +979,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MODULEMAP_FILE = "$(PROJECT_DIR)/Supporting Files/modulemap.module"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = AFNetworkActivityLogger; + PRODUCT_NAME = AFNetworkingLogger; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -1004,7 +1004,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.alamofire.AFNetworkActivityLogger; + PRODUCT_BUNDLE_IDENTIFIER = com.fpliu.AFNetworkingLogger; PRODUCT_NAME = "$(inherited)"; SKIP_INSTALL = YES; }; @@ -1026,7 +1026,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.alamofire.AFNetworkActivityLogger; + PRODUCT_BUNDLE_IDENTIFIER = com.fpliu.AFNetworkingLogger; PRODUCT_NAME = "$(inherited)"; SKIP_INSTALL = YES; }; @@ -1041,7 +1041,7 @@ ); INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkActivityLoggerTests-tvOS-Tests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkingLoggerTests-tvOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -1057,7 +1057,7 @@ ); INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkActivityLoggerTests-tvOS-Tests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkingLoggerTests-tvOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -1076,7 +1076,7 @@ INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkActivityLoggerTests-OS-X-Tests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkingLoggerTests-OS-X-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; @@ -1094,7 +1094,7 @@ INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkActivityLoggerTests-OS-X-Tests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.alamofire.AFNetworkingLoggerTests-OS-X-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; @@ -1103,7 +1103,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 297DF5891C1F1CA2001FA807 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLoggerTests iOS Tests" */ = { + 297DF5891C1F1CA2001FA807 /* Build configuration list for PBXNativeTarget "AFNetworkingLoggerTests iOS Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( 297DF58A1C1F1CA2001FA807 /* Debug */, @@ -1112,7 +1112,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 29D77AA71BCC49C9005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLogger OS X" */ = { + 29D77AA71BCC49C9005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkingLogger OS X" */ = { isa = XCConfigurationList; buildConfigurations = ( 29D77AA81BCC49C9005B1EF5 /* Debug */, @@ -1121,7 +1121,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 29D77ABA1BCC4BDD005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLogger watchOS" */ = { + 29D77ABA1BCC4BDD005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkingLogger watchOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 29D77ABB1BCC4BDD005B1EF5 /* Debug */, @@ -1130,7 +1130,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 29D77ACE1BCC4D4D005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLogger tvOS" */ = { + 29D77ACE1BCC4D4D005B1EF5 /* Build configuration list for PBXNativeTarget "AFNetworkingLogger tvOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 29D77ACF1BCC4D4D005B1EF5 /* Debug */, @@ -1139,7 +1139,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 29D96E5F1BCC34CD00F571A5 /* Build configuration list for PBXProject "AFNetworkActivityLogger" */ = { + 29D96E5F1BCC34CD00F571A5 /* Build configuration list for PBXProject "AFNetworkingLogger" */ = { isa = XCConfigurationList; buildConfigurations = ( 29D96E6B1BCC34CD00F571A5 /* Debug */, @@ -1148,7 +1148,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 29D96E6D1BCC34CD00F571A5 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLogger iOS" */ = { + 29D96E6D1BCC34CD00F571A5 /* Build configuration list for PBXNativeTarget "AFNetworkingLogger iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 29D96E6E1BCC34CD00F571A5 /* Debug */, @@ -1157,7 +1157,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 29F28C311C1F2628006BD785 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLoggerTests tvOS Tests" */ = { + 29F28C311C1F2628006BD785 /* Build configuration list for PBXNativeTarget "AFNetworkingLoggerTests tvOS Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( 29F28C321C1F2628006BD785 /* Debug */, @@ -1166,7 +1166,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 29F28C441C1F2C54006BD785 /* Build configuration list for PBXNativeTarget "AFNetworkActivityLoggerTests OS X Tests" */ = { + 29F28C441C1F2C54006BD785 /* Build configuration list for PBXNativeTarget "AFNetworkingLoggerTests OS X Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( 29F28C451C1F2C54006BD785 /* Debug */, diff --git a/AFNetworkActivityLogger.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/AFNetworkingLogger.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 64% rename from AFNetworkActivityLogger.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to AFNetworkingLogger.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 01ba856..34ef42a 100644 --- a/AFNetworkActivityLogger.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/AFNetworkingLogger.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:AFNetworkingLogger.xcodeproj"> diff --git a/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger OS X.xcscheme b/AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger OS X.xcscheme similarity index 73% rename from AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger OS X.xcscheme rename to AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger OS X.xcscheme index 31352b8..a15227f 100644 --- a/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger OS X.xcscheme +++ b/AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger OS X.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger OS X" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -36,9 +36,9 @@ + BuildableName = "AFNetworkingLoggerTests OS X Tests.xctest" + BlueprintName = "AFNetworkingLoggerTests OS X Tests" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -46,9 +46,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger OS X" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -69,9 +69,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger OS X" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -87,9 +87,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger OS X" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> diff --git a/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger iOS.xcscheme b/AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger iOS.xcscheme similarity index 73% rename from AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger iOS.xcscheme rename to AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger iOS.xcscheme index 2b28fb3..5be7597 100644 --- a/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger iOS.xcscheme +++ b/AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger iOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger iOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -36,9 +36,9 @@ + BuildableName = "AFNetworkingLoggerTests iOS Tests.xctest" + BlueprintName = "AFNetworkingLoggerTests iOS Tests" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -46,9 +46,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger iOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -68,9 +68,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger iOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -86,9 +86,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger iOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> diff --git a/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger tvOS.xcscheme b/AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger tvOS.xcscheme similarity index 73% rename from AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger tvOS.xcscheme rename to AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger tvOS.xcscheme index 6cc0ace..806fa72 100644 --- a/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger tvOS.xcscheme +++ b/AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger tvOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger tvOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -36,9 +36,9 @@ + BuildableName = "AFNetworkingLoggerTests tvOS Tests.xctest" + BlueprintName = "AFNetworkingLoggerTests tvOS Tests" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -46,9 +46,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger tvOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -69,9 +69,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger tvOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -87,9 +87,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger tvOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> diff --git a/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger watchOS.xcscheme b/AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger watchOS.xcscheme similarity index 79% rename from AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger watchOS.xcscheme rename to AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger watchOS.xcscheme index 8c1b5e2..d6812b6 100644 --- a/AFNetworkActivityLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkActivityLogger watchOS.xcscheme +++ b/AFNetworkingLogger.xcodeproj/xcshareddata/xcschemes/AFNetworkingLogger watchOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger watchOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -48,9 +48,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger watchOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> @@ -66,9 +66,9 @@ + BuildableName = "AFNetworkingLogger.framework" + BlueprintName = "AFNetworkingLogger watchOS" + ReferencedContainer = "container:AFNetworkingLogger.xcodeproj"> diff --git a/AFNetworkActivityLogger.xcworkspace/contents.xcworkspacedata b/AFNetworkingLogger.xcworkspace/contents.xcworkspacedata similarity index 64% rename from AFNetworkActivityLogger.xcworkspace/contents.xcworkspacedata rename to AFNetworkingLogger.xcworkspace/contents.xcworkspacedata index 1faf925..8712db2 100644 --- a/AFNetworkActivityLogger.xcworkspace/contents.xcworkspacedata +++ b/AFNetworkingLogger.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "group:AFNetworkingLogger.xcodeproj"> diff --git a/AFNetworkingLogger.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AFNetworkingLogger.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/AFNetworkingLogger.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.h b/AFNetworkingLogger/AFNetworkingConsoleLogger.h similarity index 83% rename from AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.h rename to AFNetworkingLogger/AFNetworkingConsoleLogger.h index 63657a4..c0c624e 100644 --- a/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.h +++ b/AFNetworkingLogger/AFNetworkingConsoleLogger.h @@ -1,4 +1,4 @@ -// AFNetworkActivityConsoleLogger.h +// AFNetworkingConsoleLogger.h // // Copyright (c) 2018 AFNetworking (http://afnetworking.com/) // @@ -21,12 +21,12 @@ // THE SOFTWARE. #import -#import "AFNetworkActivityLoggerProtocol.h" +#import "AFNetworkingLoggerProtocol.h" /** - `AFNetworkActivityConsoleLogger` logs requests and responses made by AFNetworking to the console. + `AFNetworkingConsoleLogger` logs requests and responses made by AFNetworking to the console. */ -@interface AFNetworkActivityConsoleLogger : NSObject +@interface AFNetworkingConsoleLogger : NSObject @property (nonatomic, strong) NSPredicate *filterPredicate; @property (nonatomic, assign) AFHTTPRequestLoggerLevel level; diff --git a/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m b/AFNetworkingLogger/AFNetworkingConsoleLogger.m similarity index 97% rename from AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m rename to AFNetworkingLogger/AFNetworkingConsoleLogger.m index 0d549d8..587f095 100644 --- a/AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.m +++ b/AFNetworkingLogger/AFNetworkingConsoleLogger.m @@ -1,4 +1,4 @@ -// AFNetworkActivityConsoleLogger.h +// AFNetworkingConsoleLogger.h // // Copyright (c) 2018 AFNetworking (http://afnetworking.com/) // @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "AFNetworkActivityConsoleLogger.h" +#import "AFNetworkingConsoleLogger.h" -@implementation AFNetworkActivityConsoleLogger +@implementation AFNetworkingConsoleLogger - (id)init { self = [super init]; diff --git a/AFNetworkActivityLogger/AFNetworkActivityLogger.h b/AFNetworkingLogger/AFNetworkingLogger.h similarity index 62% rename from AFNetworkActivityLogger/AFNetworkActivityLogger.h rename to AFNetworkingLogger/AFNetworkingLogger.h index 410cc5d..4420a85 100644 --- a/AFNetworkActivityLogger/AFNetworkActivityLogger.h +++ b/AFNetworkingLogger/AFNetworkingLogger.h @@ -1,4 +1,4 @@ -// AFNetworkActivityLogger.h +// AFNetworkingLogger.h // // Copyright (c) 2018 AFNetworking (http://afnetworking.com/) // @@ -21,23 +21,23 @@ // THE SOFTWARE. #import -#import "AFNetworkActivityLoggerProtocol.h" +#import "AFNetworkingLoggerProtocol.h" /** - `AFNetworkActivityLogger` logs requests and responses made by AFNetworking, with an adjustable level of detail. + `AFNetworkingLogger` logs requests and responses made by AFNetworking, with an adjustable level of detail. - Applications should enable the shared instance of `AFNetworkActivityLogger` in `AppDelegate -application:didFinishLaunchingWithOptions:`: + Applications should enable the shared instance of `AFNetworkingLogger` in `AppDelegate -application:didFinishLaunchingWithOptions:`: - [[AFNetworkActivityLogger sharedLogger] startLogging]; + [[AFNetworkingLogger sharedLogger] startLogging]; - `AFNetworkActivityLogger` listens for `AFNetworkingOperationDidStartNotification` and `AFNetworkingOperationDidFinishNotification` notifications, which are posted by AFNetworking as request operations are started and finish. For further customization of logging output, users are encouraged to implement desired functionality by listening for these notifications. + `AFNetworkingLogger` listens for `AFNetworkingOperationDidStartNotification` and `AFNetworkingOperationDidFinishNotification` notifications, which are posted by AFNetworking as request operations are started and finish. For further customization of logging output, users are encouraged to implement desired functionality by listening for these notifications. */ -@interface AFNetworkActivityLogger : NSObject +@interface AFNetworkingLogger : NSObject /** - The set of loggers current managed by the shared activity logger. By default, this includes one `AFNetworkActivityConsoleLogger` + The set of loggers current managed by the shared activity logger. By default, this includes one `AFNetworkingConsoleLogger` */ -@property (nonatomic, strong, readonly) NSSet *loggers; +@property (nonatomic, strong, readonly) NSSet *loggers; /** Returns the shared logger instance. @@ -62,11 +62,11 @@ /** Adds the given logger to be managed to the `loggers` set. */ -- (void)addLogger:(id )logger; +- (void)addLogger:(id )logger; /** Removes the given logger from the `loggers` set. */ -- (void)removeLogger:(id )logger; +- (void)removeLogger:(id )logger; @end diff --git a/AFNetworkActivityLogger/AFNetworkActivityLogger.m b/AFNetworkingLogger/AFNetworkingLogger.m similarity index 86% rename from AFNetworkActivityLogger/AFNetworkActivityLogger.m rename to AFNetworkingLogger/AFNetworkingLogger.m index 8a200b6..81b19ee 100644 --- a/AFNetworkActivityLogger/AFNetworkActivityLogger.m +++ b/AFNetworkingLogger/AFNetworkingLogger.m @@ -1,4 +1,4 @@ -// AFNetworkActivityLogger.h +// AFNetworkingLogger.h // // Copyright (c) 2018 AFNetworking (http://afnetworking.com/) // @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "AFNetworkActivityLogger.h" +#import "AFNetworkingLogger.h" #import -#import "AFNetworkActivityConsoleLogger.h" +#import "AFNetworkingConsoleLogger.h" #import static NSError * AFNetworkErrorFromNotification(NSNotification *notification) { @@ -36,15 +36,15 @@ return error; } -@interface AFNetworkActivityLogger () +@interface AFNetworkingLogger () @property (nonatomic, strong) NSMutableSet *mutableLoggers; @end -@implementation AFNetworkActivityLogger +@implementation AFNetworkingLogger + (instancetype)sharedLogger { - static AFNetworkActivityLogger *_sharedLogger = nil; + static AFNetworkingLogger *_sharedLogger = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ @@ -62,7 +62,7 @@ - (id)init { self.mutableLoggers = [NSMutableSet set]; - AFNetworkActivityConsoleLogger *consoleLogger = [AFNetworkActivityConsoleLogger new]; + AFNetworkingConsoleLogger *consoleLogger = [AFNetworkingConsoleLogger new]; [self addLogger:consoleLogger]; return self; @@ -76,16 +76,16 @@ - (void)dealloc { [self stopLogging]; } -- (void)addLogger:(id)logger { +- (void)addLogger:(id)logger { [self.mutableLoggers addObject:logger]; } -- (void)removeLogger:(id)logger { +- (void)removeLogger:(id)logger { [self.mutableLoggers removeObject:logger]; } - (void)setLogLevel:(AFHTTPRequestLoggerLevel)level { - for (idlogger in self.loggers) { + for (idlogger in self.loggers) { logger.level = level; } } @@ -114,7 +114,7 @@ - (void)networkRequestDidStart:(NSNotification *)notification { objc_setAssociatedObject(notification.object, AFNetworkRequestStartDate, [NSDate date], OBJC_ASSOCIATION_RETAIN_NONATOMIC); - for (id logger in self.loggers) { + for (id logger in self.loggers) { if (request && logger.filterPredicate && [logger.filterPredicate evaluateWithObject:request]) { return; } @@ -140,7 +140,7 @@ - (void)networkRequestDidFinish:(NSNotification *)notification { NSTimeInterval elapsedTime = [[NSDate date] timeIntervalSinceDate:objc_getAssociatedObject(notification.object, AFNetworkRequestStartDate)]; - for (id logger in self.loggers) { + for (id logger in self.loggers) { if (request && logger.filterPredicate && [logger.filterPredicate evaluateWithObject:request]) { return; } diff --git a/AFNetworkActivityLogger/AFNetworkActivityLoggerProtocol.h b/AFNetworkingLogger/AFNetworkingLoggerProtocol.h similarity index 83% rename from AFNetworkActivityLogger/AFNetworkActivityLoggerProtocol.h rename to AFNetworkingLogger/AFNetworkingLoggerProtocol.h index 1462821..104716a 100644 --- a/AFNetworkActivityLogger/AFNetworkActivityLoggerProtocol.h +++ b/AFNetworkingLogger/AFNetworkingLoggerProtocol.h @@ -1,4 +1,4 @@ -// AFNetworkActivityLoggerProtocol.h +// AFNetworkingLoggerProtocol.h // // Copyright (c) 2018 AFNetworking (http://afnetworking.com/) // @@ -30,7 +30,7 @@ /** ## Logging Levels - The following constants specify the available logging levels for `AFNetworkActivityLogger`: + The following constants specify the available logging levels for `AFNetworkingLogger`: enum { AFLoggerLevelOff, @@ -63,15 +63,15 @@ typedef NS_ENUM(NSUInteger, AFHTTPRequestLoggerLevel) { /** - `AFNetworkActivityLoggerProtocol` declares the interface to log requests and responses made by AFNetworking, with an adjustable level of detail. + `AFNetworkingLoggerProtocol` declares the interface to log requests and responses made by AFNetworking, with an adjustable level of detail. - Objects that conform to `AFNetworkActivityLoggerProtocol` should be added to the shared instance of `AFNetworkActivityLogger`. Applications should then enable the shared instance of `AFNetworkActivityLogger` in `AppDelegate -application:didFinishLaunchingWithOptions:`: + Objects that conform to `AFNetworkingLoggerProtocol` should be added to the shared instance of `AFNetworkingLogger`. Applications should then enable the shared instance of `AFNetworkingLogger` in `AppDelegate -application:didFinishLaunchingWithOptions:`: - [[AFNetworkActivityLogger sharedLogger] startLogging]; + [[AFNetworkingLogger sharedLogger] startLogging]; For further customization of logging output, users can create additional classes that conform to this protocol, and add them to the shared logger. */ -@protocol AFNetworkActivityLoggerProtocol +@protocol AFNetworkingLoggerProtocol /** Omit requests which match the specified predicate, if provided. `nil` by default. diff --git a/CHANGELOG.md b/CHANGELOG.md index 22c8063..564cf82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file. --- -## [3.0.0](https://github.com/AFNetworking/AFNetworkActivityLogger/releases/tag/3.0.0) (03/23/2018) -Released on Friday, March 23, 2018. All issues associated with this milestone can be found using this [filter](https://github.com/AFNetworking/AFNetworkActivityLogger/issues?q=milestone%3A3.0.0+is%3Aclosed). +## [3.0.0](https://github.com/AFNetworking/AFNetworkingLogger/releases/tag/3.0.0) (03/23/2018) +Released on Friday, March 23, 2018. All issues associated with this milestone can be found using this [filter](https://github.com/AFNetworking/AFNetworkingLogger/issues?q=milestone%3A3.0.0+is%3Aclosed). #### Changes * Add setLogLevel method. - * Implemented by Jon Shier in [#43](https://github.com/AFNetworking/AFNetworkActivityLogger/pull/43). + * Implemented by Jon Shier in [#43](https://github.com/AFNetworking/AFNetworkingLogger/pull/43). diff --git a/README.md b/README.md index 9c12d29..484fc7a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# AFNetworkActivityLogger +# AFNetworkingLogger -`AFNetworkActivityLogger` is an extension for [AFNetworking](http://github.com/AFNetworking/AFNetworking/) 3.0 that logs network requests as they are sent and received. +`AFNetworkingLogger` is an extension for [AFNetworking](http://github.com/AFNetworking/AFNetworking/) 3.0 that logs network requests as they are sent and received. -> `AFNetworkActivityLogger` listens `AFNetworkingTaskDidStartNotification` and `AFNetworkingTaskDidFinishNotification` notifications, which are posted by AFNetworking as session tasks are started and finish. For further customization of logging output, users are encouraged to implement desired functionality by creating new objects that conform to `AFNetworkActivityLoggerProtocol`. +> `AFNetworkingLogger` listens `AFNetworkingTaskDidStartNotification` and `AFNetworkingTaskDidFinishNotification` notifications, which are posted by AFNetworking as session tasks are started and finish. For further customization of logging output, users are encouraged to implement desired functionality by creating new objects that conform to `AFNetworkingLoggerProtocol`. ## 2.x -> 3.x Migration 3.0.0 featured the following breaking API changes: @@ -15,7 +15,7 @@ Add the following code to `AppDelegate.m -application:didFinishLaunchingWithOptions:`: ``` objective-c -[[AFNetworkActivityLogger sharedLogger] startLogging]; +[[AFNetworkingLogger sharedLogger] startLogging]; ``` Now all `NSURLSessionTask` objects created by an `AFURLSessionManager` will have their request and response logged to the console, a la: @@ -28,11 +28,11 @@ GET http://example.com/foo/bar.json If the default logging level is too verbose—say, if you only want to know when requests fail—then changing it is as simple as: ``` objective-c -[[AFNetworkActivityLogger sharedLogger] setLevel:AFLoggerLevelError]; +[[AFNetworkingLogger sharedLogger] setLevel:AFLoggerLevelError]; ``` ## Logging Levels -By default, the shared logger is configured with an `AFNetworkActivityConsoleLogger` with a debug level set to `AFLoggerLevelInfo`. To change the level, simply access the logger through the `loggers` property, and adjust the level. The following levels are provided: +By default, the shared logger is configured with an `AFNetworkingConsoleLogger` with a debug level set to `AFLoggerLevelInfo`. To change the level, simply access the logger through the `loggers` property, and adjust the level. The following levels are provided: * `AFLoggerLevelOff`: Do not log requests or responses. * `AFLoggerLevelDebug` :Logs HTTP method, URL, header fields, & request body for requests, and status code, URL, header fields, response string, & elapsed time for responses. @@ -40,10 +40,10 @@ By default, the shared logger is configured with an `AFNetworkActivityConsoleLog * `AFLoggerLevelError`: Logs HTTP method & URL for requests, and status code, URL, & elapsed time for responses, but only for failed requests. ## Filtering Requests -To limit the requests that are logged by a unique logger, each object that conforms to `AFNetworkActivityLoggerProtocol` has a `filterPredicate` property. If the predicate returns true, the request will not be forwarded to the logger. For example, a custom file logger could be created that only logs requests for `http://httpbin.org`, while a console logger could be used to log all errors in the application. +To limit the requests that are logged by a unique logger, each object that conforms to `AFNetworkingLoggerProtocol` has a `filterPredicate` property. If the predicate returns true, the request will not be forwarded to the logger. For example, a custom file logger could be created that only logs requests for `http://httpbin.org`, while a console logger could be used to log all errors in the application. ```Objective-C -AFNetworkActivityConsoleLogger *testLogger = [AFNetworkActivityConsoleLogger new]; +AFNetworkingConsoleLogger *testLogger = [AFNetworkingConsoleLogger new]; NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(NSURLRequest * _Nonnull request, NSDictionary * _Nullable bindings) { return !([[request URL] baseURL] isEqualToString:@"httpbin.org"]) }]; @@ -51,10 +51,10 @@ NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(NSURLRequest * _ ``` ## Custom Loggers -By default, the shared logger is configured with an `AFNetworkActivityConsoleLogger`. +By default, the shared logger is configured with an `AFNetworkingConsoleLogger`. -To create a custom logger, create a new object that conforms to `AFNetworkActivityLoggerProtocol`, and add it to the shared logger. Be sure and configure the proper default logging level. +To create a custom logger, create a new object that conforms to `AFNetworkingLoggerProtocol`, and add it to the shared logger. Be sure and configure the proper default logging level. ## License -AFNetworkActivityLogger is available under the MIT license. See the LICENSE file for more info. +AFNetworkingLogger is available under the MIT license. See the LICENSE file for more info. diff --git a/Supporting Files/AFNetworkActivityLogger.h b/Supporting Files/AFNetworkingLogger.h similarity index 68% rename from Supporting Files/AFNetworkActivityLogger.h rename to Supporting Files/AFNetworkingLogger.h index 763a832..9a90ab5 100644 --- a/Supporting Files/AFNetworkActivityLogger.h +++ b/Supporting Files/AFNetworkingLogger.h @@ -1,4 +1,4 @@ -// AFNetworkActivityLogger.h +// AFNetworkingLogger.h // // Copyright (c) 2018 AFNetworking (http://afnetworking.com/) // @@ -22,15 +22,15 @@ #import -//! Project version number for AFNetworkActivityLogger. -FOUNDATION_EXPORT double AFNetworkActivityLoggerVersionNumber; +//! Project version number for AFNetworkingLogger. +FOUNDATION_EXPORT double AFNetworkingLoggerVersionNumber; -//! Project version string for AFNetworkActivityLogger. -FOUNDATION_EXPORT const unsigned char AFNetworkActivityLoggerVersionString[]; +//! Project version string for AFNetworkingLogger. +FOUNDATION_EXPORT const unsigned char AFNetworkingLoggerVersionString[]; -// In this header, you should import all the public headers of your framework using statements like #import +// In this header, you should import all the public headers of your framework using statements like #import -#import -#import -#import +#import +#import +#import diff --git a/Supporting Files/Info.plist b/Supporting Files/Info.plist index e6985ec..1fe066c 100644 --- a/Supporting Files/Info.plist +++ b/Supporting Files/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.0 + 1.0 CFBundleSignature ???? CFBundleVersion - 3.0.0 + 1.0.0 NSPrincipalClass diff --git a/Supporting Files/modulemap.module b/Supporting Files/modulemap.module index bc5b8b9..c820bb1 100644 --- a/Supporting Files/modulemap.module +++ b/Supporting Files/modulemap.module @@ -1,16 +1,16 @@ -framework module AFNetworkActivityLogger { - module AFNetworkActivityLogger { - header "AFNetworkActivityLogger.h" +framework module AFNetworkingLogger { + module AFNetworkingLogger { + header "AFNetworkingLogger.h" export * } - module AFNetworkActivityLoggerProtocol { - header "AFNetworkActivityLoggerProtocol.h" + module AFNetworkingLoggerProtocol { + header "AFNetworkingLoggerProtocol.h" export * } - module AFNetworkActivityConsoleLogger { - header "AFNetworkActivityConsoleLogger.h" + module AFNetworkingConsoleLogger { + header "AFNetworkingConsoleLogger.h" export * } } diff --git a/Tests/AFNetworkActivityLoggerTests.m b/Tests/AFNetworkingLoggerTests.m similarity index 85% rename from Tests/AFNetworkActivityLoggerTests.m rename to Tests/AFNetworkingLoggerTests.m index 67780a5..875634e 100644 --- a/Tests/AFNetworkActivityLoggerTests.m +++ b/Tests/AFNetworkingLoggerTests.m @@ -1,17 +1,17 @@ // -// AFNetworkActivityLoggerTests.m -// AFNetworkActivityLoggerTests +// AFNetworkingLoggerTests.m +// AFNetworkingLoggerTests // // Created by Kevin Harwood on 12/14/15. // Copyright © 2015 Alamofire. All rights reserved. // #import -#import -#import +#import +#import #import -@interface AFNetworkActivityTestLogger : NSObject +@interface AFNetworkingTestLogger : NSObject @property (nonatomic, strong) NSPredicate *filterPredicate; @property (nonatomic, assign) AFHTTPRequestLoggerLevel level; @@ -21,7 +21,7 @@ @interface AFNetworkActivityTestLogger : NSObject consoleLogger = [array objectAtIndex:0]; - XCTAssertTrue([consoleLogger isKindOfClass:[AFNetworkActivityConsoleLogger class]]); + id consoleLogger = [array objectAtIndex:0]; + XCTAssertTrue([consoleLogger isKindOfClass:[AFNetworkingConsoleLogger class]]); XCTAssertTrue(consoleLogger.level == AFLoggerLevelInfo); } - (void)testLoggerCanBeAdded { NSUInteger initialCount = self.logger.loggers.count; - AFNetworkActivityConsoleLogger *newLogger = [AFNetworkActivityConsoleLogger new]; + AFNetworkingConsoleLogger *newLogger = [AFNetworkingConsoleLogger new]; [self.logger addLogger:newLogger]; XCTAssertTrue(self.logger.loggers.count == initialCount + 1); } - (void)testLoggerCanBeRemoved { - AFNetworkActivityConsoleLogger *newLogger = [AFNetworkActivityConsoleLogger new]; + AFNetworkingConsoleLogger *newLogger = [AFNetworkingConsoleLogger new]; [self.logger addLogger:newLogger]; NSUInteger count = self.logger.loggers.count; @@ -87,9 +87,9 @@ - (void)testLoggerCanBeRemoved { } - (void)testLogLevelCanBeSetOnAllLoggersSimultaneously { - AFNetworkActivityConsoleLogger *firstLogger = [AFNetworkActivityConsoleLogger new]; + AFNetworkingConsoleLogger *firstLogger = [AFNetworkingConsoleLogger new]; firstLogger.level = AFLoggerLevelInfo; - AFNetworkActivityConsoleLogger *secondLogger = [AFNetworkActivityConsoleLogger new]; + AFNetworkingConsoleLogger *secondLogger = [AFNetworkingConsoleLogger new]; secondLogger.level = AFLoggerLevelError; [self.logger addLogger:firstLogger]; @@ -104,7 +104,7 @@ - (void)testLogLevelCanBeSetOnAllLoggersSimultaneously { - (void)testThatStartCallbackIsReceived { NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; - AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + AFNetworkingTestLogger *testLogger = [AFNetworkingTestLogger new]; XCTestExpectation *expectation = [self expectationWithDescription:@"Start Block Should Be Called"]; [testLogger setStartBlock:^(NSURLSessionTask *task) { @@ -127,7 +127,7 @@ - (void)testThatStartCallbackIsReceived { - (void)testThatFinishCallbackIsReceived { NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; - AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + AFNetworkingTestLogger *testLogger = [AFNetworkingTestLogger new]; XCTestExpectation *expectation = [self expectationWithDescription:@"Finish Block Should Be Called"]; [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elpasedTime, NSError *error) { @@ -153,7 +153,7 @@ - (void)testThatFinishCallbackIsReceived { - (void)testThatFinishCallbackIsReceivedWithError { NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; - AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + AFNetworkingTestLogger *testLogger = [AFNetworkingTestLogger new]; XCTestExpectation *expectation = [self expectationWithDescription:@"Finish Block Should Be Called"]; [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elpasedTime, NSError *error) { @@ -179,7 +179,7 @@ - (void)testThatFinishCallbackIsReceivedWithError { - (void)testThatFilterPredicateIsRespectedForStartCallback { NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; - AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + AFNetworkingTestLogger *testLogger = [AFNetworkingTestLogger new]; [testLogger setStartBlock:^(NSURLSessionTask *task) { @@ -210,7 +210,7 @@ - (void)testThatFilterPredicateIsRespectedForStartCallback { - (void)testThatFilterPredicateIsRespectedForFinishCallback { NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; - AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + AFNetworkingTestLogger *testLogger = [AFNetworkingTestLogger new]; [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elapsedTime, NSError *error) { @@ -241,7 +241,7 @@ - (void)testThatFilterPredicateIsRespectedForFinishCallback { - (void)testThatIndividualLoggerIsNotCalledWhenLoggerIsNilledOut { NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; - AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + AFNetworkingTestLogger *testLogger = [AFNetworkingTestLogger new]; [testLogger setStartBlock:^(NSURLSessionTask *task) { @@ -269,7 +269,7 @@ - (void)testThatResponseSerializerIsAFHTTPResponseSerializerAndResponseBodyIsTex NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; manager.responseSerializer = [AFHTTPResponseSerializer serializer]; - AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + AFNetworkingTestLogger *testLogger = [AFNetworkingTestLogger new]; XCTestExpectation *expectation = [self expectationWithDescription:@"Finish Block Should Be Called"]; [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elpasedTime, NSError *error) { @@ -293,7 +293,7 @@ - (void)testThatResponseSerializerIsAFHTTPResponseSerializerAndResponseBodyIsNot NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; manager.responseSerializer = [AFJSONResponseSerializer serializer]; - AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + AFNetworkingTestLogger *testLogger = [AFNetworkingTestLogger new]; XCTestExpectation *expectation = [self expectationWithDescription:@"Finish Block Should Be Called"]; [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elpasedTime, NSError *error) { @@ -317,7 +317,7 @@ - (void)testYY { NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; manager.responseSerializer = [AFHTTPResponseSerializer serializer]; - AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + AFNetworkingTestLogger *testLogger = [AFNetworkingTestLogger new]; XCTestExpectation *expectation = [self expectationWithDescription:@"Finish Block Should Be Called"]; [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elpasedTime, NSError *error) { @@ -341,7 +341,7 @@ - (void)testZZ { NSURL *baseURL = [NSURL URLWithString:@"https://httpbin.org"]; AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL]; manager.responseSerializer = [AFHTTPResponseSerializer serializer]; - AFNetworkActivityTestLogger *testLogger = [AFNetworkActivityTestLogger new]; + AFNetworkingTestLogger *testLogger = [AFNetworkingTestLogger new]; XCTestExpectation *expectation = [self expectationWithDescription:@"Finish Block Should Be Called"]; [testLogger setFinishBlock:^(NSURLSessionTask *task, id responseObject, NSTimeInterval elpasedTime, NSError *error) { diff --git a/fastlane/.env b/fastlane/.env index 3f18a04..c86853a 100644 --- a/fastlane/.env +++ b/fastlane/.env @@ -1,5 +1,5 @@ -AF_WORKSPACE="AFNetworkActivityLogger.xcworkspace" +AF_WORKSPACE="AFNetworkingLogger.xcworkspace" -AF_IOS_FRAMEWORK_SCHEME="AFNetworkActivityLogger iOS" -AF_TVOS_FRAMEWORK_SCHEME="AFNetworkActivityLogger tvOS" -AF_OSX_FRAMEWORK_SCHEME="AFNetworkActivityLogger OS X" +AF_IOS_FRAMEWORK_SCHEME="AFNetworkingLogger iOS" +AF_TVOS_FRAMEWORK_SCHEME="AFNetworkingLogger tvOS" +AF_OSX_FRAMEWORK_SCHEME="AFNetworkingLogger OS X" diff --git a/fastlane/.env.deploy b/fastlane/.env.deploy index dc10599..331efcb 100644 --- a/fastlane/.env.deploy +++ b/fastlane/.env.deploy @@ -1,11 +1,11 @@ DEPLOY_BRANCH=master DEPLOY_PLIST_PATH="Supporting Files/Info.plist" -DEPLOY_PODSPEC=AFNetworkActivityLogger.podspec +DEPLOY_PODSPEC=AFNetworkingLogger.podspec DEPLOY_REMOTE=origin # Used for CHANGELOG Generation and Github Release Management GITHUB_OWNER=AFNetworking -GITHUB_REPOSITORY=AFNetworkActivityLogger +GITHUB_REPOSITORY=AFNetworkingLogger # CI Should Provide GITHUB_API_TOKEN -CARTHAGE_FRAMEWORK_NAME=AFNetworkActivityLogger +CARTHAGE_FRAMEWORK_NAME=AFNetworkingLogger From d0f69997571a75a672b1e623b5ed4d04bf792cc0 Mon Sep 17 00:00:00 2001 From: leleliu008 <792793182@qq.com> Date: Mon, 25 Mar 2019 13:51:23 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 484fc7a..f117cd1 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,6 @@ > `AFNetworkingLogger` listens `AFNetworkingTaskDidStartNotification` and `AFNetworkingTaskDidFinishNotification` notifications, which are posted by AFNetworking as session tasks are started and finish. For further customization of logging output, users are encouraged to implement desired functionality by creating new objects that conform to `AFNetworkingLoggerProtocol`. -## 2.x -> 3.x Migration -3.0.0 featured the following breaking API changes: - -* The log `level` property is now found on the individual unique loggers, rather than the shared logger. This allows for more advanced customization options for logging level. -* The `filterPredicate` property is now found on the individual unique loggers, rather than the shared logger. This allows for more advanced customization options for logging specific requests. - ## Usage Add the following code to `AppDelegate.m -application:didFinishLaunchingWithOptions:`: @@ -21,24 +15,28 @@ Add the following code to `AppDelegate.m -application:didFinishLaunchingWithOpti Now all `NSURLSessionTask` objects created by an `AFURLSessionManager` will have their request and response logged to the console, a la: ``` -GET http://example.com/foo/bar.json -200 http://example.com/foo/bar.json [0.1860 s] -``` - -If the default logging level is too verbose—say, if you only want to know when requests fail—then changing it is as simple as: - -``` objective-c -[[AFNetworkingLogger sharedLogger] setLevel:AFLoggerLevelError]; +-------------------------------------------------- +POST /user/login HTTP/1.1 +Host: https://www.wanandroid.com:80 +User-Agent: iOSTest/1.0 (iPhone; iOS 12.1; Scale/3.00) +Content-Type: application/json +Accept-Language: en;q=1 + +{"username":"fpliu","password":"123456"} +-------------------------------------------------- +https://www.wanandroid.com/user/login---> +HTTP/1.1 200 +Transfer-Encoding: Identity +Content-Type: application/json;charset=UTF-8 +Server: Apache-Coyote/1.1 +Date: Mon, 25 Mar 2019 05:48:09 GMT +{ + "code" : 1, + "message" : "用户名或密码错误" +} +-------------------------------------------------- ``` -## Logging Levels -By default, the shared logger is configured with an `AFNetworkingConsoleLogger` with a debug level set to `AFLoggerLevelInfo`. To change the level, simply access the logger through the `loggers` property, and adjust the level. The following levels are provided: - - * `AFLoggerLevelOff`: Do not log requests or responses. - * `AFLoggerLevelDebug` :Logs HTTP method, URL, header fields, & request body for requests, and status code, URL, header fields, response string, & elapsed time for responses. - * `AFLoggerLevelInfo`: Logs HTTP method & URL for requests, and status code, URL, & elapsed time for responses. - * `AFLoggerLevelError`: Logs HTTP method & URL for requests, and status code, URL, & elapsed time for responses, but only for failed requests. - ## Filtering Requests To limit the requests that are logged by a unique logger, each object that conforms to `AFNetworkingLoggerProtocol` has a `filterPredicate` property. If the predicate returns true, the request will not be forwarded to the logger. For example, a custom file logger could be created that only logs requests for `http://httpbin.org`, while a console logger could be used to log all errors in the application. From 478234fc17a97ff3d715a41da794fe56aa83921b Mon Sep 17 00:00:00 2001 From: leleliu008 <792793182@qq.com> Date: Mon, 25 Mar 2019 15:12:51 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f117cd1..b6df024 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,31 @@ > `AFNetworkingLogger` listens `AFNetworkingTaskDidStartNotification` and `AFNetworkingTaskDidFinishNotification` notifications, which are posted by AFNetworking as session tasks are started and finish. For further customization of logging output, users are encouraged to implement desired functionality by creating new objects that conform to `AFNetworkingLoggerProtocol`. ## Usage +1、Add the following code to `Podfile` in your project: -Add the following code to `AppDelegate.m -application:didFinishLaunchingWithOptions:`: +``` +pod 'AFNetworkingLogger', '~> 1.0.0' +``` + +2、Execute the following command to install this lib: + +``` +pod install +``` + +3、import `AFNetworkingLogger.h` header in `AppDelegate.m`: + +``` objective-c +#import "AFNetworkingLogger.h" +``` + +4、Add the following code to `AppDelegate.m -application:didFinishLaunchingWithOptions:`: ``` objective-c [[AFNetworkingLogger sharedLogger] startLogging]; ``` -Now all `NSURLSessionTask` objects created by an `AFURLSessionManager` will have their request and response logged to the console, a la: +5、Now all `NSURLSessionTask` objects created by an `AFURLSessionManager` will have their request and response logged to the console, a la: ``` -------------------------------------------------- From d87a32abe6605ce17a8dc4b921ef3aa7878fd36a Mon Sep 17 00:00:00 2001 From: leleliu008 <792793182@qq.com> Date: Wed, 27 Mar 2019 14:28:34 +0800 Subject: [PATCH 08/10] optimization --- .../AFNetworkingConsoleLogger.m | 167 ++++++++++-------- 1 file changed, 98 insertions(+), 69 deletions(-) diff --git a/AFNetworkingLogger/AFNetworkingConsoleLogger.m b/AFNetworkingLogger/AFNetworkingConsoleLogger.m index 587f095..62a06b8 100644 --- a/AFNetworkingLogger/AFNetworkingConsoleLogger.m +++ b/AFNetworkingLogger/AFNetworkingConsoleLogger.m @@ -1,65 +1,42 @@ -// AFNetworkingConsoleLogger.h +//AFNetworking: http://afnetworking.com // -// Copyright (c) 2018 AFNetworking (http://afnetworking.com/) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. +//HTTP1.1 Protocol Reference: +//https://tools.ietf.org/html/rfc2616 +//https://www.w3.org/Protocols/rfc2616/rfc2616.txt #import "AFNetworkingConsoleLogger.h" @implementation AFNetworkingConsoleLogger -- (id)init { - self = [super init]; - if (!self) { - return nil; - } - - self.level = AFLoggerLevelInfo; - - return self; -} - - - (void)URLSessionTaskDidStart:(NSURLSessionTask *)task { - NSURLRequest *request = task.originalRequest; + NSString *str = @"\n----------------------------------------------------------------\n"; - NSString *requestMethod = [request HTTPMethod]; + NSURLRequest *request = task.originalRequest; NSURL *url = [request URL]; - NSString *urlPath = [url path]; + NSString *path = [url path]; + if (path.length == 0) { + path = @"/"; + } + + str = [NSString stringWithFormat:@"%@%@ %@", str, [request HTTPMethod], path]; + NSString *query = [url query]; if (query) { - urlPath = [NSString stringWithFormat:@"%@?%@", urlPath, query]; + str = [NSString stringWithFormat:@"%@?%@ HTTP/1.1\n", str, query]; + } else { + str = [NSString stringWithFormat:@"%@ HTTP/1.1\n", str]; } - NSString *portStr; + str = [NSString stringWithFormat:@"%@Host: %@", str, [url host]]; + NSNumber *port = [url port]; if (port) { - portStr = [NSString stringWithFormat:@"%@", port]; + str = [NSString stringWithFormat:@"%@:%@\n", str, port]; } else { - portStr = @"80"; + str = [NSString stringWithFormat:@"%@\n", str]; } - NSString *host = [NSString stringWithFormat:@"%@://%@:%@", [url scheme], [url host], portStr]; - - NSString *format = @"\n--------------------------------------------------\n%@ %@ HTTP/1.1\nHost: %@\n"; - NSString *str = [NSString stringWithFormat:format, requestMethod, urlPath, host]; NSDictionary *headers = [request allHTTPHeaderFields]; NSArray *keys = headers.allKeys; @@ -69,15 +46,12 @@ - (void)URLSessionTaskDidStart:(NSURLSessionTask *)task { str = [NSString stringWithFormat:@"%@%@: %@\n", str, key, value]; } - NSString *bodyStr; NSData *requestBody = [request HTTPBody]; if (requestBody) { - bodyStr = [[NSString alloc] initWithData:requestBody encoding:NSUTF8StringEncoding]; - } else { - bodyStr = @""; + NSString *bodyStr = [[NSString alloc] initWithData:requestBody encoding:NSUTF8StringEncoding]; + str = [NSString stringWithFormat:@"%@\n%@\n", str, bodyStr]; } - - str = [NSString stringWithFormat:@"%@\n%@\n--------------------------------------------------\n", str, bodyStr]; + str = [NSString stringWithFormat:@"%@----------------------------------------------------------------\n", str]; NSLog(@"%@", str); } @@ -87,14 +61,15 @@ - (void)URLSessionTaskDidFinish:(NSURLSessionTask *)task withResponseObject:(id) NSString *str = @"\n----------------------------------------------------------------\n"; NSString *url = [[task.response URL] absoluteString]; - - str = [NSString stringWithFormat:@"%@%@--->\nHTTP/1.1 ", str, url]; + str = [NSString stringWithFormat:@"%@%@--->\n\n", str, url]; if ([task.response isKindOfClass:[NSHTTPURLResponse class]]) { NSHTTPURLResponse *response = (NSHTTPURLResponse *)task.response; NSUInteger responseStatusCode = (NSUInteger)[response statusCode]; - str = [NSString stringWithFormat:@"%@%lu\n", str, responseStatusCode]; + NSString *reason = [self getReasonByStatusCode:responseStatusCode]; + + str = [NSString stringWithFormat:@"%@HTTP/1.1 %lu %@\n", str, responseStatusCode, reason]; NSString *contentType = nil; NSDictionary *responseHeaderFields = [response allHeaderFields]; @@ -112,29 +87,83 @@ - (void)URLSessionTaskDidFinish:(NSURLSessionTask *)task withResponseObject:(id) id responseBody = responseObject; - if(contentType && ([contentType containsString:@"application/json"] - || [contentType containsString:@"application/xml"] - || [contentType containsString:@"application/x-www-form-urlencoded"] - || [contentType containsString:@"text/html"])) { - if ([responseObject isKindOfClass:[NSData class]]) { - responseBody = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; - } else if ([responseObject isKindOfClass:[NSDictionary class]]) { - if ([NSJSONSerialization isValidJSONObject:responseObject]) { - NSError *error; - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:responseObject options:NSJSONWritingPrettyPrinted error:&error]; - if (error) { - NSLog(@"Error:%@" , error); - } else { - responseBody =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + if (responseObject) { + if(contentType && ([contentType containsString:@"application/json"] + || [contentType containsString:@"application/xml"] + || [contentType containsString:@"application/x-www-form-urlencoded"] + || [contentType containsString:@"text/html"])) { + if ([responseObject isKindOfClass:[NSData class]]) { + responseBody = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; + } else if ([responseObject isKindOfClass:[NSDictionary class]]) { + if ([NSJSONSerialization isValidJSONObject:responseObject]) { + NSError *error; + NSData *jsonData = [NSJSONSerialization dataWithJSONObject:responseObject options:NSJSONWritingPrettyPrinted error:&error]; + if (error) { + NSLog(@"Error:%@" , error); + } else { + responseBody =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + } } } } + str = [NSString stringWithFormat:@"%@\n%@\n", str, responseBody]; } - - str = [NSString stringWithFormat:@"%@%@\n------------------------------------------------\n", str, responseBody]; + str = [NSString stringWithFormat:@"%@----------------------------------------------------------------\n", str]; } - NSLog(@"%@", str); + NSLog(@"responseBody = %@", str); +} + +- (NSString*) getReasonByStatusCode:(NSUInteger)statusCode { + switch (statusCode) { + case 100: return @"Continue"; + case 101: return @"Switching Protocols"; + + case 200: return @"OK"; + case 201: return @"Created"; + case 202: return @"Accepted"; + case 203: return @"Non-Authoritative Information"; + case 204: return @"No Content"; + case 205: return @"Reset Content"; + case 206: return @"Partial Content"; + + case 300: return @"Multiple Choices"; + case 301: return @"Moved Permanently"; + case 302: return @"Found"; + case 303: return @"See Other"; + case 304: return @"Not Modified"; + case 305: return @"Use Proxy"; + case 306: return @"(Unused)"; + case 307: return @"Temporary Redirect"; + + case 400: return @"Bad Request"; + case 401: return @"Unauthorized"; + case 402: return @"Payment Required"; + case 403: return @"Forbidden"; + case 404: return @"Not Found"; + case 405: return @"Method Not Allowed"; + case 406: return @"Not Acceptable"; + case 407: return @"Proxy Authentication Required"; + case 408: return @"Request Timeout"; + case 409: return @"Conflict"; + case 410: return @"Gone"; + case 411: return @"Length Required"; + case 412: return @"Precondition Failed"; + case 413: return @"Request Entity Too Large"; + case 414: return @"Request-URI Too Long"; + case 415: return @"Unsupported Media Type"; + case 416: return @"Requested Range Not Satisfiable"; + case 417: return @"Expectation Failed"; + + case 500: return @"Internal Server Error"; + case 501: return @"Not Implemented"; + case 502: return @"Bad Gateway"; + case 503: return @"Service Unavailable"; + case 504: return @"Gateway Timeout"; + case 505: return @"HTTP Version Not Supported"; + + default: return @"Unkown"; + } } @end From 36788cfe2b2f74b92239cfcc427eb0645717bfed Mon Sep 17 00:00:00 2001 From: leleliu008 <792793182@qq.com> Date: Wed, 27 Mar 2019 14:51:05 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AFNetworkingLogger.podspec | 2 +- README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/AFNetworkingLogger.podspec b/AFNetworkingLogger.podspec index e87c19e..aefe1d5 100644 --- a/AFNetworkingLogger.podspec +++ b/AFNetworkingLogger.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'AFNetworkingLogger' - s.version = '1.0.0' + s.version = '1.0.1' s.license = 'MIT' s.summary = 'AFNetworking 3.0 Extension for Network Request Logging' s.homepage = 'https://github.com/leleliu008/AFNetworkingLogger' diff --git a/README.md b/README.md index b6df024..dc23d40 100644 --- a/README.md +++ b/README.md @@ -42,11 +42,13 @@ Accept-Language: en;q=1 {"username":"fpliu","password":"123456"} -------------------------------------------------- https://www.wanandroid.com/user/login---> + HTTP/1.1 200 Transfer-Encoding: Identity Content-Type: application/json;charset=UTF-8 Server: Apache-Coyote/1.1 Date: Mon, 25 Mar 2019 05:48:09 GMT + { "code" : 1, "message" : "用户名或密码错误" From 1120a962aa49b8b3690f04d9ad2ea1fc93d00ad5 Mon Sep 17 00:00:00 2001 From: leleliu008 <792793182@qq.com> Date: Wed, 27 Mar 2019 14:51:51 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc23d40..5f4776b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Accept-Language: en;q=1 -------------------------------------------------- https://www.wanandroid.com/user/login---> -HTTP/1.1 200 +HTTP/1.1 200 OK Transfer-Encoding: Identity Content-Type: application/json;charset=UTF-8 Server: Apache-Coyote/1.1