Skip to content

Commit

Permalink
Combine two AFNetworkActivityLogger.h into one
Browse files Browse the repository at this point in the history
  • Loading branch information
@rbaumbach
rbaumbach committed May 31, 2017
1 parent 42075dc commit 32a5a26
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 48 deletions.
10 changes: 0 additions & 10 deletions AFNetworkActivityLogger.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -132,7 +128,6 @@
29D96E711BCC357B00F571A5 /* AFNetworkActivityLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFNetworkActivityLogger.h; sourceTree = "<group>"; };
29D96E721BCC357B00F571A5 /* AFNetworkActivityLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFNetworkActivityLogger.m; sourceTree = "<group>"; };
29D96E781BCC3B9B00F571A5 /* AFNetworking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AFNetworking.framework; path = Carthage/Build/iOS/AFNetworking.framework; sourceTree = "<group>"; };
29D96E901BCC3F1D00F571A5 /* AFNetworkActivityLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFNetworkActivityLogger.h; sourceTree = "<group>"; };
29D96E911BCC3F1D00F571A5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
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; };
Expand Down Expand Up @@ -262,7 +257,6 @@
29D96E8F1BCC3F1D00F571A5 /* Supporting Files */ = {
isa = PBXGroup;
children = (
29D96E901BCC3F1D00F571A5 /* AFNetworkActivityLogger.h */,
29D96E911BCC3F1D00F571A5 /* Info.plist */,
);
path = "Supporting Files";
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand Down
12 changes: 11 additions & 1 deletion AFNetworkActivityLogger/AFNetworkActivityLogger.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,17 @@
// THE SOFTWARE.

#import <Foundation/Foundation.h>
#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 <AFNetworkActivityLogger/PublicHeader.h>

#import <AFNetworkActivityLogger/AFNetworkActivityLoggerProtocol.h>
#import <AFNetworkActivityLogger/AFNetworkActivityConsoleLogger.h>

/**
`AFNetworkActivityLogger` logs requests and responses made by AFNetworking, with an adjustable level of detail.
Expand Down
36 changes: 0 additions & 36 deletions Supporting Files/AFNetworkActivityLogger.h
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Supporting Files/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0</string>
<string>3.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit 32a5a26

Please sign in to comment.