Skip to content

Commit f25a405

Browse files
dvordvor
committed
CocoaLumberjack updated to version 1.7.0 (with some additional bugfixes)
Version 1.7.0 + CocoaLumberjack/CocoaLumberjack#198
1 parent 1ee2e65 commit f25a405

File tree

34 files changed

+4801
-4113
lines changed

34 files changed

+4801
-4113
lines changed

‎GCD/Xcode/BonjourClient/BonjourClient.xcodeproj/project.pbxproj

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
11C32806186CDB3000F6D762 /* DDContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C32801186CDB3000F6D762 /* DDContextFilterLogFormatter.m */; };
11+
11C32807186CDB3000F6D762 /* DDDispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C32803186CDB3000F6D762 /* DDDispatchQueueLogFormatter.m */; };
12+
11C32808186CDB3000F6D762 /* DDMultiFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C32805186CDB3000F6D762 /* DDMultiFormatter.m */; };
1013
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
1114
256AC3DA0F4B6AC300CF3369 /* BonjourClientAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* BonjourClientAppDelegate.m */; };
1215
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
@@ -19,14 +22,19 @@
1922
DC90ABAC147743C90022DF52 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90AB9F147743C90022DF52 /* DDFileLogger.m */; };
2023
DC90ABAD147743C90022DF52 /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90ABA1147743C90022DF52 /* DDLog.m */; };
2124
DC90ABAE147743C90022DF52 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90ABA3147743C90022DF52 /* DDTTYLogger.m */; };
22-
DC90ABAF147743C90022DF52 /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90ABA6147743C90022DF52 /* ContextFilterLogFormatter.m */; };
23-
DC90ABB0147743C90022DF52 /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90ABA8147743C90022DF52 /* DispatchQueueLogFormatter.m */; };
2425
DC90ABB1147743C90022DF52 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = DC90ABA9147743C90022DF52 /* README.txt */; };
2526
/* End PBXBuildFile section */
2627

2728
/* Begin PBXFileReference section */
2829
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
2930
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
31+
11C32800186CDB3000F6D762 /* DDContextFilterLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDContextFilterLogFormatter.h; sourceTree = "<group>"; };
32+
11C32801186CDB3000F6D762 /* DDContextFilterLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDContextFilterLogFormatter.m; sourceTree = "<group>"; };
33+
11C32802186CDB3000F6D762 /* DDDispatchQueueLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDDispatchQueueLogFormatter.h; sourceTree = "<group>"; };
34+
11C32803186CDB3000F6D762 /* DDDispatchQueueLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDDispatchQueueLogFormatter.m; sourceTree = "<group>"; };
35+
11C32804186CDB3000F6D762 /* DDMultiFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDMultiFormatter.h; sourceTree = "<group>"; };
36+
11C32805186CDB3000F6D762 /* DDMultiFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDMultiFormatter.m; sourceTree = "<group>"; };
37+
11C32809186CDB3700F6D762 /* DDLog+LOGV.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "DDLog+LOGV.h"; path = "../../../Vendor/CocoaLumberjack/DDLog+LOGV.h"; sourceTree = "<group>"; };
3038
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
3139
1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
3240
256AC3D80F4B6AC300CF3369 /* BonjourClientAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BonjourClientAppDelegate.h; sourceTree = "<group>"; };
@@ -50,10 +58,6 @@
5058
DC90ABA1147743C90022DF52 /* DDLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DDLog.m; path = ../../../Vendor/CocoaLumberjack/DDLog.m; sourceTree = "<group>"; };
5159
DC90ABA2147743C90022DF52 /* DDTTYLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DDTTYLogger.h; path = ../../../Vendor/CocoaLumberjack/DDTTYLogger.h; sourceTree = "<group>"; };
5260
DC90ABA3147743C90022DF52 /* DDTTYLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DDTTYLogger.m; path = ../../../Vendor/CocoaLumberjack/DDTTYLogger.m; sourceTree = "<group>"; };
53-
DC90ABA5147743C90022DF52 /* ContextFilterLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextFilterLogFormatter.h; sourceTree = "<group>"; };
54-
DC90ABA6147743C90022DF52 /* ContextFilterLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContextFilterLogFormatter.m; sourceTree = "<group>"; };
55-
DC90ABA7147743C90022DF52 /* DispatchQueueLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchQueueLogFormatter.h; sourceTree = "<group>"; };
56-
DC90ABA8147743C90022DF52 /* DispatchQueueLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DispatchQueueLogFormatter.m; sourceTree = "<group>"; };
5761
DC90ABA9147743C90022DF52 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
5862
/* End PBXFileReference section */
5963

