From 32a5a26b9506be2c95d0d0573911d51c2ac2f825 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 30 May 2017 19:09:36 -0700 Subject: [PATCH] Combine two AFNetworkActivityLogger.h into one --- .../project.pbxproj | 10 ------ .../AFNetworkActivityLogger.h | 12 ++++++- Supporting Files/AFNetworkActivityLogger.h | 36 ------------------- Supporting Files/Info.plist | 2 +- 4 files changed, 12 insertions(+), 48 deletions(-) delete mode 100644 Supporting Files/AFNetworkActivityLogger.h diff --git a/AFNetworkActivityLogger.xcodeproj/project.pbxproj b/AFNetworkActivityLogger.xcodeproj/project.pbxproj index 5272db4..93cb36b 100644 --- a/AFNetworkActivityLogger.xcodeproj/project.pbxproj +++ b/AFNetworkActivityLogger.xcodeproj/project.pbxproj @@ -25,19 +25,15 @@ 29D77AAA1BCC49E9005B1EF5 /* AFNetworkActivityLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D96E721BCC357B00F571A5 /* AFNetworkActivityLogger.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 */; }; 29D77AC21BCC4C8F005B1EF5 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D77AC11BCC4C8F005B1EF5 /* AFNetworking.framework */; }; 29D77AD11BCC4D96005B1EF5 /* AFNetworkActivityLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D96E721BCC357B00F571A5 /* AFNetworkActivityLogger.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 */; }; 29D96E791BCC3B9B00F571A5 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29D96E781BCC3B9B00F571A5 /* AFNetworking.framework */; }; - 29D96E921BCC3F1D00F571A5 /* AFNetworkActivityLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 29D96E901BCC3F1D00F571A5 /* AFNetworkActivityLogger.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 */; }; @@ -132,7 +128,6 @@ 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 = ""; }; 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 = ""; }; 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; }; @@ -262,7 +257,6 @@ 29D96E8F1BCC3F1D00F571A5 /* Supporting Files */ = { isa = PBXGroup; children = ( - 29D96E901BCC3F1D00F571A5 /* AFNetworkActivityLogger.h */, 29D96E911BCC3F1D00F571A5 /* Info.plist */, ); path = "Supporting Files"; @@ -278,7 +272,6 @@ 297DF56C1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */, 29D77AAE1BCC4A68005B1EF5 /* AFNetworkActivityLogger.h in Headers */, 297DF5761C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */, - 29D77AAF1BCC4A6E005B1EF5 /* AFNetworkActivityLogger.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -289,7 +282,6 @@ 297DF56D1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */, 29D77ABE1BCC4C65005B1EF5 /* AFNetworkActivityLogger.h in Headers */, 297DF5771C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */, - 29D77ABF1BCC4C6C005B1EF5 /* AFNetworkActivityLogger.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -300,7 +292,6 @@ 297DF56E1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */, 29D77AD51BCC4DB9005B1EF5 /* AFNetworkActivityLogger.h in Headers */, 297DF5781C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */, - 29D77AD61BCC4DBF005B1EF5 /* AFNetworkActivityLogger.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -311,7 +302,6 @@ 297DF56B1C1F0F72001FA807 /* AFNetworkActivityLoggerProtocol.h in Headers */, 29D96E731BCC357B00F571A5 /* AFNetworkActivityLogger.h in Headers */, 297DF5751C1F1058001FA807 /* AFNetworkActivityConsoleLogger.h in Headers */, - 29D96E921BCC3F1D00F571A5 /* AFNetworkActivityLogger.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/AFNetworkActivityLogger/AFNetworkActivityLogger.h b/AFNetworkActivityLogger/AFNetworkActivityLogger.h index b0beda8..e1d9b01 100644 --- a/AFNetworkActivityLogger/AFNetworkActivityLogger.h +++ b/AFNetworkActivityLogger/AFNetworkActivityLogger.h @@ -21,7 +21,17 @@ // THE SOFTWARE. #import -#import "AFNetworkActivityLoggerProtocol.h" + +//! Project version number for AFNetworkActivityLogger. +FOUNDATION_EXPORT double AFNetworkActivityLoggerVersionNumber; + +//! Project version string for AFNetworkActivityLogger. +FOUNDATION_EXPORT const unsigned char AFNetworkActivityLoggerVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + +#import +#import /** `AFNetworkActivityLogger` logs requests and responses made by AFNetworking, with an adjustable level of detail. diff --git a/Supporting Files/AFNetworkActivityLogger.h b/Supporting Files/AFNetworkActivityLogger.h deleted file mode 100644 index 80226e6..0000000 --- a/Supporting Files/AFNetworkActivityLogger.h +++ /dev/null @@ -1,36 +0,0 @@ -// AFNetworkActivityLogger.h -// -// Copyright (c) 2015 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. - -#import - -//! Project version number for AFNetworkActivityLogger. -FOUNDATION_EXPORT double AFNetworkActivityLoggerVersionNumber; - -//! Project version string for AFNetworkActivityLogger. -FOUNDATION_EXPORT const unsigned char AFNetworkActivityLoggerVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - -#import -#import -#import - diff --git a/Supporting Files/Info.plist b/Supporting Files/Info.plist index 21baa19..dc2b99a 100644 --- a/Supporting Files/Info.plist +++ b/Supporting Files/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.0 + 3.0.1 CFBundleSignature ???? CFBundleVersion