From 38a44358d4e9566905f2bebe2d1df16415dbd414 Mon Sep 17 00:00:00 2001 From: HHK Date: Thu, 3 May 2018 11:59:11 +0200 Subject: [PATCH 1/4] run project with xcode 9 --- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + Demo/Podfile.lock | 4 +- Demo/Pods/Manifest.lock | 4 +- Demo/Pods/Pods.xcodeproj/project.pbxproj | 324 ++++++++++-------- .../CocoaLumberjack/CocoaLumberjack.xcconfig | 6 +- .../LumberjackConsole.xcconfig | 8 +- .../NBUCore/NBUCore.xcconfig | 6 +- .../Pods-ConsoleDemo-frameworks.sh | 44 ++- .../Pods-ConsoleDemo.debug.xcconfig | 8 +- .../Pods-ConsoleDemo.release.xcconfig | 8 +- 10 files changed, 240 insertions(+), 180 deletions(-) create mode 100644 Demo/ConsoleDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Demo/ConsoleDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/ConsoleDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Demo/ConsoleDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock index bfc266d..e55b166 100644 --- a/Demo/Podfile.lock +++ b/Demo/Podfile.lock @@ -19,9 +19,9 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CocoaLumberjack: 3c8c74683302f9012bb168e1c4b7ae3c0b558431 - LumberjackConsole: 1837f5266a9b7052aebc6d6d8c9daa8bdc01b75d + LumberjackConsole: d3ae5509b5c698ddfade7e1ed9b305403e78e661 NBUCore: 201af50441f48513ef6d5823a5fc12c9e1f288cd PODFILE CHECKSUM: 39b336eed97bf01478a44c2d0bc9864b93132fda -COCOAPODS: 1.3.1 +COCOAPODS: 1.4.0 diff --git a/Demo/Pods/Manifest.lock b/Demo/Pods/Manifest.lock index bfc266d..e55b166 100644 --- a/Demo/Pods/Manifest.lock +++ b/Demo/Pods/Manifest.lock @@ -19,9 +19,9 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CocoaLumberjack: 3c8c74683302f9012bb168e1c4b7ae3c0b558431 - LumberjackConsole: 1837f5266a9b7052aebc6d6d8c9daa8bdc01b75d + LumberjackConsole: d3ae5509b5c698ddfade7e1ed9b305403e78e661 NBUCore: 201af50441f48513ef6d5823a5fc12c9e1f288cd PODFILE CHECKSUM: 39b336eed97bf01478a44c2d0bc9864b93132fda -COCOAPODS: 1.3.1 +COCOAPODS: 1.4.0 diff --git a/Demo/Pods/Pods.xcodeproj/project.pbxproj b/Demo/Pods/Pods.xcodeproj/project.pbxproj index e232160..6210ef7 100644 --- a/Demo/Pods/Pods.xcodeproj/project.pbxproj +++ b/Demo/Pods/Pods.xcodeproj/project.pbxproj @@ -12,52 +12,52 @@ 06270CD9D8C26C49505C5F53FF11D927 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C12155DF6892AD94CED47E84559CDB /* DDTTYLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 08284B0947FEECE865742912B045BCCF /* DDMultiFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = F70A7B763363C0EF2E1A07C721C18390 /* DDMultiFormatter.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 1437647AF7C88C65998EFA2A2C2B4C01 /* DDOSLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C7F33C3355898E6EA55F219EEF89005 /* DDOSLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1900FF7D1ED47CB7486A8B9E7FA91DB7 /* PTEConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 58611542B8945428A8F6664CF33DC0D2 /* PTEConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1900FF7D1ED47CB7486A8B9E7FA91DB7 /* PTEConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 786393D0DE0ECDE7776B458D74FCCE26 /* PTEConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1FE784EA6C983CCFADBBC32B77159FAE /* DDMultiFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = B2F0FC78DC01681AD53813CB6A766AE2 /* DDMultiFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 23C7A95FE6B5FD3E1663F19998E29053 /* DDLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 642221DE37F225529F1029ECE2C80F48 /* DDLog.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 255E4EC79BF6255BB34C326B693660EF /* LumberjackConsole-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 57DD75FB7DD976E6BF584415004ABF06 /* LumberjackConsole-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 255E4EC79BF6255BB34C326B693660EF /* LumberjackConsole-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D9E0006ABE0775AB17CCFA1C67B0C342 /* LumberjackConsole-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 28DDFF25768E01F1890BCFA79B2DDCE8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F036A7D5E8370DAF0D39AF392D16BB0 /* Foundation.framework */; }; 2DBA4141D7B052E43958C96F3466FA6E /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 6DE95CCADF581BD3B76F6639CBAB5084 /* DDLog.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 30B7E7BB6F10DC071600C1C0425E6E93 /* NBUCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 363651AF9F7904CA1DDC4E8184D7C311 /* NBUCore.framework */; }; 34ADF6CEA813D96341D2C4ED247D0DFD /* DDASLLogCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A18FFBAD8C0DC41FAE633D6A08E231 /* DDASLLogCapture.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 371298D6BC5F668971E194350C132882 /* CocoaLumberjack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 646A75BE8302EF8C50C10271AD979104 /* CocoaLumberjack.framework */; }; 381685FA8A1867BFBA1812E8D793DC93 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FDCC703A42EDB08874DFF7C7974D346 /* DDFileLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; - 381FCF562CC9776A50974955B9079FA3 /* PTEAdjustLevelsTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 907D7B460ADDE12406C3FCC135F64789 /* PTEAdjustLevelsTableView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 381FCF562CC9776A50974955B9079FA3 /* PTEAdjustLevelsTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3105B8ECD12585A78E858971C4C0C3EB /* PTEAdjustLevelsTableView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3FFB518D11A6E10939ADC380F61245E9 /* DDAssertMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B6A278E7FCBBE0F00422E684E8C76DB /* DDAssertMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; 466560586F04FC7219636C25771ADAB7 /* DDLegacyMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 8DFEB1E0799E04C9DE78EB0FE06E4582 /* DDLegacyMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 47F4977BC6DBE3B3988E3C44E9CBFD74 /* PTEAdjustLevelsTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D6E77FB0A85CA97D5EF1137E23366436 /* PTEAdjustLevelsTableView.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; + 47F4977BC6DBE3B3988E3C44E9CBFD74 /* PTEAdjustLevelsTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = A1AE531022ACDAF8ECD5C93D9987A6AC /* PTEAdjustLevelsTableView.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 48C62DD9F7073A59EB09910898245480 /* NBUAvailability.h in Headers */ = {isa = PBXBuildFile; fileRef = F4D0119B9173D437CDE0EE59EAA26595 /* NBUAvailability.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 59A550FBFA45FBAD71BE1ED0D90C3DE8 /* PTEConsoleTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B90986C66234C34A2B1C3BCAFE32B80 /* PTEConsoleTableView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 59A550FBFA45FBAD71BE1ED0D90C3DE8 /* PTEConsoleTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0912A5E15B4B0F84AEE75977D87A25AD /* PTEConsoleTableView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5FE5856931B6EA4EA3F0C37CF6C92C9A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F036A7D5E8370DAF0D39AF392D16BB0 /* Foundation.framework */; }; - 690B892A2F54BDA1BF0157066090F8D0 /* PTEDashboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F059B29F26ADDEA49A70F3735FC8674 /* PTEDashboard.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; + 690B892A2F54BDA1BF0157066090F8D0 /* PTEDashboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 44BDA59A98A9EEF4949C3E24B7EB97D5 /* PTEDashboard.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 7163FCA57C02C890435DFA2A4F3AE4C8 /* DDContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EC667F8D973C739C7CD2891B772059F /* DDContextFilterLogFormatter.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 75CC69BC081384EA3033F3AB5CF97E29 /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 9161ED7D3AB07F858C9105F97C8CCF9D /* DDASLLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 77F55DA1292F4A23365745071EF0B667 /* DDDispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CF7D452518AED59BC9D9E8B595EF6DE /* DDDispatchQueueLogFormatter.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; - 79E82CD7091C926FC0A2EF3D1AA5187C /* PTEConsoleTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E9167D21BA9D04A69CAEC1BA9038C3 /* PTEConsoleTableView.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; - 7AB440B811320CE60B96C5239F840B44 /* NBUCore-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 26B1D4536E06A0EC341E2560910B1F4A /* NBUCore-dummy.m */; }; - 9ECDFDB4B9829BBB0E369F85D240B8AE /* CocoaLumberjack-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B2A6C34C4F7A88F029B156B9F496921 /* CocoaLumberjack-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 79E82CD7091C926FC0A2EF3D1AA5187C /* PTEConsoleTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F5C28FCB7DBB73DB130D5EDE705A2C2 /* PTEConsoleTableView.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; + 7AB440B811320CE60B96C5239F840B44 /* NBUCore-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A11FB5F2CB2D8D075A93C4A62FDF617 /* NBUCore-dummy.m */; }; + 9ECDFDB4B9829BBB0E369F85D240B8AE /* CocoaLumberjack-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 78A07AF8D20D38F0B256D53408561CBE /* CocoaLumberjack-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; A38FD606BF174D0485A33F01074216FA /* DDOSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = FC68B1B5D87A9BD4E83EFB61528AE3D3 /* DDOSLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; B31FFD1BBDF5A0934523FF480F4DB394 /* NBUCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 436F81B19A2D1C8F22E251AC4AD49756 /* NBUCore.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; B8D00D039135E8ABE6417C5D2E3D6C9E /* DDLogMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A12836429F3A032126C254810DCE511 /* DDLogMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; B9A3776B4EE34E4635F13989AFD109D6 /* NBUCore.h in Headers */ = {isa = PBXBuildFile; fileRef = BC994D8E8C5B4FF20BEF9BB609D0DE58 /* NBUCore.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B9AA5902D3ACB42707287C5F9F51326D /* Pods-ConsoleDemo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E6F8CFB7DC41A1D73C6437BB370E8EE1 /* Pods-ConsoleDemo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - BAA09D65A66BF9CD94F7E4DB37A3AD9B /* LumberjackConsole-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BD059BEE08BF027AF7BD0E3572ED4D /* LumberjackConsole-dummy.m */; }; - C2B45E8EBE7A211E971AA4302001D909 /* NBUCore-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F36A72C72CB9E84BC38085B03246250E /* NBUCore-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B9AA5902D3ACB42707287C5F9F51326D /* Pods-ConsoleDemo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 12D9A2CB77FD363B0F00144A3117D2AD /* Pods-ConsoleDemo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + BAA09D65A66BF9CD94F7E4DB37A3AD9B /* LumberjackConsole-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = AEF6BE618E83DD53789C6DC1CDC8F51D /* LumberjackConsole-dummy.m */; }; + C2B45E8EBE7A211E971AA4302001D909 /* NBUCore-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C1335C79D367EAF781B7330713481D4 /* NBUCore-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; C592821D9C86A16075F492CDDD7EBFA0 /* DDAbstractDatabaseLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 556910D71BA99FFC3FDCD68EE1ADE009 /* DDAbstractDatabaseLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C6D2845FE9B50A2E21260FCED0D5B53B /* LumberjackConsole.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 208E72F876EF5E424A0BEDFA5713C91C /* LumberjackConsole.storyboard */; }; + C6D2845FE9B50A2E21260FCED0D5B53B /* LumberjackConsole.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1216C67363B93844CCED9D796ED4D158 /* LumberjackConsole.storyboard */; }; C6DDC840836592382565874D9FDC2613 /* DDLog+LOGV.h in Headers */ = {isa = PBXBuildFile; fileRef = AE085EFCA7BFDFB88212E4F79ECBF162 /* DDLog+LOGV.h */; settings = {ATTRIBUTES = (Public, ); }; }; C6F8F9FD9146C80B8913691FE1C62D7B /* DDContextFilterLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF024D5AA56B53219FEC50ADD9EFB69 /* DDContextFilterLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; CB3D8FADDDD1ED067CCF61875B719105 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F036A7D5E8370DAF0D39AF392D16BB0 /* Foundation.framework */; }; - CC870D61CBE8FD2A0D24A3A3D8CE5C62 /* CocoaLumberjack-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C207D559243E12FB4A9AEB95884D15E /* CocoaLumberjack-dummy.m */; }; + CC870D61CBE8FD2A0D24A3A3D8CE5C62 /* CocoaLumberjack-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = CC4F7BF640383D1BC5BAA6E5A638A86D /* CocoaLumberjack-dummy.m */; }; CE0DDEB478F72FC416E2C6C52D0C2B29 /* DDDispatchQueueLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 151DD52783B033A4B2FE045673721C87 /* DDDispatchQueueLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; D5D4A699779F1796A4F24BFE1FB94E20 /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C25BD259829C617D2DE326FB8D141F /* DDAbstractDatabaseLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; DA9B436408E2C274B67172AFA5CA8BC8 /* CocoaLumberjack.h in Headers */ = {isa = PBXBuildFile; fileRef = D76D6BF3E510E9798AF91B22BEA99D28 /* CocoaLumberjack.h */; settings = {ATTRIBUTES = (Public, ); }; }; E3C5456FB49A749739230C235355D473 /* DDTTYLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = D587379F65861F2380AF14C97CA587E3 /* DDTTYLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - EFAB760CA15E025E53D5317C2A459895 /* PTEConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E99C9BF4B3F1C876B067075ED308C23 /* PTEConsoleLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; + EFAB760CA15E025E53D5317C2A459895 /* PTEConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D95F7FA71B7E44DA07C3B1051A9B0AC /* PTEConsoleLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; F17D3D26ADE94380EAEE45707FDED798 /* DDASLLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = D1B0B057520259B191896C2162867E4A /* DDASLLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; FC1615ACE4FF20081559149DCA6FB73A /* DDFileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 00790A158F26667BCFBFA43D3444178B /* DDFileLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - FF090E8334BC70AA18DB88A8ADDE6C18 /* PTEDashboard.h in Headers */ = {isa = PBXBuildFile; fileRef = B0E804A8390F90579732D40A14678534 /* PTEDashboard.h */; settings = {ATTRIBUTES = (Public, ); }; }; - FF61BA18CD4433F124062ADE3CF1F457 /* Pods-ConsoleDemo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 0422B2A180DDC81A021CECFCC093AAFD /* Pods-ConsoleDemo-dummy.m */; }; + FF090E8334BC70AA18DB88A8ADDE6C18 /* PTEDashboard.h in Headers */ = {isa = PBXBuildFile; fileRef = B573E777C4DD1B9091B8F4E13084E6C8 /* PTEDashboard.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FF61BA18CD4433F124062ADE3CF1F457 /* Pods-ConsoleDemo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B8DAE1A6D1AA8706291F276A39A6C70 /* Pods-ConsoleDemo-dummy.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -100,75 +100,78 @@ /* Begin PBXFileReference section */ 00790A158F26667BCFBFA43D3444178B /* DDFileLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDFileLogger.h; path = Classes/DDFileLogger.h; sourceTree = ""; }; - 0422B2A180DDC81A021CECFCC093AAFD /* Pods-ConsoleDemo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ConsoleDemo-dummy.m"; sourceTree = ""; }; - 06F1DAA56853B3FC4616B0D8A1B3D27C /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 0B90986C66234C34A2B1C3BCAFE32B80 /* PTEConsoleTableView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PTEConsoleTableView.h; path = Source/PTEConsoleTableView.h; sourceTree = ""; }; + 088827C7419093B2990D4EFAAEDC8A7F /* NBUCore.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = NBUCore.modulemap; sourceTree = ""; }; + 0912A5E15B4B0F84AEE75977D87A25AD /* PTEConsoleTableView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PTEConsoleTableView.h; path = Source/PTEConsoleTableView.h; sourceTree = ""; }; + 0AA34DCFCFEF150F324494FE3C70A1EA /* NBUCore.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = NBUCore.xcconfig; sourceTree = ""; }; + 0B8DAE1A6D1AA8706291F276A39A6C70 /* Pods-ConsoleDemo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ConsoleDemo-dummy.m"; sourceTree = ""; }; + 1216C67363B93844CCED9D796ED4D158 /* LumberjackConsole.storyboard */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file.storyboard; name = LumberjackConsole.storyboard; path = Source/LumberjackConsole.storyboard; sourceTree = ""; }; + 12D9A2CB77FD363B0F00144A3117D2AD /* Pods-ConsoleDemo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ConsoleDemo-umbrella.h"; sourceTree = ""; }; 151DD52783B033A4B2FE045673721C87 /* DDDispatchQueueLogFormatter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDDispatchQueueLogFormatter.h; path = Classes/Extensions/DDDispatchQueueLogFormatter.h; sourceTree = ""; }; 17A18FFBAD8C0DC41FAE633D6A08E231 /* DDASLLogCapture.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDASLLogCapture.m; path = Classes/DDASLLogCapture.m; sourceTree = ""; }; - 19BFBEE26E1B2C5AAE4992E631D369E3 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 208E72F876EF5E424A0BEDFA5713C91C /* LumberjackConsole.storyboard */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file.storyboard; name = LumberjackConsole.storyboard; path = Source/LumberjackConsole.storyboard; sourceTree = ""; }; - 220971F8AD6A4EAB1859A354850ADAD8 /* NBUCore-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NBUCore-prefix.pch"; sourceTree = ""; }; + 17D462DDCE4F4F6817A2A5D57939F781 /* CocoaLumberjack.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = CocoaLumberjack.modulemap; sourceTree = ""; }; + 1A11FB5F2CB2D8D075A93C4A62FDF617 /* NBUCore-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NBUCore-dummy.m"; sourceTree = ""; }; + 1DEE6B0A1EED8D7017DF21675181DE4F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 237E3FF98C2EB35808CC28E15D051487 /* CocoaLumberjack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = CocoaLumberjack.framework; path = CocoaLumberjack.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 2608A0A6DF6B4B74A4983FA5E90757D9 /* LumberjackConsole.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = LumberjackConsole.xcconfig; sourceTree = ""; }; 26819E42F940369A49AF9F4072326BBD /* NBUCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = NBUCore.framework; path = NBUCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 26B1D4536E06A0EC341E2560910B1F4A /* NBUCore-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NBUCore-dummy.m"; sourceTree = ""; }; - 2B2A6C34C4F7A88F029B156B9F496921 /* CocoaLumberjack-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaLumberjack-umbrella.h"; sourceTree = ""; }; - 2C889A6FFFC6CE6B6720074CCF757CA1 /* Pods-ConsoleDemo-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ConsoleDemo-resources.sh"; sourceTree = ""; }; - 2E99C9BF4B3F1C876B067075ED308C23 /* PTEConsoleLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PTEConsoleLogger.m; path = Source/PTEConsoleLogger.m; sourceTree = ""; }; + 26CAD3F74906799FE55D7740FD609B26 /* Pods-ConsoleDemo-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ConsoleDemo-acknowledgements.plist"; sourceTree = ""; }; + 2D117F6EBE62BB9F3FC21289C3A59329 /* CocoaLumberjack.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CocoaLumberjack.xcconfig; sourceTree = ""; }; 2EC667F8D973C739C7CD2891B772059F /* DDContextFilterLogFormatter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDContextFilterLogFormatter.m; path = Classes/Extensions/DDContextFilterLogFormatter.m; sourceTree = ""; }; - 3120C146F430319DE6E0D12EDB00ABB2 /* Pods-ConsoleDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ConsoleDemo.release.xcconfig"; sourceTree = ""; }; + 2F5C28FCB7DBB73DB130D5EDE705A2C2 /* PTEConsoleTableView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PTEConsoleTableView.m; path = Source/PTEConsoleTableView.m; sourceTree = ""; }; + 30ADD0539E6C5DF7C67BDE36A7BDF46F /* Pods-ConsoleDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ConsoleDemo.release.xcconfig"; sourceTree = ""; }; + 3105B8ECD12585A78E858971C4C0C3EB /* PTEAdjustLevelsTableView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PTEAdjustLevelsTableView.h; path = Source/PTEAdjustLevelsTableView.h; sourceTree = ""; }; 363651AF9F7904CA1DDC4E8184D7C311 /* NBUCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NBUCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3A12836429F3A032126C254810DCE511 /* DDLogMacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDLogMacros.h; path = Classes/DDLogMacros.h; sourceTree = ""; }; - 3A64A838160E0ABA1BA5DA685661CB5D /* LumberjackConsole.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = LumberjackConsole.xcconfig; sourceTree = ""; }; 3B6A278E7FCBBE0F00422E684E8C76DB /* DDAssertMacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDAssertMacros.h; path = Classes/DDAssertMacros.h; sourceTree = ""; }; - 3EB69D745680CDCF3C6D34F37C1FFACA /* CocoaLumberjack-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaLumberjack-prefix.pch"; sourceTree = ""; }; - 42BD059BEE08BF027AF7BD0E3572ED4D /* LumberjackConsole-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "LumberjackConsole-dummy.m"; sourceTree = ""; }; + 428FCEF55B4B8C4A6E28DF1CC1B0061A /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; 436F81B19A2D1C8F22E251AC4AD49756 /* NBUCore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NBUCore.m; path = Source/NBUCore.m; sourceTree = ""; }; - 4FB58946F4658CFC2033DEBE4FF9F9FD /* Pods-ConsoleDemo-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ConsoleDemo-frameworks.sh"; sourceTree = ""; }; + 44BDA59A98A9EEF4949C3E24B7EB97D5 /* PTEDashboard.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PTEDashboard.m; path = Source/PTEDashboard.m; sourceTree = ""; }; + 46A992CB136C43F159E107C9A70A5D2B /* LumberjackConsole.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = LumberjackConsole.modulemap; sourceTree = ""; }; 556910D71BA99FFC3FDCD68EE1ADE009 /* DDAbstractDatabaseLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDAbstractDatabaseLogger.h; path = Classes/DDAbstractDatabaseLogger.h; sourceTree = ""; }; - 57DD75FB7DD976E6BF584415004ABF06 /* LumberjackConsole-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LumberjackConsole-umbrella.h"; sourceTree = ""; }; - 58611542B8945428A8F6664CF33DC0D2 /* PTEConsoleLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PTEConsoleLogger.h; path = Source/PTEConsoleLogger.h; sourceTree = ""; }; - 5F059B29F26ADDEA49A70F3735FC8674 /* PTEDashboard.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PTEDashboard.m; path = Source/PTEDashboard.m; sourceTree = ""; }; + 5D95F7FA71B7E44DA07C3B1051A9B0AC /* PTEConsoleLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PTEConsoleLogger.m; path = Source/PTEConsoleLogger.m; sourceTree = ""; }; 642221DE37F225529F1029ECE2C80F48 /* DDLog.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDLog.h; path = Classes/DDLog.h; sourceTree = ""; }; 646A75BE8302EF8C50C10271AD979104 /* CocoaLumberjack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CocoaLumberjack.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 648D3554C67A1887CF3D2B0821D296E9 /* NBUCore.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = NBUCore.xcconfig; sourceTree = ""; }; - 6C207D559243E12FB4A9AEB95884D15E /* CocoaLumberjack-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "CocoaLumberjack-dummy.m"; sourceTree = ""; }; - 6DD217CA293419066DA2707BBD2C4BA4 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 64A214FA26F19FD93D3841619FB2C6CC /* Pods-ConsoleDemo-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ConsoleDemo-acknowledgements.markdown"; sourceTree = ""; }; 6DE95CCADF581BD3B76F6639CBAB5084 /* DDLog.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDLog.m; path = Classes/DDLog.m; sourceTree = ""; }; 6DF024D5AA56B53219FEC50ADD9EFB69 /* DDContextFilterLogFormatter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDContextFilterLogFormatter.h; path = Classes/Extensions/DDContextFilterLogFormatter.h; sourceTree = ""; }; - 6E830FE7D81EF6D75A8F738A0396D4AB /* LumberjackConsole-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LumberjackConsole-prefix.pch"; sourceTree = ""; }; - 7AD7A462BCA9F64D8382238692349B80 /* Pods-ConsoleDemo-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ConsoleDemo-acknowledgements.markdown"; sourceTree = ""; }; + 786393D0DE0ECDE7776B458D74FCCE26 /* PTEConsoleLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PTEConsoleLogger.h; path = Source/PTEConsoleLogger.h; sourceTree = ""; }; + 78A07AF8D20D38F0B256D53408561CBE /* CocoaLumberjack-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaLumberjack-umbrella.h"; sourceTree = ""; }; + 7C1335C79D367EAF781B7330713481D4 /* NBUCore-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NBUCore-umbrella.h"; sourceTree = ""; }; 7CF7D452518AED59BC9D9E8B595EF6DE /* DDDispatchQueueLogFormatter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDDispatchQueueLogFormatter.m; path = Classes/Extensions/DDDispatchQueueLogFormatter.m; sourceTree = ""; }; - 7D22F7A66977F83F6DB8BB6EB358DF11 /* CocoaLumberjack.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = CocoaLumberjack.modulemap; sourceTree = ""; }; + 7E5666DD1C921DD9BD9E7CB0C189C388 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7FDCC703A42EDB08874DFF7C7974D346 /* DDFileLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDFileLogger.m; path = Classes/DDFileLogger.m; sourceTree = ""; }; - 83E9167D21BA9D04A69CAEC1BA9038C3 /* PTEConsoleTableView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PTEConsoleTableView.m; path = Source/PTEConsoleTableView.m; sourceTree = ""; }; + 861E34C9080AD93287AB6B66625A81D3 /* LumberjackConsole-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LumberjackConsole-prefix.pch"; sourceTree = ""; }; 8C7F33C3355898E6EA55F219EEF89005 /* DDOSLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDOSLogger.h; path = Classes/DDOSLogger.h; sourceTree = ""; }; 8DFEB1E0799E04C9DE78EB0FE06E4582 /* DDLegacyMacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDLegacyMacros.h; path = Classes/DDLegacyMacros.h; sourceTree = ""; }; - 907D7B460ADDE12406C3FCC135F64789 /* PTEAdjustLevelsTableView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PTEAdjustLevelsTableView.h; path = Source/PTEAdjustLevelsTableView.h; sourceTree = ""; }; 9161ED7D3AB07F858C9105F97C8CCF9D /* DDASLLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDASLLogger.m; path = Classes/DDASLLogger.m; sourceTree = ""; }; + 91FC633EF45973E3E12D41B382600065 /* Pods-ConsoleDemo-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ConsoleDemo-frameworks.sh"; sourceTree = ""; }; 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 96254B8F181745E59EE1917786F58C2F /* Pods-ConsoleDemo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-ConsoleDemo.modulemap"; sourceTree = ""; }; 97C12155DF6892AD94CED47E84559CDB /* DDTTYLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDTTYLogger.m; path = Classes/DDTTYLogger.m; sourceTree = ""; }; + 99818A7FAA685221828A1D15C2E98AD2 /* LumberjackConsole.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = LumberjackConsole.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9C333AC5337C869723C636F6BAA78390 /* DDASLLogCapture.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDASLLogCapture.h; path = Classes/DDASLLogCapture.h; sourceTree = ""; }; 9F036A7D5E8370DAF0D39AF392D16BB0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - A78A23028EE7F1D1C6E7127186F775AE /* Pods-ConsoleDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ConsoleDemo.debug.xcconfig"; sourceTree = ""; }; + A01B1C50D8101C665C8277A5CDEC0AC9 /* Pods-ConsoleDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ConsoleDemo.debug.xcconfig"; sourceTree = ""; }; + A1AE531022ACDAF8ECD5C93D9987A6AC /* PTEAdjustLevelsTableView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PTEAdjustLevelsTableView.m; path = Source/PTEAdjustLevelsTableView.m; sourceTree = ""; }; A8F14E3CCE363BD5CE2AD25B78F585D2 /* LumberjackConsole.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = LumberjackConsole.framework; path = LumberjackConsole.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AE085EFCA7BFDFB88212E4F79ECBF162 /* DDLog+LOGV.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "DDLog+LOGV.h"; path = "Classes/DDLog+LOGV.h"; sourceTree = ""; }; - AE13E0986657A144F21C76CF8A13C5BF /* NBUCore.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = NBUCore.modulemap; sourceTree = ""; }; + AEF6BE618E83DD53789C6DC1CDC8F51D /* LumberjackConsole-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "LumberjackConsole-dummy.m"; sourceTree = ""; }; AFB23DD3BFEE9703C0652FA09E828E6C /* Pods_ConsoleDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_ConsoleDemo.framework; path = "Pods-ConsoleDemo.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - B0E804A8390F90579732D40A14678534 /* PTEDashboard.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PTEDashboard.h; path = Source/PTEDashboard.h; sourceTree = ""; }; B2F0FC78DC01681AD53813CB6A766AE2 /* DDMultiFormatter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDMultiFormatter.h; path = Classes/Extensions/DDMultiFormatter.h; sourceTree = ""; }; - B34A91BF8C19B067FE7260DF55555392 /* Pods-ConsoleDemo-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ConsoleDemo-acknowledgements.plist"; sourceTree = ""; }; - B46F0FDB78031643CB8E4E8CA32A8366 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + B573E777C4DD1B9091B8F4E13084E6C8 /* PTEDashboard.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PTEDashboard.h; path = Source/PTEDashboard.h; sourceTree = ""; }; BC994D8E8C5B4FF20BEF9BB609D0DE58 /* NBUCore.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NBUCore.h; path = Source/NBUCore.h; sourceTree = ""; }; - BD675345E8B07BCA5F76BE1C95D6E5D1 /* CocoaLumberjack.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CocoaLumberjack.xcconfig; sourceTree = ""; }; - C540EA84F5B6C64AAB6D5AA87F6B7AAF /* LumberjackConsole.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = LumberjackConsole.modulemap; sourceTree = ""; }; + BE22C7487FCD1A27C1EF3D7EEAA18B14 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C668AB5B6DBF148DDF102F45D159B3CB /* Pods-ConsoleDemo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-ConsoleDemo.modulemap"; sourceTree = ""; }; + C7F7FEFAD83DA09AE28FDCA80E0BC2FC /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + CC4F7BF640383D1BC5BAA6E5A638A86D /* CocoaLumberjack-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "CocoaLumberjack-dummy.m"; sourceTree = ""; }; + D08DC7362CF759D50310965446F83850 /* NBUCore-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NBUCore-prefix.pch"; sourceTree = ""; }; D1B0B057520259B191896C2162867E4A /* DDASLLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDASLLogger.h; path = Classes/DDASLLogger.h; sourceTree = ""; }; D587379F65861F2380AF14C97CA587E3 /* DDTTYLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDTTYLogger.h; path = Classes/DDTTYLogger.h; sourceTree = ""; }; - D6E77FB0A85CA97D5EF1137E23366436 /* PTEAdjustLevelsTableView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = PTEAdjustLevelsTableView.m; path = Source/PTEAdjustLevelsTableView.m; sourceTree = ""; }; D76D6BF3E510E9798AF91B22BEA99D28 /* CocoaLumberjack.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CocoaLumberjack.h; path = Classes/CocoaLumberjack.h; sourceTree = ""; }; + D9E0006ABE0775AB17CCFA1C67B0C342 /* LumberjackConsole-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LumberjackConsole-umbrella.h"; sourceTree = ""; }; + DB196B01A201F8F9D0FC1D5D678CEBD0 /* CocoaLumberjack-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaLumberjack-prefix.pch"; sourceTree = ""; }; + DFF0B4B8EDE047E34F025738CDC6DDA0 /* Pods-ConsoleDemo-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ConsoleDemo-resources.sh"; sourceTree = ""; }; E0C25BD259829C617D2DE326FB8D141F /* DDAbstractDatabaseLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDAbstractDatabaseLogger.m; path = Classes/DDAbstractDatabaseLogger.m; sourceTree = ""; }; - E6F8CFB7DC41A1D73C6437BB370E8EE1 /* Pods-ConsoleDemo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ConsoleDemo-umbrella.h"; sourceTree = ""; }; - F36A72C72CB9E84BC38085B03246250E /* NBUCore-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NBUCore-umbrella.h"; sourceTree = ""; }; + EF2F96F3706C36BDF855FB3A6A98A80C /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; F4D0119B9173D437CDE0EE59EAA26595 /* NBUAvailability.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NBUAvailability.h; path = Source/NBUAvailability.h; sourceTree = ""; }; F70A7B763363C0EF2E1A07C721C18390 /* DDMultiFormatter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDMultiFormatter.m; path = Classes/Extensions/DDMultiFormatter.m; sourceTree = ""; }; FC68B1B5D87A9BD4E83EFB61528AE3D3 /* DDOSLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDOSLogger.m; path = Classes/DDOSLogger.m; sourceTree = ""; }; @@ -212,50 +215,72 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 2564BBF19A0E466E11D587D9E18E7A7B /* Pods-ConsoleDemo */ = { + 154296D7DF25D1B311CA13F7FBE8C0B3 /* Resources */ = { isa = PBXGroup; children = ( - 06F1DAA56853B3FC4616B0D8A1B3D27C /* Info.plist */, - 96254B8F181745E59EE1917786F58C2F /* Pods-ConsoleDemo.modulemap */, - 7AD7A462BCA9F64D8382238692349B80 /* Pods-ConsoleDemo-acknowledgements.markdown */, - B34A91BF8C19B067FE7260DF55555392 /* Pods-ConsoleDemo-acknowledgements.plist */, - 0422B2A180DDC81A021CECFCC093AAFD /* Pods-ConsoleDemo-dummy.m */, - 4FB58946F4658CFC2033DEBE4FF9F9FD /* Pods-ConsoleDemo-frameworks.sh */, - 2C889A6FFFC6CE6B6720074CCF757CA1 /* Pods-ConsoleDemo-resources.sh */, - E6F8CFB7DC41A1D73C6437BB370E8EE1 /* Pods-ConsoleDemo-umbrella.h */, - A78A23028EE7F1D1C6E7127186F775AE /* Pods-ConsoleDemo.debug.xcconfig */, - 3120C146F430319DE6E0D12EDB00ABB2 /* Pods-ConsoleDemo.release.xcconfig */, + 1216C67363B93844CCED9D796ED4D158 /* LumberjackConsole.storyboard */, ); - name = "Pods-ConsoleDemo"; - path = "Target Support Files/Pods-ConsoleDemo"; + name = Resources; sourceTree = ""; }; - 2C64F3CC6EAF96BD24568680B51FF110 /* Support Files */ = { + 4796D928BD2B85242B09DBA33A8F81D9 /* Support Files */ = { isa = PBXGroup; children = ( - 19BFBEE26E1B2C5AAE4992E631D369E3 /* Info.plist */, - C540EA84F5B6C64AAB6D5AA87F6B7AAF /* LumberjackConsole.modulemap */, - 3A64A838160E0ABA1BA5DA685661CB5D /* LumberjackConsole.xcconfig */, - 42BD059BEE08BF027AF7BD0E3572ED4D /* LumberjackConsole-dummy.m */, - 6E830FE7D81EF6D75A8F738A0396D4AB /* LumberjackConsole-prefix.pch */, - 57DD75FB7DD976E6BF584415004ABF06 /* LumberjackConsole-umbrella.h */, + 7E5666DD1C921DD9BD9E7CB0C189C388 /* Info.plist */, + 46A992CB136C43F159E107C9A70A5D2B /* LumberjackConsole.modulemap */, + 2608A0A6DF6B4B74A4983FA5E90757D9 /* LumberjackConsole.xcconfig */, + AEF6BE618E83DD53789C6DC1CDC8F51D /* LumberjackConsole-dummy.m */, + 861E34C9080AD93287AB6B66625A81D3 /* LumberjackConsole-prefix.pch */, + D9E0006ABE0775AB17CCFA1C67B0C342 /* LumberjackConsole-umbrella.h */, ); name = "Support Files"; path = "Demo/Pods/Target Support Files/LumberjackConsole"; sourceTree = ""; }; - 579DF58D872CF777D571E4EA702E192D /* Resources */ = { + 52F73F779BA1E6688B8420DDD106BFF5 /* Pods-ConsoleDemo */ = { isa = PBXGroup; children = ( - 208E72F876EF5E424A0BEDFA5713C91C /* LumberjackConsole.storyboard */, + 1DEE6B0A1EED8D7017DF21675181DE4F /* Info.plist */, + C668AB5B6DBF148DDF102F45D159B3CB /* Pods-ConsoleDemo.modulemap */, + 64A214FA26F19FD93D3841619FB2C6CC /* Pods-ConsoleDemo-acknowledgements.markdown */, + 26CAD3F74906799FE55D7740FD609B26 /* Pods-ConsoleDemo-acknowledgements.plist */, + 0B8DAE1A6D1AA8706291F276A39A6C70 /* Pods-ConsoleDemo-dummy.m */, + 91FC633EF45973E3E12D41B382600065 /* Pods-ConsoleDemo-frameworks.sh */, + DFF0B4B8EDE047E34F025738CDC6DDA0 /* Pods-ConsoleDemo-resources.sh */, + 12D9A2CB77FD363B0F00144A3117D2AD /* Pods-ConsoleDemo-umbrella.h */, + A01B1C50D8101C665C8277A5CDEC0AC9 /* Pods-ConsoleDemo.debug.xcconfig */, + 30ADD0539E6C5DF7C67BDE36A7BDF46F /* Pods-ConsoleDemo.release.xcconfig */, ); - name = Resources; + name = "Pods-ConsoleDemo"; + path = "Target Support Files/Pods-ConsoleDemo"; + sourceTree = ""; + }; + 53B6B972A1C62B360C0C9B9C2D2C9D45 /* Development Pods */ = { + isa = PBXGroup; + children = ( + A5B0D2EEE75FCADA861B7E9454710493 /* LumberjackConsole */, + ); + name = "Development Pods"; + sourceTree = ""; + }; + 557B418F0218C46A53CFD72CCDCEB31D /* Support Files */ = { + isa = PBXGroup; + children = ( + C7F7FEFAD83DA09AE28FDCA80E0BC2FC /* Info.plist */, + 088827C7419093B2990D4EFAAEDC8A7F /* NBUCore.modulemap */, + 0AA34DCFCFEF150F324494FE3C70A1EA /* NBUCore.xcconfig */, + 1A11FB5F2CB2D8D075A93C4A62FDF617 /* NBUCore-dummy.m */, + D08DC7362CF759D50310965446F83850 /* NBUCore-prefix.pch */, + 7C1335C79D367EAF781B7330713481D4 /* NBUCore-umbrella.h */, + ); + name = "Support Files"; + path = "../Target Support Files/NBUCore"; sourceTree = ""; }; 636AA3499D58C091974AE95A4253BF20 /* Targets Support Files */ = { isa = PBXGroup; children = ( - 2564BBF19A0E466E11D587D9E18E7A7B /* Pods-ConsoleDemo */, + 52F73F779BA1E6688B8420DDD106BFF5 /* Pods-ConsoleDemo */, ); name = "Targets Support Files"; sourceTree = ""; @@ -277,15 +302,15 @@ name = Pods; sourceTree = ""; }; - 725C931F4F8ABB615B01F43F388D4C76 /* Support Files */ = { + 6B2B4FA0A3A82CCFDCCBCC40883C5159 /* Support Files */ = { isa = PBXGroup; children = ( - 7D22F7A66977F83F6DB8BB6EB358DF11 /* CocoaLumberjack.modulemap */, - BD675345E8B07BCA5F76BE1C95D6E5D1 /* CocoaLumberjack.xcconfig */, - 6C207D559243E12FB4A9AEB95884D15E /* CocoaLumberjack-dummy.m */, - 3EB69D745680CDCF3C6D34F37C1FFACA /* CocoaLumberjack-prefix.pch */, - 2B2A6C34C4F7A88F029B156B9F496921 /* CocoaLumberjack-umbrella.h */, - B46F0FDB78031643CB8E4E8CA32A8366 /* Info.plist */, + 17D462DDCE4F4F6817A2A5D57939F781 /* CocoaLumberjack.modulemap */, + 2D117F6EBE62BB9F3FC21289C3A59329 /* CocoaLumberjack.xcconfig */, + CC4F7BF640383D1BC5BAA6E5A638A86D /* CocoaLumberjack-dummy.m */, + DB196B01A201F8F9D0FC1D5D678CEBD0 /* CocoaLumberjack-prefix.pch */, + 78A07AF8D20D38F0B256D53408561CBE /* CocoaLumberjack-umbrella.h */, + BE22C7487FCD1A27C1EF3D7EEAA18B14 /* Info.plist */, ); name = "Support Files"; path = "../Target Support Files/CocoaLumberjack"; @@ -308,7 +333,7 @@ isa = PBXGroup; children = ( 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, - D984B117D813A24EEE5B4566E1415516 /* Development Pods */, + 53B6B972A1C62B360C0C9B9C2D2C9D45 /* Development Pods */, BC3FE3B3A6921F69F30B61731115E9B8 /* Frameworks */, 6A837DC1EB98457E78F66D9788A6507A /* Pods */, 8B44C3FF80E2634AA3DD56AACADEFB4C /* Products */, @@ -353,18 +378,23 @@ name = Default; sourceTree = ""; }; - 9059922EA277E08E11DBE3B8B24EFCE8 /* Support Files */ = { + A5B0D2EEE75FCADA861B7E9454710493 /* LumberjackConsole */ = { isa = PBXGroup; children = ( - 6DD217CA293419066DA2707BBD2C4BA4 /* Info.plist */, - AE13E0986657A144F21C76CF8A13C5BF /* NBUCore.modulemap */, - 648D3554C67A1887CF3D2B0821D296E9 /* NBUCore.xcconfig */, - 26B1D4536E06A0EC341E2560910B1F4A /* NBUCore-dummy.m */, - 220971F8AD6A4EAB1859A354850ADAD8 /* NBUCore-prefix.pch */, - F36A72C72CB9E84BC38085B03246250E /* NBUCore-umbrella.h */, + 3105B8ECD12585A78E858971C4C0C3EB /* PTEAdjustLevelsTableView.h */, + A1AE531022ACDAF8ECD5C93D9987A6AC /* PTEAdjustLevelsTableView.m */, + 786393D0DE0ECDE7776B458D74FCCE26 /* PTEConsoleLogger.h */, + 5D95F7FA71B7E44DA07C3B1051A9B0AC /* PTEConsoleLogger.m */, + 0912A5E15B4B0F84AEE75977D87A25AD /* PTEConsoleTableView.h */, + 2F5C28FCB7DBB73DB130D5EDE705A2C2 /* PTEConsoleTableView.m */, + B573E777C4DD1B9091B8F4E13084E6C8 /* PTEDashboard.h */, + 44BDA59A98A9EEF4949C3E24B7EB97D5 /* PTEDashboard.m */, + FCE54F0AE7DFFFA99FF4D1A27FE14783 /* Pod */, + 154296D7DF25D1B311CA13F7FBE8C0B3 /* Resources */, + 4796D928BD2B85242B09DBA33A8F81D9 /* Support Files */, ); - name = "Support Files"; - path = "../Target Support Files/NBUCore"; + name = LumberjackConsole; + path = ../..; sourceTree = ""; }; BC3FE3B3A6921F69F30B61731115E9B8 /* Frameworks */ = { @@ -377,39 +407,13 @@ name = Frameworks; sourceTree = ""; }; - D984B117D813A24EEE5B4566E1415516 /* Development Pods */ = { - isa = PBXGroup; - children = ( - F06043EDDC5509984A2E8DF57F1BB03F /* LumberjackConsole */, - ); - name = "Development Pods"; - sourceTree = ""; - }; - F06043EDDC5509984A2E8DF57F1BB03F /* LumberjackConsole */ = { - isa = PBXGroup; - children = ( - 907D7B460ADDE12406C3FCC135F64789 /* PTEAdjustLevelsTableView.h */, - D6E77FB0A85CA97D5EF1137E23366436 /* PTEAdjustLevelsTableView.m */, - 58611542B8945428A8F6664CF33DC0D2 /* PTEConsoleLogger.h */, - 2E99C9BF4B3F1C876B067075ED308C23 /* PTEConsoleLogger.m */, - 0B90986C66234C34A2B1C3BCAFE32B80 /* PTEConsoleTableView.h */, - 83E9167D21BA9D04A69CAEC1BA9038C3 /* PTEConsoleTableView.m */, - B0E804A8390F90579732D40A14678534 /* PTEDashboard.h */, - 5F059B29F26ADDEA49A70F3735FC8674 /* PTEDashboard.m */, - 579DF58D872CF777D571E4EA702E192D /* Resources */, - 2C64F3CC6EAF96BD24568680B51FF110 /* Support Files */, - ); - name = LumberjackConsole; - path = ../..; - sourceTree = ""; - }; F2693EFE6993027511108324AAA89CBD /* NBUCore */ = { isa = PBXGroup; children = ( F4D0119B9173D437CDE0EE59EAA26595 /* NBUAvailability.h */, BC994D8E8C5B4FF20BEF9BB609D0DE58 /* NBUCore.h */, 436F81B19A2D1C8F22E251AC4AD49756 /* NBUCore.m */, - 9059922EA277E08E11DBE3B8B24EFCE8 /* Support Files */, + 557B418F0218C46A53CFD72CCDCEB31D /* Support Files */, ); name = NBUCore; path = NBUCore; @@ -420,12 +424,22 @@ children = ( 8C4964BEE9F637B49E7203C75C432DBE /* Default */, 789320A70D15C2DA849EB8F42F2E56FC /* Extensions */, - 725C931F4F8ABB615B01F43F388D4C76 /* Support Files */, + 6B2B4FA0A3A82CCFDCCBCC40883C5159 /* Support Files */, ); name = CocoaLumberjack; path = CocoaLumberjack; sourceTree = ""; }; + FCE54F0AE7DFFFA99FF4D1A27FE14783 /* Pod */ = { + isa = PBXGroup; + children = ( + EF2F96F3706C36BDF855FB3A6A98A80C /* LICENSE */, + 99818A7FAA685221828A1D15C2E98AD2 /* LumberjackConsole.podspec */, + 428FCEF55B4B8C4A6E28DF1CC1B0061A /* README.md */, + ); + name = Pod; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -565,8 +579,8 @@ D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0700; + LastSwiftUpdateCheck = 0930; + LastUpgradeCheck = 0930; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -685,7 +699,7 @@ /* Begin XCBuildConfiguration section */ 1945904ED50FDDA2B00CFB4B5C72A068 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A78A23028EE7F1D1C6E7127186F775AE /* Pods-ConsoleDemo.debug.xcconfig */; + baseConfigurationReference = A01B1C50D8101C665C8277A5CDEC0AC9 /* Pods-ConsoleDemo.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -717,7 +731,7 @@ }; 2006DFE2BD59ED2E5BF2D534B93E801C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BD675345E8B07BCA5F76BE1C95D6E5D1 /* CocoaLumberjack.xcconfig */; + baseConfigurationReference = 2D117F6EBE62BB9F3FC21289C3A59329 /* CocoaLumberjack.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -747,7 +761,7 @@ }; 3B39A896AEA388A6ED4A3A243A1501E1 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 648D3554C67A1887CF3D2B0821D296E9 /* NBUCore.xcconfig */; + baseConfigurationReference = 0AA34DCFCFEF150F324494FE3C70A1EA /* NBUCore.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -776,7 +790,7 @@ }; 45DAC699F5FBBEC9BF1C9B8F3776E718 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 648D3554C67A1887CF3D2B0821D296E9 /* NBUCore.xcconfig */; + baseConfigurationReference = 0AA34DCFCFEF150F324494FE3C70A1EA /* NBUCore.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -806,7 +820,7 @@ }; 572AFC0B0A711AAD7924F7915749BA8E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3120C146F430319DE6E0D12EDB00ABB2 /* Pods-ConsoleDemo.release.xcconfig */; + baseConfigurationReference = 30ADD0539E6C5DF7C67BDE36A7BDF46F /* Pods-ConsoleDemo.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -839,7 +853,7 @@ }; 5D9E455138390DB8E58B7019006C7EC6 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3A64A838160E0ABA1BA5DA685661CB5D /* LumberjackConsole.xcconfig */; + baseConfigurationReference = 2608A0A6DF6B4B74A4983FA5E90757D9 /* LumberjackConsole.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -868,7 +882,7 @@ }; 5F89D5ABCAF8A6C439211676B398AA2C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BD675345E8B07BCA5F76BE1C95D6E5D1 /* CocoaLumberjack.xcconfig */; + baseConfigurationReference = 2D117F6EBE62BB9F3FC21289C3A59329 /* CocoaLumberjack.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -897,7 +911,7 @@ }; 88E2F3E14236D6A7338ED0C0C3AA2F80 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3A64A838160E0ABA1BA5DA685661CB5D /* LumberjackConsole.xcconfig */; + baseConfigurationReference = 2608A0A6DF6B4B74A4983FA5E90757D9 /* LumberjackConsole.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -925,7 +939,7 @@ }; name = Release; }; - B254DAA6CF0CE39F4A3D11B90A7E059A /* Release */ = { + C3E37FB098AE76440E29106ADBF00CEB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -935,10 +949,12 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -946,6 +962,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -956,13 +973,16 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_RELEASE=1", + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", "$(inherited)", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -972,15 +992,17 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SYMROOT = "${SRCROOT}/../build"; }; - name = Release; + name = Debug; }; - E4B68EE12B21C47CB798D9B1ECA6D7A7 /* Debug */ = { + DA03565BE765DB55C6448FB363A44481 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -990,10 +1012,12 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1001,6 +1025,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -1011,16 +1036,13 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_DEBUG=1", - "DEBUG=1", + "POD_CONFIGURATION_RELEASE=1", "$(inherited)", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1030,15 +1052,13 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; + MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SYMROOT = "${SRCROOT}/../build"; }; - name = Debug; + name = Release; }; /* End XCBuildConfiguration section */ @@ -1046,8 +1066,8 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - E4B68EE12B21C47CB798D9B1ECA6D7A7 /* Debug */, - B254DAA6CF0CE39F4A3D11B90A7E059A /* Release */, + C3E37FB098AE76440E29106ADBF00CEB /* Debug */, + DA03565BE765DB55C6448FB363A44481 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Demo/Pods/Target Support Files/CocoaLumberjack/CocoaLumberjack.xcconfig b/Demo/Pods/Target Support Files/CocoaLumberjack/CocoaLumberjack.xcconfig index eb08882..3c45c91 100644 --- a/Demo/Pods/Target Support Files/CocoaLumberjack/CocoaLumberjack.xcconfig +++ b/Demo/Pods/Target Support Files/CocoaLumberjack/CocoaLumberjack.xcconfig @@ -1,8 +1,8 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/CocoaLumberjack +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/CocoaLumberjack PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/Demo/Pods/Target Support Files/LumberjackConsole/LumberjackConsole.xcconfig b/Demo/Pods/Target Support Files/LumberjackConsole/LumberjackConsole.xcconfig index 841f3bb..1891737 100644 --- a/Demo/Pods/Target Support Files/LumberjackConsole/LumberjackConsole.xcconfig +++ b/Demo/Pods/Target Support Files/LumberjackConsole/LumberjackConsole.xcconfig @@ -1,9 +1,9 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/LumberjackConsole -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/CocoaLumberjack" "$PODS_CONFIGURATION_BUILD_DIR/NBUCore" +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/LumberjackConsole +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/NBUCore" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.. PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/Demo/Pods/Target Support Files/NBUCore/NBUCore.xcconfig b/Demo/Pods/Target Support Files/NBUCore/NBUCore.xcconfig index b5ec5b9..7ac1498 100644 --- a/Demo/Pods/Target Support Files/NBUCore/NBUCore.xcconfig +++ b/Demo/Pods/Target Support Files/NBUCore/NBUCore.xcconfig @@ -1,8 +1,8 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/NBUCore +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/NBUCore GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/NBUCore PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo-frameworks.sh b/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo-frameworks.sh index a4c55cd..01703f0 100755 --- a/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo-frameworks.sh +++ b/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo-frameworks.sh @@ -6,10 +6,14 @@ mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + # This protects against multiple targets copying the same framework dependency at the same time. The solution # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -58,12 +62,31 @@ install_framework() fi } -# Copies the dSYM of a vendored framework +# Copies and strips a vendored dSYM install_dsym() { local source="$1" if [ -r "$source" ]; then - echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\"" - rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}" + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi fi } @@ -85,10 +108,18 @@ code_sign_if_enabled() { # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do + for arch in $binary_archs; do if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 @@ -98,6 +129,7 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } diff --git a/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo.debug.xcconfig b/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo.debug.xcconfig index 5a20b01..291229e 100644 --- a/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo.debug.xcconfig +++ b/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo.debug.xcconfig @@ -1,9 +1,9 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/CocoaLumberjack" "$PODS_CONFIGURATION_BUILD_DIR/LumberjackConsole" "$PODS_CONFIGURATION_BUILD_DIR/NBUCore" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/LumberjackConsole" "${PODS_CONFIGURATION_BUILD_DIR}/NBUCore" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/CocoaLumberjack/CocoaLumberjack.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/LumberjackConsole/LumberjackConsole.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/NBUCore/NBUCore.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack/CocoaLumberjack.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/LumberjackConsole/LumberjackConsole.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/NBUCore/NBUCore.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "CocoaLumberjack" -framework "LumberjackConsole" -framework "NBUCore" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo.release.xcconfig b/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo.release.xcconfig index 5a20b01..291229e 100644 --- a/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo.release.xcconfig +++ b/Demo/Pods/Target Support Files/Pods-ConsoleDemo/Pods-ConsoleDemo.release.xcconfig @@ -1,9 +1,9 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/CocoaLumberjack" "$PODS_CONFIGURATION_BUILD_DIR/LumberjackConsole" "$PODS_CONFIGURATION_BUILD_DIR/NBUCore" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/LumberjackConsole" "${PODS_CONFIGURATION_BUILD_DIR}/NBUCore" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/CocoaLumberjack/CocoaLumberjack.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/LumberjackConsole/LumberjackConsole.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/NBUCore/NBUCore.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack/CocoaLumberjack.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/LumberjackConsole/LumberjackConsole.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/NBUCore/NBUCore.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "CocoaLumberjack" -framework "LumberjackConsole" -framework "NBUCore" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods From 042252774e8843dd2e0a854ab332580b67ecfe58 Mon Sep 17 00:00:00 2001 From: HHK Date: Thu, 3 May 2018 12:02:24 +0200 Subject: [PATCH 2/4] update cocoalumberjack to 3.4.2 --- Demo/Podfile.lock | 12 ++--- .../Classes/DDAbstractDatabaseLogger.m | 46 ++++++++-------- .../CocoaLumberjack/Classes/DDFileLogger.h | 5 ++ .../CocoaLumberjack/Classes/DDFileLogger.m | 17 +++--- Demo/Pods/CocoaLumberjack/Classes/DDLog.h | 2 +- Demo/Pods/CocoaLumberjack/Classes/DDLog.m | 32 ++++++------ .../Pods/CocoaLumberjack/Classes/DDOSLogger.h | 1 - .../Pods/CocoaLumberjack/Classes/DDOSLogger.m | 38 ++++++++------ .../CocoaLumberjack/Classes/DDTTYLogger.m | 32 ++++++------ .../Classes/Extensions/DDMultiFormatter.m | 12 ++--- Demo/Pods/CocoaLumberjack/README.md | 20 +++---- Demo/Pods/Manifest.lock | 12 ++--- Demo/Pods/Pods.xcodeproj/project.pbxproj | 52 +++++++++---------- .../CocoaLumberjack/Info.plist | 2 +- 14 files changed, 149 insertions(+), 134 deletions(-) diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock index e55b166..953d41c 100644 --- a/Demo/Podfile.lock +++ b/Demo/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - CocoaLumberjack (3.3.0): - - CocoaLumberjack/Default (= 3.3.0) - - CocoaLumberjack/Extensions (= 3.3.0) - - CocoaLumberjack/Default (3.3.0) - - CocoaLumberjack/Extensions (3.3.0): + - CocoaLumberjack (3.4.2): + - CocoaLumberjack/Default (= 3.4.2) + - CocoaLumberjack/Extensions (= 3.4.2) + - CocoaLumberjack/Default (3.4.2) + - CocoaLumberjack/Extensions (3.4.2): - CocoaLumberjack/Default - LumberjackConsole (3.3.0): - CocoaLumberjack (>= 3.x) @@ -18,7 +18,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - CocoaLumberjack: 3c8c74683302f9012bb168e1c4b7ae3c0b558431 + CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd LumberjackConsole: d3ae5509b5c698ddfade7e1ed9b305403e78e661 NBUCore: 201af50441f48513ef6d5823a5fc12c9e1f288cd diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m b/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m index af37bdb..7f4c232 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m +++ b/Demo/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m @@ -217,7 +217,7 @@ - (NSUInteger)saveThreshold { dispatch_sync(globalLoggingQueue, ^{ dispatch_sync(self.loggerQueue, ^{ - result = _saveThreshold; + result = self->_saveThreshold; }); }); @@ -227,15 +227,15 @@ - (NSUInteger)saveThreshold { - (void)setSaveThreshold:(NSUInteger)threshold { dispatch_block_t block = ^{ @autoreleasepool { - if (_saveThreshold != threshold) { - _saveThreshold = threshold; + if (self->_saveThreshold != threshold) { + self->_saveThreshold = threshold; // Since the saveThreshold has changed, // we check to see if the current unsavedCount has surpassed the new threshold. // // If it has, we immediately save the log. - if ((_unsavedCount >= _saveThreshold) && (_saveThreshold > 0)) { + if ((self->_unsavedCount >= self->_saveThreshold) && (self->_saveThreshold > 0)) { [self performSaveAndSuspendSaveTimer]; } } @@ -277,7 +277,7 @@ - (NSTimeInterval)saveInterval { dispatch_sync(globalLoggingQueue, ^{ dispatch_sync(self.loggerQueue, ^{ - result = _saveInterval; + result = self->_saveInterval; }); }); @@ -290,8 +290,8 @@ - (void)setSaveInterval:(NSTimeInterval)interval { // C99 recommended floating point comparison macro // Read: isLessThanOrGreaterThan(floatA, floatB) - if (/* saveInterval != interval */ islessgreater(_saveInterval, interval)) { - _saveInterval = interval; + if (/* saveInterval != interval */ islessgreater(self->_saveInterval, interval)) { + self->_saveInterval = interval; // There are several cases we need to handle here. // @@ -306,8 +306,8 @@ - (void)setSaveInterval:(NSTimeInterval)interval { // 4. If the saveInterval decreased, then we need to reset the timer so that it fires at an earlier date. // (Plus we might need to do an immediate save.) - if (_saveInterval > 0.0) { - if (_saveTimer == NULL) { + if (self->_saveInterval > 0.0) { + if (self->_saveTimer == NULL) { // Handles #2 // // Since the saveTimer uses the unsavedTime to calculate it's first fireDate, @@ -324,7 +324,7 @@ - (void)setSaveInterval:(NSTimeInterval)interval { [self updateAndResumeSaveTimer]; } - } else if (_saveTimer) { + } else if (self->_saveTimer) { // Handles #1 [self destroySaveTimer]; @@ -368,7 +368,7 @@ - (NSTimeInterval)maxAge { dispatch_sync(globalLoggingQueue, ^{ dispatch_sync(self.loggerQueue, ^{ - result = _maxAge; + result = self->_maxAge; }); }); @@ -381,11 +381,11 @@ - (void)setMaxAge:(NSTimeInterval)interval { // C99 recommended floating point comparison macro // Read: isLessThanOrGreaterThan(floatA, floatB) - if (/* maxAge != interval */ islessgreater(_maxAge, interval)) { - NSTimeInterval oldMaxAge = _maxAge; + if (/* maxAge != interval */ islessgreater(self->_maxAge, interval)) { + NSTimeInterval oldMaxAge = self->_maxAge; NSTimeInterval newMaxAge = interval; - _maxAge = interval; + self->_maxAge = interval; // There are several cases we need to handle here. // @@ -420,7 +420,7 @@ - (void)setMaxAge:(NSTimeInterval)interval { if (shouldDeleteNow) { [self performDelete]; - if (_deleteTimer) { + if (self->_deleteTimer) { [self updateDeleteTimer]; } else { [self createAndStartDeleteTimer]; @@ -465,7 +465,7 @@ - (NSTimeInterval)deleteInterval { dispatch_sync(globalLoggingQueue, ^{ dispatch_sync(self.loggerQueue, ^{ - result = _deleteInterval; + result = self->_deleteInterval; }); }); @@ -478,8 +478,8 @@ - (void)setDeleteInterval:(NSTimeInterval)interval { // C99 recommended floating point comparison macro // Read: isLessThanOrGreaterThan(floatA, floatB) - if (/* deleteInterval != interval */ islessgreater(_deleteInterval, interval)) { - _deleteInterval = interval; + if (/* deleteInterval != interval */ islessgreater(self->_deleteInterval, interval)) { + self->_deleteInterval = interval; // There are several cases we need to handle here. // @@ -494,8 +494,8 @@ - (void)setDeleteInterval:(NSTimeInterval)interval { // 4. If the deleteInterval decreased, then we need to reset the timer so that it fires at an earlier date. // (Plus we might need to do an immediate delete.) - if (_deleteInterval > 0.0) { - if (_deleteTimer == NULL) { + if (self->_deleteInterval > 0.0) { + if (self->_deleteTimer == NULL) { // Handles #2 // // Since the deleteTimer uses the lastDeleteTime to calculate it's first fireDate, @@ -511,7 +511,7 @@ - (void)setDeleteInterval:(NSTimeInterval)interval { [self updateDeleteTimer]; } - } else if (_deleteTimer) { + } else if (self->_deleteTimer) { // Handles #1 [self destroyDeleteTimer]; @@ -555,7 +555,7 @@ - (BOOL)deleteOnEverySave { dispatch_sync(globalLoggingQueue, ^{ dispatch_sync(self.loggerQueue, ^{ - result = _deleteOnEverySave; + result = self->_deleteOnEverySave; }); }); @@ -564,7 +564,7 @@ - (BOOL)deleteOnEverySave { - (void)setDeleteOnEverySave:(BOOL)flag { dispatch_block_t block = ^{ - _deleteOnEverySave = flag; + self->_deleteOnEverySave = flag; }; // The design of the setter logic below is taken from the DDAbstractLogger implementation. diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.h b/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.h index 66b27aa..14eb892 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.h +++ b/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.h @@ -326,6 +326,11 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota; */ - (void)didLogMessage NS_REQUIRES_SUPER; +/** + * Writes all in-memory log data to the permanent storage. Call super before your implementation. + */ +- (void)flush NS_REQUIRES_SUPER; + /** * Called when the logger checks archive or not current log file. * Override this method to exdend standart behavior. By default returns NO. diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.m b/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.m index 133ac7c..d8f31e3 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.m +++ b/Demo/Pods/CocoaLumberjack/Classes/DDFileLogger.m @@ -279,13 +279,14 @@ - (NSString *)logsDirectory { - (BOOL)isLogFile:(NSString *)fileName { NSString *appName = [self applicationName]; - BOOL hasProperPrefix = [fileName hasPrefix:appName]; + // We need to add a space to the name as otherwise we could match applications that have the name prefix. + BOOL hasProperPrefix = [fileName hasPrefix:[appName stringByAppendingString:@" "]]; BOOL hasProperSuffix = [fileName hasSuffix:@".log"]; return (hasProperPrefix && hasProperSuffix); } -//if you change formater , then change sortedLogFileInfos method also accordingly +// if you change formatter, then change sortedLogFileInfos method also accordingly - (NSDateFormatter *)logFileDateFormatter { NSMutableDictionary *dictionary = [[NSThread currentThread] threadDictionary]; @@ -611,7 +612,7 @@ - (unsigned long long)maximumFileSize { __block unsigned long long result; dispatch_block_t block = ^{ - result = _maximumFileSize; + result = self->_maximumFileSize; }; // The design of this method is taken from the DDAbstractLogger implementation. @@ -639,7 +640,7 @@ - (unsigned long long)maximumFileSize { - (void)setMaximumFileSize:(unsigned long long)newMaximumFileSize { dispatch_block_t block = ^{ @autoreleasepool { - _maximumFileSize = newMaximumFileSize; + self->_maximumFileSize = newMaximumFileSize; [self maybeRollLogFileDueToSize]; } }; @@ -668,7 +669,7 @@ - (NSTimeInterval)rollingFrequency { __block NSTimeInterval result; dispatch_block_t block = ^{ - result = _rollingFrequency; + result = self->_rollingFrequency; }; // The design of this method is taken from the DDAbstractLogger implementation. @@ -696,7 +697,7 @@ - (NSTimeInterval)rollingFrequency { - (void)setRollingFrequency:(NSTimeInterval)newRollingFrequency { dispatch_block_t block = ^{ @autoreleasepool { - _rollingFrequency = newRollingFrequency; + self->_rollingFrequency = newRollingFrequency; [self maybeRollLogFileDueToAge]; } }; @@ -1039,6 +1040,10 @@ - (NSString *)loggerName { return @"cocoa.lumberjack.fileLogger"; } +- (void)flush { + [_currentLogFileHandle synchronizeFile]; +} + @end //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDLog.h b/Demo/Pods/CocoaLumberjack/Classes/DDLog.h index c9958ad..906be76 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDLog.h +++ b/Demo/Pods/CocoaLumberjack/Classes/DDLog.h @@ -177,7 +177,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return the file name */ -NSString * __nullable DDExtractFileNameWithoutExtension(const char *filePath, BOOL copy); +FOUNDATION_EXTERN NSString * __nullable DDExtractFileNameWithoutExtension(const char *filePath, BOOL copy); /** * The THIS_FILE macro gives you an NSString of the file name. diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDLog.m b/Demo/Pods/CocoaLumberjack/Classes/DDLog.m index 9736f12..42538c7 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDLog.m +++ b/Demo/Pods/CocoaLumberjack/Classes/DDLog.m @@ -351,17 +351,16 @@ - (void)queueLogMessage:(DDLogMessage *)logMessage asynchronously:(BOOL)asyncFla // Dispatch semaphores call down to the kernel only when the calling thread needs to be blocked. // If the calling semaphore does not need to block, no kernel call is made. - dispatch_semaphore_wait(_queueSemaphore, DISPATCH_TIME_FOREVER); - - // We've now sure we won't overflow the queue. - // It is time to queue our log message. - dispatch_block_t logBlock = ^{ + dispatch_semaphore_wait(_queueSemaphore, DISPATCH_TIME_FOREVER); @autoreleasepool { [self lt_log:logMessage]; } }; + // We've now sure we won't overflow the queue. + // It is time to queue our log message. + if (asyncFlag) { dispatch_async(_loggingQueue, logBlock); } else { @@ -630,6 +629,7 @@ + (NSArray *)registeredClasses { if (numClasses > bufferSize || numClasses == 0) { //apparently more classes added between calls (or a problem); try again free(classes); + classes = NULL; numClasses = 0; } } @@ -1313,8 +1313,8 @@ - (void)logMessage:(DDLogMessage * __attribute__((unused)))logMessage { __block id result; dispatch_sync(globalLoggingQueue, ^{ - dispatch_sync(_loggerQueue, ^{ - result = _logFormatter; + dispatch_sync(self->_loggerQueue, ^{ + result = self->_logFormatter; }); }); @@ -1329,17 +1329,17 @@ - (void)setLogFormatter:(id )logFormatter { dispatch_block_t block = ^{ @autoreleasepool { - if (_logFormatter != logFormatter) { - if ([_logFormatter respondsToSelector:@selector(willRemoveFromLogger:)]) { - [_logFormatter willRemoveFromLogger:self]; + if (self->_logFormatter != logFormatter) { + if ([self->_logFormatter respondsToSelector:@selector(willRemoveFromLogger:)]) { + [self->_logFormatter willRemoveFromLogger:self]; } - _logFormatter = logFormatter; + self->_logFormatter = logFormatter; - if ([_logFormatter respondsToSelector:@selector(didAddToLogger:inQueue:)]) { - [_logFormatter didAddToLogger:self inQueue:_loggerQueue]; - } else if ([_logFormatter respondsToSelector:@selector(didAddToLogger:)]) { - [_logFormatter didAddToLogger:self]; + if ([self->_logFormatter respondsToSelector:@selector(didAddToLogger:inQueue:)]) { + [self->_logFormatter didAddToLogger:self inQueue:self->_loggerQueue]; + } else if ([self->_logFormatter respondsToSelector:@selector(didAddToLogger:)]) { + [self->_logFormatter didAddToLogger:self]; } } } @@ -1348,7 +1348,7 @@ - (void)setLogFormatter:(id )logFormatter { dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; dispatch_async(globalLoggingQueue, ^{ - dispatch_async(_loggerQueue, block); + dispatch_async(self->_loggerQueue, block); }); } diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDOSLogger.h b/Demo/Pods/CocoaLumberjack/Classes/DDOSLogger.h index f086658..f77490a 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDOSLogger.h +++ b/Demo/Pods/CocoaLumberjack/Classes/DDOSLogger.h @@ -25,7 +25,6 @@ /** * This class provides a logger for the Apple os_log facility. **/ -API_AVAILABLE(ios(10.0), macos(10.12), tvos(10.0), watchos(3.0)) @interface DDOSLogger : DDAbstractLogger /** diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDOSLogger.m b/Demo/Pods/CocoaLumberjack/Classes/DDOSLogger.m index d63d969..95205cb 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDOSLogger.m +++ b/Demo/Pods/CocoaLumberjack/Classes/DDOSLogger.m @@ -48,26 +48,30 @@ - (void)logMessage:(DDLogMessage *)logMessage { return; } - NSString * message = _logFormatter ? [_logFormatter formatLogMessage:logMessage] : logMessage->_message; - - if (message) { - const char *msg = [message UTF8String]; + if(@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)) { - switch (logMessage->_flag) { - case DDLogFlagError : - os_log_error(OS_LOG_DEFAULT, "%{public}s", msg); - break; - case DDLogFlagWarning : - case DDLogFlagInfo : - os_log_info(OS_LOG_DEFAULT, "%{public}s", msg); - break; - case DDLogFlagDebug : - case DDLogFlagVerbose : - default : - os_log_debug(OS_LOG_DEFAULT, "%{public}s", msg); - break; + NSString * message = _logFormatter ? [_logFormatter formatLogMessage:logMessage] : logMessage->_message; + if (message) { + const char *msg = [message UTF8String]; + + switch (logMessage->_flag) { + case DDLogFlagError : + os_log_error(OS_LOG_DEFAULT, "%{public}s", msg); + break; + case DDLogFlagWarning : + case DDLogFlagInfo : + os_log_info(OS_LOG_DEFAULT, "%{public}s", msg); + break; + case DDLogFlagDebug : + case DDLogFlagVerbose : + default : + os_log_debug(OS_LOG_DEFAULT, "%{public}s", msg); + break; + } } + } + } - (NSString *)loggerName { diff --git a/Demo/Pods/CocoaLumberjack/Classes/DDTTYLogger.m b/Demo/Pods/CocoaLumberjack/Classes/DDTTYLogger.m index f643677..366bd6f 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/DDTTYLogger.m +++ b/Demo/Pods/CocoaLumberjack/Classes/DDTTYLogger.m @@ -900,7 +900,7 @@ - (BOOL)colorsEnabled { dispatch_sync(globalLoggingQueue, ^{ dispatch_sync(self.loggerQueue, ^{ - result = _colorsEnabled; + result = self->_colorsEnabled; }); }); @@ -910,9 +910,9 @@ - (BOOL)colorsEnabled { - (void)setColorsEnabled:(BOOL)newColorsEnabled { dispatch_block_t block = ^{ @autoreleasepool { - _colorsEnabled = newColorsEnabled; + self->_colorsEnabled = newColorsEnabled; - if ([_colorProfilesArray count] == 0) { + if ([self->_colorProfilesArray count] == 0) { [self loadDefaultColorProfiles]; } } @@ -955,7 +955,7 @@ - (void)setForegroundColor:(DDColor *)txtColor backgroundColor:(DDColor *)bgColo NSUInteger i = 0; - for (DDTTYLoggerColorProfile *colorProfile in _colorProfilesArray) { + for (DDTTYLoggerColorProfile *colorProfile in self->_colorProfilesArray) { if ((colorProfile->mask == mask) && (colorProfile->context == ctxt)) { break; } @@ -963,10 +963,10 @@ - (void)setForegroundColor:(DDColor *)txtColor backgroundColor:(DDColor *)bgColo i++; } - if (i < [_colorProfilesArray count]) { - _colorProfilesArray[i] = newColorProfile; + if (i < [self->_colorProfilesArray count]) { + self->_colorProfilesArray[i] = newColorProfile; } else { - [_colorProfilesArray addObject:newColorProfile]; + [self->_colorProfilesArray addObject:newColorProfile]; } } }; @@ -999,7 +999,7 @@ - (void)setForegroundColor:(DDColor *)txtColor backgroundColor:(DDColor *)bgColo NSLogInfo(@"DDTTYLogger: newColorProfile: %@", newColorProfile); - _colorProfilesDict[tag] = newColorProfile; + self->_colorProfilesDict[tag] = newColorProfile; } }; @@ -1027,7 +1027,7 @@ - (void)clearColorsForFlag:(DDLogFlag)mask context:(NSInteger)context { @autoreleasepool { NSUInteger i = 0; - for (DDTTYLoggerColorProfile *colorProfile in _colorProfilesArray) { + for (DDTTYLoggerColorProfile *colorProfile in self->_colorProfilesArray) { if ((colorProfile->mask == mask) && (colorProfile->context == context)) { break; } @@ -1035,8 +1035,8 @@ - (void)clearColorsForFlag:(DDLogFlag)mask context:(NSInteger)context { i++; } - if (i < [_colorProfilesArray count]) { - [_colorProfilesArray removeObjectAtIndex:i]; + if (i < [self->_colorProfilesArray count]) { + [self->_colorProfilesArray removeObjectAtIndex:i]; } } }; @@ -1061,7 +1061,7 @@ - (void)clearColorsForTag:(id )tag { dispatch_block_t block = ^{ @autoreleasepool { - [_colorProfilesDict removeObjectForKey:tag]; + [self->_colorProfilesDict removeObjectForKey:tag]; } }; @@ -1083,7 +1083,7 @@ - (void)clearColorsForTag:(id )tag { - (void)clearColorsForAllFlags { dispatch_block_t block = ^{ @autoreleasepool { - [_colorProfilesArray removeAllObjects]; + [self->_colorProfilesArray removeAllObjects]; } }; @@ -1105,7 +1105,7 @@ - (void)clearColorsForAllFlags { - (void)clearColorsForAllTags { dispatch_block_t block = ^{ @autoreleasepool { - [_colorProfilesDict removeAllObjects]; + [self->_colorProfilesDict removeAllObjects]; } }; @@ -1127,8 +1127,8 @@ - (void)clearColorsForAllTags { - (void)clearAllColors { dispatch_block_t block = ^{ @autoreleasepool { - [_colorProfilesArray removeAllObjects]; - [_colorProfilesDict removeAllObjects]; + [self->_colorProfilesArray removeAllObjects]; + [self->_colorProfilesDict removeAllObjects]; } }; diff --git a/Demo/Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m b/Demo/Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m index 2533b32..895ddc5 100644 --- a/Demo/Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m +++ b/Demo/Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m @@ -81,7 +81,7 @@ - (NSString *)formatLogMessage:(DDLogMessage *)logMessage { __block NSString *line = logMessage->_message; dispatch_sync(_queue, ^{ - for (id formatter in _formatters) { + for (id formatter in self->_formatters) { DDLogMessage *message = [self logMessageForLine:line originalMessage:logMessage]; line = [formatter formatLogMessage:message]; @@ -107,7 +107,7 @@ - (NSArray *)formatters { __block NSArray *formatters; dispatch_sync(_queue, ^{ - formatters = [_formatters copy]; + formatters = [self->_formatters copy]; }); return formatters; @@ -115,19 +115,19 @@ - (NSArray *)formatters { - (void)addFormatter:(id)formatter { dispatch_barrier_async(_queue, ^{ - [_formatters addObject:formatter]; + [self->_formatters addObject:formatter]; }); } - (void)removeFormatter:(id)formatter { dispatch_barrier_async(_queue, ^{ - [_formatters removeObject:formatter]; + [self->_formatters removeObject:formatter]; }); } - (void)removeAllFormatters { dispatch_barrier_async(_queue, ^{ - [_formatters removeAllObjects]; + [self->_formatters removeAllObjects]; }); } @@ -135,7 +135,7 @@ - (BOOL)isFormattingWithFormatter:(id)formatter { __block BOOL hasFormatter; dispatch_sync(_queue, ^{ - hasFormatter = [_formatters containsObject:formatter]; + hasFormatter = [self->_formatters containsObject:formatter]; }); return hasFormatter; diff --git a/Demo/Pods/CocoaLumberjack/README.md b/Demo/Pods/CocoaLumberjack/README.md index 74aa6e7..487408e 100644 --- a/Demo/Pods/CocoaLumberjack/README.md +++ b/Demo/Pods/CocoaLumberjack/README.md @@ -48,11 +48,11 @@ DDLog.add(fileLogger) ... -DDLogVerbose("Verbose"); -DDLogDebug("Debug"); -DDLogInfo("Info"); -DDLogWarn("Warn"); -DDLogError("Error"); +DDLogVerbose("Verbose") +DDLogDebug("Debug") +DDLogInfo("Info") +DDLogWarn("Warn") +DDLogError("Error") ``` ##### Obj-C version via CocoaPods @@ -151,14 +151,16 @@ Configure your logging however you want. Change log levels per file (perfect for ### Requirements The current version of Lumberjack requires: -- Xcode 8 or later -- Swift 3.0 or later -- iOS 5 or later -- OS X 10.7 or later +- Xcode 9 or later +- Swift 4.0 or later +- iOS 6 or later +- OS X 10.8 or later - WatchOS 2 or later - TVOS 9 or later #### Backwards compability +- for iOS 5 and OS X 10.7, use the 3.3 version +- for Xcode 8 and Swift 3, use the 3.2 version - for Xcode 7.3 and Swift 2.3, use the 2.4.0 version - for Xcode 7.3 and Swift 2.2, use the 2.3.0 version - for Xcode 7.2 and 7.1, use the 2.2.0 version diff --git a/Demo/Pods/Manifest.lock b/Demo/Pods/Manifest.lock index e55b166..953d41c 100644 --- a/Demo/Pods/Manifest.lock +++ b/Demo/Pods/Manifest.lock @@ -1,9 +1,9 @@ PODS: - - CocoaLumberjack (3.3.0): - - CocoaLumberjack/Default (= 3.3.0) - - CocoaLumberjack/Extensions (= 3.3.0) - - CocoaLumberjack/Default (3.3.0) - - CocoaLumberjack/Extensions (3.3.0): + - CocoaLumberjack (3.4.2): + - CocoaLumberjack/Default (= 3.4.2) + - CocoaLumberjack/Extensions (= 3.4.2) + - CocoaLumberjack/Default (3.4.2) + - CocoaLumberjack/Extensions (3.4.2): - CocoaLumberjack/Default - LumberjackConsole (3.3.0): - CocoaLumberjack (>= 3.x) @@ -18,7 +18,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - CocoaLumberjack: 3c8c74683302f9012bb168e1c4b7ae3c0b558431 + CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd LumberjackConsole: d3ae5509b5c698ddfade7e1ed9b305403e78e661 NBUCore: 201af50441f48513ef6d5823a5fc12c9e1f288cd diff --git a/Demo/Pods/Pods.xcodeproj/project.pbxproj b/Demo/Pods/Pods.xcodeproj/project.pbxproj index 6210ef7..98937d5 100644 --- a/Demo/Pods/Pods.xcodeproj/project.pbxproj +++ b/Demo/Pods/Pods.xcodeproj/project.pbxproj @@ -8,36 +8,36 @@ /* Begin PBXBuildFile section */ 01630B2CDB6B45477072484503523233 /* DDASLLogCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C333AC5337C869723C636F6BAA78390 /* DDASLLogCapture.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 05A3024CE5EDD58A4DC1F1FCE52088DE /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C12155DF6892AD94CED47E84559CDB /* DDTTYLogger.m */; }; 05CD1FE195807C60C34A75956A30E5AC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F036A7D5E8370DAF0D39AF392D16BB0 /* Foundation.framework */; }; - 06270CD9D8C26C49505C5F53FF11D927 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C12155DF6892AD94CED47E84559CDB /* DDTTYLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; - 08284B0947FEECE865742912B045BCCF /* DDMultiFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = F70A7B763363C0EF2E1A07C721C18390 /* DDMultiFormatter.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; + 07DE79F78F09C91A42156FC0A5E3F2B7 /* DDMultiFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = F70A7B763363C0EF2E1A07C721C18390 /* DDMultiFormatter.m */; }; 1437647AF7C88C65998EFA2A2C2B4C01 /* DDOSLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C7F33C3355898E6EA55F219EEF89005 /* DDOSLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1900FF7D1ED47CB7486A8B9E7FA91DB7 /* PTEConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 786393D0DE0ECDE7776B458D74FCCE26 /* PTEConsoleLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1FE784EA6C983CCFADBBC32B77159FAE /* DDMultiFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = B2F0FC78DC01681AD53813CB6A766AE2 /* DDMultiFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 23A412D4DEA3E4C15D7CB86ACBD9A9A9 /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C25BD259829C617D2DE326FB8D141F /* DDAbstractDatabaseLogger.m */; }; 23C7A95FE6B5FD3E1663F19998E29053 /* DDLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 642221DE37F225529F1029ECE2C80F48 /* DDLog.h */; settings = {ATTRIBUTES = (Public, ); }; }; 255E4EC79BF6255BB34C326B693660EF /* LumberjackConsole-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D9E0006ABE0775AB17CCFA1C67B0C342 /* LumberjackConsole-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 28DDFF25768E01F1890BCFA79B2DDCE8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F036A7D5E8370DAF0D39AF392D16BB0 /* Foundation.framework */; }; - 2DBA4141D7B052E43958C96F3466FA6E /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 6DE95CCADF581BD3B76F6639CBAB5084 /* DDLog.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 30B7E7BB6F10DC071600C1C0425E6E93 /* NBUCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 363651AF9F7904CA1DDC4E8184D7C311 /* NBUCore.framework */; }; - 34ADF6CEA813D96341D2C4ED247D0DFD /* DDASLLogCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A18FFBAD8C0DC41FAE633D6A08E231 /* DDASLLogCapture.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 371298D6BC5F668971E194350C132882 /* CocoaLumberjack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 646A75BE8302EF8C50C10271AD979104 /* CocoaLumberjack.framework */; }; - 381685FA8A1867BFBA1812E8D793DC93 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FDCC703A42EDB08874DFF7C7974D346 /* DDFileLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; + 37F43599DE0FE672901C80B445073BD0 /* DDContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EC667F8D973C739C7CD2891B772059F /* DDContextFilterLogFormatter.m */; }; 381FCF562CC9776A50974955B9079FA3 /* PTEAdjustLevelsTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3105B8ECD12585A78E858971C4C0C3EB /* PTEAdjustLevelsTableView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3FFB518D11A6E10939ADC380F61245E9 /* DDAssertMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B6A278E7FCBBE0F00422E684E8C76DB /* DDAssertMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 41C4480C6D7CD4D98DB5A03F0AF240C2 /* DDDispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CF7D452518AED59BC9D9E8B595EF6DE /* DDDispatchQueueLogFormatter.m */; }; 466560586F04FC7219636C25771ADAB7 /* DDLegacyMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 8DFEB1E0799E04C9DE78EB0FE06E4582 /* DDLegacyMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47F4977BC6DBE3B3988E3C44E9CBFD74 /* PTEAdjustLevelsTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = A1AE531022ACDAF8ECD5C93D9987A6AC /* PTEAdjustLevelsTableView.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 48C62DD9F7073A59EB09910898245480 /* NBUAvailability.h in Headers */ = {isa = PBXBuildFile; fileRef = F4D0119B9173D437CDE0EE59EAA26595 /* NBUAvailability.h */; settings = {ATTRIBUTES = (Public, ); }; }; 59A550FBFA45FBAD71BE1ED0D90C3DE8 /* PTEConsoleTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0912A5E15B4B0F84AEE75977D87A25AD /* PTEConsoleTableView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 5A645DFB0450C8A1E7825670AB068493 /* DDASLLogCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A18FFBAD8C0DC41FAE633D6A08E231 /* DDASLLogCapture.m */; }; + 5D08CF907B3ACEBE1869A215016D972A /* CocoaLumberjack-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = CC4F7BF640383D1BC5BAA6E5A638A86D /* CocoaLumberjack-dummy.m */; }; 5FE5856931B6EA4EA3F0C37CF6C92C9A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F036A7D5E8370DAF0D39AF392D16BB0 /* Foundation.framework */; }; + 60BFA33F6846DE0AD436DD1F5E304A40 /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 9161ED7D3AB07F858C9105F97C8CCF9D /* DDASLLogger.m */; }; 690B892A2F54BDA1BF0157066090F8D0 /* PTEDashboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 44BDA59A98A9EEF4949C3E24B7EB97D5 /* PTEDashboard.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; - 7163FCA57C02C890435DFA2A4F3AE4C8 /* DDContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EC667F8D973C739C7CD2891B772059F /* DDContextFilterLogFormatter.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; - 75CC69BC081384EA3033F3AB5CF97E29 /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 9161ED7D3AB07F858C9105F97C8CCF9D /* DDASLLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; - 77F55DA1292F4A23365745071EF0B667 /* DDDispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CF7D452518AED59BC9D9E8B595EF6DE /* DDDispatchQueueLogFormatter.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 79E82CD7091C926FC0A2EF3D1AA5187C /* PTEConsoleTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F5C28FCB7DBB73DB130D5EDE705A2C2 /* PTEConsoleTableView.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; 7AB440B811320CE60B96C5239F840B44 /* NBUCore-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A11FB5F2CB2D8D075A93C4A62FDF617 /* NBUCore-dummy.m */; }; 9ECDFDB4B9829BBB0E369F85D240B8AE /* CocoaLumberjack-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 78A07AF8D20D38F0B256D53408561CBE /* CocoaLumberjack-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A38FD606BF174D0485A33F01074216FA /* DDOSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = FC68B1B5D87A9BD4E83EFB61528AE3D3 /* DDOSLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; B31FFD1BBDF5A0934523FF480F4DB394 /* NBUCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 436F81B19A2D1C8F22E251AC4AD49756 /* NBUCore.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; + B793B42EBC241FF88CB43CB202EB3380 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FDCC703A42EDB08874DFF7C7974D346 /* DDFileLogger.m */; }; B8D00D039135E8ABE6417C5D2E3D6C9E /* DDLogMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A12836429F3A032126C254810DCE511 /* DDLogMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; B9A3776B4EE34E4635F13989AFD109D6 /* NBUCore.h in Headers */ = {isa = PBXBuildFile; fileRef = BC994D8E8C5B4FF20BEF9BB609D0DE58 /* NBUCore.h */; settings = {ATTRIBUTES = (Public, ); }; }; B9AA5902D3ACB42707287C5F9F51326D /* Pods-ConsoleDemo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 12D9A2CB77FD363B0F00144A3117D2AD /* Pods-ConsoleDemo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -48,11 +48,11 @@ C6DDC840836592382565874D9FDC2613 /* DDLog+LOGV.h in Headers */ = {isa = PBXBuildFile; fileRef = AE085EFCA7BFDFB88212E4F79ECBF162 /* DDLog+LOGV.h */; settings = {ATTRIBUTES = (Public, ); }; }; C6F8F9FD9146C80B8913691FE1C62D7B /* DDContextFilterLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF024D5AA56B53219FEC50ADD9EFB69 /* DDContextFilterLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; CB3D8FADDDD1ED067CCF61875B719105 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F036A7D5E8370DAF0D39AF392D16BB0 /* Foundation.framework */; }; - CC870D61CBE8FD2A0D24A3A3D8CE5C62 /* CocoaLumberjack-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = CC4F7BF640383D1BC5BAA6E5A638A86D /* CocoaLumberjack-dummy.m */; }; CE0DDEB478F72FC416E2C6C52D0C2B29 /* DDDispatchQueueLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 151DD52783B033A4B2FE045673721C87 /* DDDispatchQueueLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; - D5D4A699779F1796A4F24BFE1FB94E20 /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C25BD259829C617D2DE326FB8D141F /* DDAbstractDatabaseLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; DA9B436408E2C274B67172AFA5CA8BC8 /* CocoaLumberjack.h in Headers */ = {isa = PBXBuildFile; fileRef = D76D6BF3E510E9798AF91B22BEA99D28 /* CocoaLumberjack.h */; settings = {ATTRIBUTES = (Public, ); }; }; E3C5456FB49A749739230C235355D473 /* DDTTYLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = D587379F65861F2380AF14C97CA587E3 /* DDTTYLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E9257CA098FAFCEC7B1A3AEDA6A77F0D /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 6DE95CCADF581BD3B76F6639CBAB5084 /* DDLog.m */; }; + E9B7827A5818B4E2C71CE5A5D2AD871B /* DDOSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = FC68B1B5D87A9BD4E83EFB61528AE3D3 /* DDOSLogger.m */; }; EFAB760CA15E025E53D5317C2A459895 /* PTEConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D95F7FA71B7E44DA07C3B1051A9B0AC /* PTEConsoleLogger.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; F17D3D26ADE94380EAEE45707FDED798 /* DDASLLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = D1B0B057520259B191896C2162867E4A /* DDASLLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; FC1615ACE4FF20081559149DCA6FB73A /* DDFileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 00790A158F26667BCFBFA43D3444178B /* DDFileLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -543,7 +543,7 @@ isa = PBXNativeTarget; buildConfigurationList = 60944B9C9F08107B66FEFD2C6ED77168 /* Build configuration list for PBXNativeTarget "CocoaLumberjack" */; buildPhases = ( - 374141C071FACD1CB06C808E77341DD9 /* Sources */, + B41BF88794C1814841E27967BDE71DBD /* Sources */, 5EDE21247FA8F5D955C22F5BDD28F918 /* Frameworks */, 6391C1D836729A38F7EC4D387C40B5F1 /* Headers */, ); @@ -635,29 +635,29 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 374141C071FACD1CB06C808E77341DD9 /* Sources */ = { + 8BEEE5C1FBF50FE9ABE182FBC3F974A2 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - CC870D61CBE8FD2A0D24A3A3D8CE5C62 /* CocoaLumberjack-dummy.m in Sources */, - D5D4A699779F1796A4F24BFE1FB94E20 /* DDAbstractDatabaseLogger.m in Sources */, - 34ADF6CEA813D96341D2C4ED247D0DFD /* DDASLLogCapture.m in Sources */, - 75CC69BC081384EA3033F3AB5CF97E29 /* DDASLLogger.m in Sources */, - 7163FCA57C02C890435DFA2A4F3AE4C8 /* DDContextFilterLogFormatter.m in Sources */, - 77F55DA1292F4A23365745071EF0B667 /* DDDispatchQueueLogFormatter.m in Sources */, - 381685FA8A1867BFBA1812E8D793DC93 /* DDFileLogger.m in Sources */, - 2DBA4141D7B052E43958C96F3466FA6E /* DDLog.m in Sources */, - 08284B0947FEECE865742912B045BCCF /* DDMultiFormatter.m in Sources */, - A38FD606BF174D0485A33F01074216FA /* DDOSLogger.m in Sources */, - 06270CD9D8C26C49505C5F53FF11D927 /* DDTTYLogger.m in Sources */, + FF61BA18CD4433F124062ADE3CF1F457 /* Pods-ConsoleDemo-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 8BEEE5C1FBF50FE9ABE182FBC3F974A2 /* Sources */ = { + B41BF88794C1814841E27967BDE71DBD /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - FF61BA18CD4433F124062ADE3CF1F457 /* Pods-ConsoleDemo-dummy.m in Sources */, + 5D08CF907B3ACEBE1869A215016D972A /* CocoaLumberjack-dummy.m in Sources */, + 23A412D4DEA3E4C15D7CB86ACBD9A9A9 /* DDAbstractDatabaseLogger.m in Sources */, + 5A645DFB0450C8A1E7825670AB068493 /* DDASLLogCapture.m in Sources */, + 60BFA33F6846DE0AD436DD1F5E304A40 /* DDASLLogger.m in Sources */, + 37F43599DE0FE672901C80B445073BD0 /* DDContextFilterLogFormatter.m in Sources */, + 41C4480C6D7CD4D98DB5A03F0AF240C2 /* DDDispatchQueueLogFormatter.m in Sources */, + B793B42EBC241FF88CB43CB202EB3380 /* DDFileLogger.m in Sources */, + E9257CA098FAFCEC7B1A3AEDA6A77F0D /* DDLog.m in Sources */, + 07DE79F78F09C91A42156FC0A5E3F2B7 /* DDMultiFormatter.m in Sources */, + E9B7827A5818B4E2C71CE5A5D2AD871B /* DDOSLogger.m in Sources */, + 05A3024CE5EDD58A4DC1F1FCE52088DE /* DDTTYLogger.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Demo/Pods/Target Support Files/CocoaLumberjack/Info.plist b/Demo/Pods/Target Support Files/CocoaLumberjack/Info.plist index 3ac477e..152c333 100644 --- a/Demo/Pods/Target Support Files/CocoaLumberjack/Info.plist +++ b/Demo/Pods/Target Support Files/CocoaLumberjack/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.3.0 + 3.4.2 CFBundleSignature ???? CFBundleVersion From a9ddc1722f8582c3114722c19346b4f36ed92143 Mon Sep 17 00:00:00 2001 From: HHK Date: Thu, 3 May 2018 12:04:30 +0200 Subject: [PATCH 3/4] update to recommended settings --- Demo/ConsoleDemo.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/ConsoleDemo.xcscheme | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Demo/ConsoleDemo.xcodeproj/project.pbxproj b/Demo/ConsoleDemo.xcodeproj/project.pbxproj index 3e542ea..436b65e 100644 --- a/Demo/ConsoleDemo.xcodeproj/project.pbxproj +++ b/Demo/ConsoleDemo.xcodeproj/project.pbxproj @@ -148,7 +148,7 @@ E57766CD18334DF6009F3276 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = ""; }; buildConfigurationList = E57766D018334DF6009F3276 /* Build configuration list for PBXProject "ConsoleDemo" */; @@ -285,12 +285,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -336,12 +338,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; diff --git a/Demo/ConsoleDemo.xcodeproj/xcshareddata/xcschemes/ConsoleDemo.xcscheme b/Demo/ConsoleDemo.xcodeproj/xcshareddata/xcschemes/ConsoleDemo.xcscheme index d33cf01..19a5640 100644 --- a/Demo/ConsoleDemo.xcodeproj/xcshareddata/xcschemes/ConsoleDemo.xcscheme +++ b/Demo/ConsoleDemo.xcodeproj/xcshareddata/xcschemes/ConsoleDemo.xcscheme @@ -1,6 +1,6 @@ @@ -46,7 +45,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" From 55fef1b12683a490354e3d18e354601b723b5b78 Mon Sep 17 00:00:00 2001 From: HHK Date: Thu, 3 May 2018 12:06:04 +0200 Subject: [PATCH 4/4] fix warnings on implicit retain --- Source/PTEConsoleLogger.m | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/PTEConsoleLogger.m b/Source/PTEConsoleLogger.m index 7ef408f..b1d53ad 100644 --- a/Source/PTEConsoleLogger.m +++ b/Source/PTEConsoleLogger.m @@ -102,7 +102,7 @@ - (void)logMessage:(DDLogMessage *)logMessage dispatch_async(_consoleQueue, ^ { // Add new message to buffer - [_newMessagesBuffer insertObject:logMessage + [self->_newMessagesBuffer insertObject:logMessage atIndex:0]; // Trigger update @@ -149,10 +149,10 @@ - (void)clearConsole dispatch_async(_consoleQueue, ^ { // Clear all messages - [_newMessagesBuffer removeAllObjects]; - [_messages removeAllObjects]; - [_filteredMessages removeAllObjects]; - [_expandedMessages removeAllObjects]; + [self->_newMessagesBuffer removeAllObjects]; + [self->_messages removeAllObjects]; + [self->_filteredMessages removeAllObjects]; + [self->_expandedMessages removeAllObjects]; [self updateTableViewInConsoleQueue]; }); @@ -182,7 +182,7 @@ - (void)updateOrScheduleTableViewUpdateInConsoleQueue { [self updateTableViewInConsoleQueue]; - _updateScheduled = NO; + self->_updateScheduled = NO; }); } // Update directly @@ -206,12 +206,12 @@ - (void)updateTableViewInConsoleQueue [messages removeAllObjects]; [messages addObjectsFromArray:newItems]; [messages addObjectsFromArray:tmp]; - itemsToRemoveCount = MAX(0, (NSInteger)(messages.count - _maxMessages)); + itemsToRemoveCount = MAX(0, (NSInteger)(messages.count - self->_maxMessages)); if (itemsToRemoveCount > 0) { - [messages removeObjectsInRange:NSMakeRange(_maxMessages, itemsToRemoveCount)]; + [messages removeObjectsInRange:NSMakeRange(self->_maxMessages, itemsToRemoveCount)]; } - itemsToInsertCount = MIN(newItems.count, _maxMessages); + itemsToInsertCount = MIN(newItems.count, self->_maxMessages); itemsToKeepCount = messages.count - itemsToInsertCount; }; @@ -551,13 +551,13 @@ - (void)searchBarStateChanged dispatch_async(_consoleQueue, ^ { // Filtering enabled? - _filteringEnabled = (_currentSearchText.length > 0 || // Some text input - _currentLogLevel != DDLogLevelVerbose); // Or log level != verbose + self->_filteringEnabled = (self->_currentSearchText.length > 0 || // Some text input + self->_currentLogLevel != DDLogLevelVerbose); // Or log level != verbose // Force reloading filtered messages - if (_filteringEnabled) + if (self->_filteringEnabled) { - _filteredMessages = nil; + self->_filteredMessages = nil; } // Update