@@ -159,6 +163,7 @@
159163
DC90AB9F147743C90022DF52 /* DDFileLogger.m */,
160164
DC90ABA0147743C90022DF52 /* DDLog.h */,
161165
DC90ABA1147743C90022DF52 /* DDLog.m */,
166+
11C32809186CDB3700F6D762 /* DDLog+LOGV.h */,
162167
DC90ABA2147743C90022DF52 /* DDTTYLogger.h */,
163168
DC90ABA3147743C90022DF52 /* DDTTYLogger.m */,
164169
DC90ABA4147743C90022DF52 /* Extensions */,
@@ -178,10 +183,12 @@
178183
DC90ABA4147743C90022DF52 /* Extensions */ = {
179184
isa = PBXGroup;
180185
children = (
181-
DC90ABA5147743C90022DF52 /* ContextFilterLogFormatter.h */,
182-
DC90ABA6147743C90022DF52 /* ContextFilterLogFormatter.m */,
183-
DC90ABA7147743C90022DF52 /* DispatchQueueLogFormatter.h */,
184-
DC90ABA8147743C90022DF52 /* DispatchQueueLogFormatter.m */,
186+
11C32800186CDB3000F6D762 /* DDContextFilterLogFormatter.h */,
187+
11C32801186CDB3000F6D762 /* DDContextFilterLogFormatter.m */,
188+
11C32802186CDB3000F6D762 /* DDDispatchQueueLogFormatter.h */,
189+
11C32803186CDB3000F6D762 /* DDDispatchQueueLogFormatter.m */,
190+
11C32804186CDB3000F6D762 /* DDMultiFormatter.h */,
191+
11C32805186CDB3000F6D762 /* DDMultiFormatter.m */,
185192
DC90ABA9147743C90022DF52 /* README.txt */,
186193
);
187194
name = Extensions;
@@ -257,13 +264,14 @@
257264
8D11072D0486CEB800E47090 /* main.m in Sources */,
258265
256AC3DA0F4B6AC300CF3369 /* BonjourClientAppDelegate.m in Sources */,
259266
DC73005412F20D5600549AC7 /* GCDAsyncSocket.m in Sources */,
267+
11C32806186CDB3000F6D762 /* DDContextFilterLogFormatter.m in Sources */,
260268
DC90ABAA147743C90022DF52 /* DDAbstractDatabaseLogger.m in Sources */,
261269
DC90ABAB147743C90022DF52 /* DDASLLogger.m in Sources */,
262270
DC90ABAC147743C90022DF52 /* DDFileLogger.m in Sources */,
271+
11C32808186CDB3000F6D762 /* DDMultiFormatter.m in Sources */,
272+
11C32807186CDB3000F6D762 /* DDDispatchQueueLogFormatter.m in Sources */,
263273
DC90ABAD147743C90022DF52 /* DDLog.m in Sources */,
264274
DC90ABAE147743C90022DF52 /* DDTTYLogger.m in Sources */,
265-
DC90ABAF147743C90022DF52 /* ContextFilterLogFormatter.m in Sources */,
266-
DC90ABB0147743C90022DF52 /* DispatchQueueLogFormatter.m in Sources */,
267275
);
268276
runOnlyForDeploymentPostprocessing = 0;
269277
};

‎GCD/Xcode/BonjourServer/BonjourServer.xcodeproj/project.pbxproj

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
11C32810186CDB6500F6D762 /* DDContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C3280B186CDB6500F6D762 /* DDContextFilterLogFormatter.m */; };
11+
11C32811186CDB6500F6D762 /* DDDispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C3280D186CDB6500F6D762 /* DDDispatchQueueLogFormatter.m */; };
12+
11C32812186CDB6500F6D762 /* DDMultiFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C3280F186CDB6500F6D762 /* DDMultiFormatter.m */; };
1013
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
1114
256AC3DA0F4B6AC300CF3369 /* BonjourServerAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* BonjourServerAppDelegate.m */; };
1215
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
@@ -19,14 +22,19 @@
1922
DC90ABC91477442E0022DF52 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90ABBC1477442E0022DF52 /* DDFileLogger.m */; };
2023
DC90ABCA1477442E0022DF52 /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90ABBE1477442E0022DF52 /* DDLog.m */; };
2124
DC90ABCB1477442E0022DF52 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90ABC01477442E0022DF52 /* DDTTYLogger.m */; };
22-
DC90ABCC1477442E0022DF52 /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90ABC31477442E0022DF52 /* ContextFilterLogFormatter.m */; };
23-
DC90ABCD1477442E0022DF52 /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90ABC51477442E0022DF52 /* DispatchQueueLogFormatter.m */; };
2425
DC90ABCE1477442E0022DF52 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = DC90ABC61477442E0022DF52 /* README.txt */; };
2526
/* End PBXBuildFile section */
2627

2728
/* Begin PBXFileReference section */
2829
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
2930
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
31+
11C3280A186CDB6500F6D762 /* DDContextFilterLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDContextFilterLogFormatter.h; sourceTree = "<group>"; };
32+
11C3280B186CDB6500F6D762 /* DDContextFilterLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDContextFilterLogFormatter.m; sourceTree = "<group>"; };
33+
11C3280C186CDB6500F6D762 /* DDDispatchQueueLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDDispatchQueueLogFormatter.h; sourceTree = "<group>"; };
34+
11C3280D186CDB6500F6D762 /* DDDispatchQueueLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDDispatchQueueLogFormatter.m; sourceTree = "<group>"; };
35+
11C3280E186CDB6500F6D762 /* DDMultiFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDMultiFormatter.h; sourceTree = "<group>"; };
36+
11C3280F186CDB6500F6D762 /* DDMultiFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDMultiFormatter.m; sourceTree = "<group>"; };
37+
11C32813186CDB7800F6D762 /* DDLog+LOGV.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "DDLog+LOGV.h"; path = "../../../Vendor/CocoaLumberjack/DDLog+LOGV.h"; sourceTree = "<group>"; };
3038
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
3139
1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
3240
256AC3D80F4B6AC300CF3369 /* BonjourServerAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BonjourServerAppDelegate.h; sourceTree = "<group>"; };
@@ -50,10 +58,6 @@
5058
DC90ABBE1477442E0022DF52 /* DDLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DDLog.m; path = ../../../Vendor/CocoaLumberjack/DDLog.m; sourceTree = "<group>"; };
5159
DC90ABBF1477442E0022DF52 /* DDTTYLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DDTTYLogger.h; path = ../../../Vendor/CocoaLumberjack/DDTTYLogger.h; sourceTree = "<group>"; };
5260
DC90ABC01477442E0022DF52 /* DDTTYLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DDTTYLogger.m; path = ../../../Vendor/CocoaLumberjack/DDTTYLogger.m; sourceTree = "<group>"; };
53-
DC90ABC21477442E0022DF52 /* ContextFilterLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextFilterLogFormatter.h; sourceTree = "<group>"; };
54-
DC90ABC31477442E0022DF52 /* ContextFilterLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContextFilterLogFormatter.m; sourceTree = "<group>"; };
55-
DC90ABC41477442E0022DF52 /* DispatchQueueLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchQueueLogFormatter.h; sourceTree = "<group>"; };
56-
DC90ABC51477442E0022DF52 /* DispatchQueueLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DispatchQueueLogFormatter.m; sourceTree = "<group>"; };
5761
DC90ABC61477442E0022DF52 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
5862
/* End PBXFileReference section */
5963

@@ -159,6 +163,7 @@
159163
DC90ABBC1477442E0022DF52 /* DDFileLogger.m */,
160164
DC90ABBD1477442E0022DF52 /* DDLog.h */,
161165
DC90ABBE1477442E0022DF52 /* DDLog.m */,
166+
11C32813186CDB7800F6D762 /* DDLog+LOGV.h */,
162167
DC90ABBF1477442E0022DF52 /* DDTTYLogger.h */,
163168
DC90ABC01477442E0022DF52 /* DDTTYLogger.m */,
164169
DC90ABC11477442E0022DF52 /* Extensions */,
@@ -169,10 +174,12 @@
169174
DC90ABC11477442E0022DF52 /* Extensions */ = {
170175
isa = PBXGroup;
171176
children = (
172-
DC90ABC21477442E0022DF52 /* ContextFilterLogFormatter.h */,
173-
DC90ABC31477442E0022DF52 /* ContextFilterLogFormatter.m */,
174-
DC90ABC41477442E0022DF52 /* DispatchQueueLogFormatter.h */,
175-
DC90ABC51477442E0022DF52 /* DispatchQueueLogFormatter.m */,
177+
11C3280A186CDB6500F6D762 /* DDContextFilterLogFormatter.h */,
178+
11C3280B186CDB6500F6D762 /* DDContextFilterLogFormatter.m */,
179+
11C3280C186CDB6500F6D762 /* DDDispatchQueueLogFormatter.h */,
180+
11C3280D186CDB6500F6D762 /* DDDispatchQueueLogFormatter.m */,
181+
11C3280E186CDB6500F6D762 /* DDMultiFormatter.h */,
182+
11C3280F186CDB6500F6D762 /* DDMultiFormatter.m */,
176183
DC90ABC61477442E0022DF52 /* README.txt */,
177184
);
178185
name = Extensions;
@@ -257,13 +264,14 @@
257264
8D11072D0486CEB800E47090 /* main.m in Sources */,
258265
256AC3DA0F4B6AC300CF3369 /* BonjourServerAppDelegate.m in Sources */,
259266
DC73000C12F2069000549AC7 /* GCDAsyncSocket.m in Sources */,
267+
11C32810186CDB6500F6D762 /* DDContextFilterLogFormatter.m in Sources */,
260268
DC90ABC71477442E0022DF52 /* DDAbstractDatabaseLogger.m in Sources */,
261269
DC90ABC81477442E0022DF52 /* DDASLLogger.m in Sources */,
262270
DC90ABC91477442E0022DF52 /* DDFileLogger.m in Sources */,
271+
11C32812186CDB6500F6D762 /* DDMultiFormatter.m in Sources */,
272+
11C32811186CDB6500F6D762 /* DDDispatchQueueLogFormatter.m in Sources */,
263273
DC90ABCA1477442E0022DF52 /* DDLog.m in Sources */,
264274
DC90ABCB1477442E0022DF52 /* DDTTYLogger.m in Sources */,
265-
DC90ABCC1477442E0022DF52 /* ContextFilterLogFormatter.m in Sources */,
266-
DC90ABCD1477442E0022DF52 /* DispatchQueueLogFormatter.m in Sources */,
267275
);
268276
runOnlyForDeploymentPostprocessing = 0;
269277
};

0 commit comments

Comments
 (0)