Add support for Swift 5.2 and Xcode 11.4

This makes a few adjustments that are necessary for Swift 5.2 and Xcode 11.4 - especially for SPM

- Symlink workaround now produces a warning -> move headers into subfolder, change to fully qualified imports and remove symlinks
- Cleanup Header import order - errors first, then 3rd party, then ours
- Update Package.swift for Swift 5.2
- Fix gitignore to not ignore our Lumberjack.xcodeproj

.gitignore

@@ -7,6 +7,8 @@
 /*.xcodeproj
 xcuserdata/
 
+!Lumberjack.xcodeproj
+
 # Carthage
 Carthage/Build
 

Lumberjack.xcodeproj/project.pbxproj

@@ -7,9 +7,41 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0752523C22E075E1005D30B3 /* SwiftLogLevel.h in Headers */ = {isa = PBXBuildFile; fileRef = 0752523B22E075E1005D30B3 /* SwiftLogLevel.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909DD243C9FFC001C431F /* DDLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909CD243C9FF8001C431F /* DDLog.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909DE243C9FFC001C431F /* DDMultiFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909CE243C9FF8001C431F /* DDMultiFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909DF243C9FFC001C431F /* DDAbstractDatabaseLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909CF243C9FF8001C431F /* DDAbstractDatabaseLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909E0243C9FFC001C431F /* DDLoggerNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909D0243C9FF8001C431F /* DDLoggerNames.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909E1243C9FFC001C431F /* DDLogMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909D1243C9FF8001C431F /* DDLogMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909E2243C9FFC001C431F /* DDASLLogCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909D2243C9FF8001C431F /* DDASLLogCapture.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909E3243C9FFC001C431F /* DDFileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909D3243C9FF8001C431F /* DDFileLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909E4243C9FFC001C431F /* DDContextFilterLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909D4243C9FF8001C431F /* DDContextFilterLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909E5243C9FFC001C431F /* DDTTYLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909D5243C9FF8001C431F /* DDTTYLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909E6243C9FFC001C431F /* DDAssertMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909D6243C9FF8001C431F /* DDAssertMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909E7243C9FFC001C431F /* DDFileLogger+Buffering.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909D7243C9FF8001C431F /* DDFileLogger+Buffering.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909E8243C9FFC001C431F /* DDDispatchQueueLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909D8243C9FF8001C431F /* DDDispatchQueueLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909E9243C9FFC001C431F /* DDOSLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909D9243C9FF8001C431F /* DDOSLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909EA243C9FFC001C431F /* DDLog+LOGV.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909DA243C9FF8001C431F /* DDLog+LOGV.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909EB243C9FFC001C431F /* CLIColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909DB243C9FF8001C431F /* CLIColor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909EC243C9FFC001C431F /* DDASLLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909DC243C9FF8001C431F /* DDASLLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		071909ED243CA055001C431F /* CLIColor.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909DB243C9FF8001C431F /* CLIColor.h */; };
+		071909EE243CA055001C431F /* DDAbstractDatabaseLogger.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909CF243C9FF8001C431F /* DDAbstractDatabaseLogger.h */; };
+		071909EF243CA055001C431F /* DDASLLogCapture.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909D2243C9FF8001C431F /* DDASLLogCapture.h */; };
+		071909F0243CA055001C431F /* DDASLLogger.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909DC243C9FF8001C431F /* DDASLLogger.h */; };
+		071909F1243CA055001C431F /* DDAssertMacros.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909D6243C9FF8001C431F /* DDAssertMacros.h */; };
+		071909F2243CA055001C431F /* DDContextFilterLogFormatter.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909D4243C9FF8001C431F /* DDContextFilterLogFormatter.h */; };
+		071909F3243CA055001C431F /* DDDispatchQueueLogFormatter.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909D8243C9FF8001C431F /* DDDispatchQueueLogFormatter.h */; };
+		071909F4243CA055001C431F /* DDFileLogger.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909D3243C9FF8001C431F /* DDFileLogger.h */; };
+		071909F5243CA055001C431F /* DDFileLogger+Buffering.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909D7243C9FF8001C431F /* DDFileLogger+Buffering.h */; };
+		071909F6243CA055001C431F /* DDLog.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909CD243C9FF8001C431F /* DDLog.h */; };
+		071909F7243CA055001C431F /* DDLog+LOGV.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909DA243C9FF8001C431F /* DDLog+LOGV.h */; };
+		071909F8243CA055001C431F /* DDLoggerNames.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909D0243C9FF8001C431F /* DDLoggerNames.h */; };
+		071909F9243CA055001C431F /* DDLogMacros.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909D1243C9FF8001C431F /* DDLogMacros.h */; };
+		071909FA243CA055001C431F /* DDMultiFormatter.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909CE243C9FF8001C431F /* DDMultiFormatter.h */; };
+		071909FB243CA055001C431F /* DDOSLogger.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909D9243C9FF8001C431F /* DDOSLogger.h */; };
+		071909FC243CA055001C431F /* DDTTYLogger.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 071909D5243C9FF8001C431F /* DDTTYLogger.h */; };
+		071909FE243CA0DC001C431F /* SwiftLogLevel.h in Headers */ = {isa = PBXBuildFile; fileRef = 071909FD243CA0AC001C431F /* SwiftLogLevel.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0752523E22E07638005D30B3 /* DDLegacyMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0752523D22E07638005D30B3 /* DDLegacyMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0752523F22E07666005D30B3 /* DDLegacyMacros.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0752523D22E07638005D30B3 /* DDLegacyMacros.h */; };
+		0752523F22E07666005D30B3 /* DDLegacyMacros.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 0752523D22E07638005D30B3 /* DDLegacyMacros.h */; };
 		0A26B56422DE346B004EE6A7 /* CLIColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B54B22DE346B004EE6A7 /* CLIColor.m */; };
 		0A26B56522DE346B004EE6A7 /* DDContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B54D22DE346B004EE6A7 /* DDContextFilterLogFormatter.m */; };
 		0A26B56622DE346B004EE6A7 /* DDDispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B54E22DE346B004EE6A7 /* DDDispatchQueueLogFormatter.m */; };
@@ -23,39 +55,7 @@
 		0A26B57F22DE34AE004EE6A7 /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B57722DE34AE004EE6A7 /* DDLog.m */; };
 		0A26B58022DE34AE004EE6A7 /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B57822DE34AE004EE6A7 /* DDAbstractDatabaseLogger.m */; };
 		0A26B58122DE34AE004EE6A7 /* DDOSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B57922DE34AE004EE6A7 /* DDOSLogger.m */; };
-		0A26B58222DE34C1004EE6A7 /* DDLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B53822DE346B004EE6A7 /* DDLog.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58422DE34C1004EE6A7 /* DDMultiFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B53A22DE346B004EE6A7 /* DDMultiFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58522DE34C1004EE6A7 /* DDAbstractDatabaseLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B53B22DE346B004EE6A7 /* DDAbstractDatabaseLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58622DE34C1004EE6A7 /* DDLoggerNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B53C22DE346B004EE6A7 /* DDLoggerNames.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58722DE34C1004EE6A7 /* DDLogMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B53D22DE346B004EE6A7 /* DDLogMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58822DE34C1004EE6A7 /* DDASLLogCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B53E22DE346B004EE6A7 /* DDASLLogCapture.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58922DE34C1004EE6A7 /* DDFileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B53F22DE346B004EE6A7 /* DDFileLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58A22DE34C1004EE6A7 /* DDContextFilterLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B54022DE346B004EE6A7 /* DDContextFilterLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58B22DE34C1004EE6A7 /* DDTTYLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B54122DE346B004EE6A7 /* DDTTYLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58C22DE34C1004EE6A7 /* DDAssertMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B54222DE346B004EE6A7 /* DDAssertMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58D22DE34C1004EE6A7 /* DDFileLogger+Buffering.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B54322DE346B004EE6A7 /* DDFileLogger+Buffering.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58E22DE34C1004EE6A7 /* DDDispatchQueueLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B54422DE346B004EE6A7 /* DDDispatchQueueLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B58F22DE34C1004EE6A7 /* DDOSLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B54522DE346B004EE6A7 /* DDOSLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B59022DE34C1004EE6A7 /* DDLog+LOGV.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B54622DE346B004EE6A7 /* DDLog+LOGV.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B59122DE34C1004EE6A7 /* CLIColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B54722DE346B004EE6A7 /* CLIColor.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B59222DE34C1004EE6A7 /* DDASLLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B54822DE346B004EE6A7 /* DDASLLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0A26B59422DE34E9004EE6A7 /* DDLog.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B53822DE346B004EE6A7 /* DDLog.h */; };
-		0A26B59622DE34E9004EE6A7 /* DDMultiFormatter.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B53A22DE346B004EE6A7 /* DDMultiFormatter.h */; };
-		0A26B59722DE34E9004EE6A7 /* DDAbstractDatabaseLogger.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B53B22DE346B004EE6A7 /* DDAbstractDatabaseLogger.h */; };
-		0A26B59822DE34E9004EE6A7 /* DDLoggerNames.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B53C22DE346B004EE6A7 /* DDLoggerNames.h */; };
-		0A26B59922DE34E9004EE6A7 /* DDLogMacros.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B53D22DE346B004EE6A7 /* DDLogMacros.h */; };
-		0A26B59A22DE34E9004EE6A7 /* DDASLLogCapture.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B53E22DE346B004EE6A7 /* DDASLLogCapture.h */; };
-		0A26B59B22DE34E9004EE6A7 /* DDFileLogger.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B53F22DE346B004EE6A7 /* DDFileLogger.h */; };
-		0A26B59C22DE34E9004EE6A7 /* DDContextFilterLogFormatter.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B54022DE346B004EE6A7 /* DDContextFilterLogFormatter.h */; };
-		0A26B59D22DE34E9004EE6A7 /* DDTTYLogger.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B54122DE346B004EE6A7 /* DDTTYLogger.h */; };
-		0A26B59E22DE34E9004EE6A7 /* DDAssertMacros.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B54222DE346B004EE6A7 /* DDAssertMacros.h */; };
-		0A26B59F22DE34E9004EE6A7 /* DDFileLogger+Buffering.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B54322DE346B004EE6A7 /* DDFileLogger+Buffering.h */; };
-		0A26B5A022DE34E9004EE6A7 /* DDDispatchQueueLogFormatter.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B54422DE346B004EE6A7 /* DDDispatchQueueLogFormatter.h */; };
-		0A26B5A122DE34E9004EE6A7 /* DDOSLogger.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B54522DE346B004EE6A7 /* DDOSLogger.h */; };
-		0A26B5A222DE34E9004EE6A7 /* DDLog+LOGV.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B54622DE346B004EE6A7 /* DDLog+LOGV.h */; };
-		0A26B5A322DE34E9004EE6A7 /* CLIColor.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B54722DE346B004EE6A7 /* CLIColor.h */; };
-		0A26B5A422DE34E9004EE6A7 /* DDASLLogger.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B54822DE346B004EE6A7 /* DDASLLogger.h */; };
-		0A26B5A522DE3503004EE6A7 /* CocoaLumberjack.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B55422DE346B004EE6A7 /* CocoaLumberjack.h */; };
+		0A26B5A522DE3503004EE6A7 /* CocoaLumberjack.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 0A26B55422DE346B004EE6A7 /* CocoaLumberjack.h */; };
 		0A26B5A622DE3512004EE6A7 /* DDAssert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B55A22DE346B004EE6A7 /* DDAssert.swift */; };
 		0A26B5A722DE3516004EE6A7 /* CocoaLumberjack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B55D22DE346B004EE6A7 /* CocoaLumberjack.swift */; };
 		0A26B5A822DE3519004EE6A7 /* CocoaLumberjackSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B56022DE346B004EE6A7 /* CocoaLumberjackSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -68,7 +68,7 @@
 		0A26B5B822DE3700004EE6A7 /* DDLoggerNames.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B57322DE34AE004EE6A7 /* DDLoggerNames.m */; };
 		0A26B5B922DE3700004EE6A7 /* DDOSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B57922DE34AE004EE6A7 /* DDOSLogger.m */; };
 		0A26B5BA22DE3700004EE6A7 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B57522DE34AE004EE6A7 /* DDTTYLogger.m */; };
-		0A26B5BB22DE37AA004EE6A7 /* DDFileLogger+Internal.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0A26B57222DE34AE004EE6A7 /* DDFileLogger+Internal.h */; };
+		0A26B5BB22DE37AA004EE6A7 /* DDFileLogger+Internal.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 0A26B57222DE34AE004EE6A7 /* DDFileLogger+Internal.h */; };
 		0A26B5BC22DE37FB004EE6A7 /* CocoaLumberjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A26B55422DE346B004EE6A7 /* CocoaLumberjack.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0A26B5C622E0812F004EE6A7 /* DDContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B54D22DE346B004EE6A7 /* DDContextFilterLogFormatter.m */; };
 		0A26B5C722E0812F004EE6A7 /* DDDispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A26B54E22DE346B004EE6A7 /* DDDispatchQueueLogFormatter.m */; };
@@ -89,55 +89,56 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		18F3BFD51A81E06E00692297 /* CopyFiles */ = {
+		18F3BFD51A81E06E00692297 /* Copy Files */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "include/$(PRODUCT_NAME)";
 			dstSubfolderSpec = 16;
 			files = (
-				0A26B5BB22DE37AA004EE6A7 /* DDFileLogger+Internal.h in CopyFiles */,
-				0A26B5A522DE3503004EE6A7 /* CocoaLumberjack.h in CopyFiles */,
-				0A26B59422DE34E9004EE6A7 /* DDLog.h in CopyFiles */,
-				0A26B59622DE34E9004EE6A7 /* DDMultiFormatter.h in CopyFiles */,
-				0A26B59722DE34E9004EE6A7 /* DDAbstractDatabaseLogger.h in CopyFiles */,
-				0A26B59822DE34E9004EE6A7 /* DDLoggerNames.h in CopyFiles */,
-				0A26B59922DE34E9004EE6A7 /* DDLogMacros.h in CopyFiles */,
-				0A26B59A22DE34E9004EE6A7 /* DDASLLogCapture.h in CopyFiles */,
-				0A26B59B22DE34E9004EE6A7 /* DDFileLogger.h in CopyFiles */,
-				0A26B59C22DE34E9004EE6A7 /* DDContextFilterLogFormatter.h in CopyFiles */,
-				0A26B59D22DE34E9004EE6A7 /* DDTTYLogger.h in CopyFiles */,
-				0A26B59E22DE34E9004EE6A7 /* DDAssertMacros.h in CopyFiles */,
-				0A26B59F22DE34E9004EE6A7 /* DDFileLogger+Buffering.h in CopyFiles */,
-				0A26B5A022DE34E9004EE6A7 /* DDDispatchQueueLogFormatter.h in CopyFiles */,
-				0A26B5A122DE34E9004EE6A7 /* DDOSLogger.h in CopyFiles */,
-				0A26B5A222DE34E9004EE6A7 /* DDLog+LOGV.h in CopyFiles */,
-				0A26B5A322DE34E9004EE6A7 /* CLIColor.h in CopyFiles */,
-				0A26B5A422DE34E9004EE6A7 /* DDASLLogger.h in CopyFiles */,
-				0752523F22E07666005D30B3 /* DDLegacyMacros.h in CopyFiles */,
-			);
+				071909ED243CA055001C431F /* CLIColor.h in Copy Files */,
+				071909EE243CA055001C431F /* DDAbstractDatabaseLogger.h in Copy Files */,
+				071909EF243CA055001C431F /* DDASLLogCapture.h in Copy Files */,
+				071909F0243CA055001C431F /* DDASLLogger.h in Copy Files */,
+				071909F1243CA055001C431F /* DDAssertMacros.h in Copy Files */,
+				071909F2243CA055001C431F /* DDContextFilterLogFormatter.h in Copy Files */,
+				071909F3243CA055001C431F /* DDDispatchQueueLogFormatter.h in Copy Files */,
+				071909F4243CA055001C431F /* DDFileLogger.h in Copy Files */,
+				071909F5243CA055001C431F /* DDFileLogger+Buffering.h in Copy Files */,
+				071909F6243CA055001C431F /* DDLog.h in Copy Files */,
+				071909F7243CA055001C431F /* DDLog+LOGV.h in Copy Files */,
+				071909F8243CA055001C431F /* DDLoggerNames.h in Copy Files */,
+				071909F9243CA055001C431F /* DDLogMacros.h in Copy Files */,
+				071909FA243CA055001C431F /* DDMultiFormatter.h in Copy Files */,
+				071909FB243CA055001C431F /* DDOSLogger.h in Copy Files */,
+				071909FC243CA055001C431F /* DDTTYLogger.h in Copy Files */,
+				0A26B5BB22DE37AA004EE6A7 /* DDFileLogger+Internal.h in Copy Files */,
+				0A26B5A522DE3503004EE6A7 /* CocoaLumberjack.h in Copy Files */,
+				0752523F22E07666005D30B3 /* DDLegacyMacros.h in Copy Files */,
+			);
+			name = "Copy Files";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0752523B22E075E1005D30B3 /* SwiftLogLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwiftLogLevel.h; path = Sources/CocoaLumberjackSwiftSupport/include/SwiftLogLevel.h; sourceTree = SOURCE_ROOT; };
+		071909CD243C9FF8001C431F /* DDLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDLog.h; sourceTree = "<group>"; };
+		071909CE243C9FF8001C431F /* DDMultiFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDMultiFormatter.h; sourceTree = "<group>"; };
+		071909CF243C9FF8001C431F /* DDAbstractDatabaseLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDAbstractDatabaseLogger.h; sourceTree = "<group>"; };
+		071909D0243C9FF8001C431F /* DDLoggerNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDLoggerNames.h; sourceTree = "<group>"; };
+		071909D1243C9FF8001C431F /* DDLogMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDLogMacros.h; sourceTree = "<group>"; };
+		071909D2243C9FF8001C431F /* DDASLLogCapture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDASLLogCapture.h; sourceTree = "<group>"; };
+		071909D3243C9FF8001C431F /* DDFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDFileLogger.h; sourceTree = "<group>"; };
+		071909D4243C9FF8001C431F /* DDContextFilterLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDContextFilterLogFormatter.h; sourceTree = "<group>"; };
+		071909D5243C9FF8001C431F /* DDTTYLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDTTYLogger.h; sourceTree = "<group>"; };
+		071909D6243C9FF8001C431F /* DDAssertMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDAssertMacros.h; sourceTree = "<group>"; };
+		071909D7243C9FF8001C431F /* DDFileLogger+Buffering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDFileLogger+Buffering.h"; sourceTree = "<group>"; };
+		071909D8243C9FF8001C431F /* DDDispatchQueueLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDDispatchQueueLogFormatter.h; sourceTree = "<group>"; };
+		071909D9243C9FF8001C431F /* DDOSLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDOSLogger.h; sourceTree = "<group>"; };
+		071909DA243C9FF8001C431F /* DDLog+LOGV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDLog+LOGV.h"; sourceTree = "<group>"; };
+		071909DB243C9FF8001C431F /* CLIColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLIColor.h; sourceTree = "<group>"; };
+		071909DC243C9FF8001C431F /* DDASLLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDASLLogger.h; sourceTree = "<group>"; };
+		071909FD243CA0AC001C431F /* SwiftLogLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwiftLogLevel.h; path = Sources/CocoaLumberjackSwiftSupport/include/CocoaLumberjackSwiftSupport/SwiftLogLevel.h; sourceTree = SOURCE_ROOT; };
 		0752523D22E07638005D30B3 /* DDLegacyMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDLegacyMacros.h; sourceTree = "<group>"; };
-		0A26B53822DE346B004EE6A7 /* DDLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDLog.h; sourceTree = "<group>"; };
-		0A26B53A22DE346B004EE6A7 /* DDMultiFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDMultiFormatter.h; sourceTree = "<group>"; };
-		0A26B53B22DE346B004EE6A7 /* DDAbstractDatabaseLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDAbstractDatabaseLogger.h; sourceTree = "<group>"; };
-		0A26B53C22DE346B004EE6A7 /* DDLoggerNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDLoggerNames.h; sourceTree = "<group>"; };
-		0A26B53D22DE346B004EE6A7 /* DDLogMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDLogMacros.h; sourceTree = "<group>"; };
-		0A26B53E22DE346B004EE6A7 /* DDASLLogCapture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDASLLogCapture.h; sourceTree = "<group>"; };
-		0A26B53F22DE346B004EE6A7 /* DDFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDFileLogger.h; sourceTree = "<group>"; };
-		0A26B54022DE346B004EE6A7 /* DDContextFilterLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDContextFilterLogFormatter.h; sourceTree = "<group>"; };
-		0A26B54122DE346B004EE6A7 /* DDTTYLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDTTYLogger.h; sourceTree = "<group>"; };
-		0A26B54222DE346B004EE6A7 /* DDAssertMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDAssertMacros.h; sourceTree = "<group>"; };
-		0A26B54322DE346B004EE6A7 /* DDFileLogger+Buffering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDFileLogger+Buffering.h"; sourceTree = "<group>"; };
-		0A26B54422DE346B004EE6A7 /* DDDispatchQueueLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDDispatchQueueLogFormatter.h; sourceTree = "<group>"; };
-		0A26B54522DE346B004EE6A7 /* DDOSLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDOSLogger.h; sourceTree = "<group>"; };
-		0A26B54622DE346B004EE6A7 /* DDLog+LOGV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDLog+LOGV.h"; sourceTree = "<group>"; };
-		0A26B54722DE346B004EE6A7 /* CLIColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLIColor.h; sourceTree = "<group>"; };
-		0A26B54822DE346B004EE6A7 /* DDASLLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDASLLogger.h; sourceTree = "<group>"; };
 		0A26B54B22DE346B004EE6A7 /* CLIColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CLIColor.m; sourceTree = "<group>"; };
 		0A26B54D22DE346B004EE6A7 /* DDContextFilterLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDContextFilterLogFormatter.m; sourceTree = "<group>"; };
 		0A26B54E22DE346B004EE6A7 /* DDDispatchQueueLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDDispatchQueueLogFormatter.m; sourceTree = "<group>"; };
@@ -194,6 +195,29 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		071909CC243C9FF8001C431F /* CocoaLumberjack */ = {
+			isa = PBXGroup;
+			children = (
+				071909DB243C9FF8001C431F /* CLIColor.h */,
+				071909CF243C9FF8001C431F /* DDAbstractDatabaseLogger.h */,
+				071909D2243C9FF8001C431F /* DDASLLogCapture.h */,
+				071909DC243C9FF8001C431F /* DDASLLogger.h */,
+				071909D6243C9FF8001C431F /* DDAssertMacros.h */,
+				071909D4243C9FF8001C431F /* DDContextFilterLogFormatter.h */,
+				071909D8243C9FF8001C431F /* DDDispatchQueueLogFormatter.h */,
+				071909D3243C9FF8001C431F /* DDFileLogger.h */,
+				071909D7243C9FF8001C431F /* DDFileLogger+Buffering.h */,
+				071909CD243C9FF8001C431F /* DDLog.h */,
+				071909DA243C9FF8001C431F /* DDLog+LOGV.h */,
+				071909D0243C9FF8001C431F /* DDLoggerNames.h */,
+				071909D1243C9FF8001C431F /* DDLogMacros.h */,
+				071909CE243C9FF8001C431F /* DDMultiFormatter.h */,
+				071909D9243C9FF8001C431F /* DDOSLogger.h */,
+				071909D5243C9FF8001C431F /* DDTTYLogger.h */,
+			);
+			path = CocoaLumberjack;
+			sourceTree = "<group>";
+		};
 		0A26B53222DE346B004EE6A7 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
@@ -226,22 +250,7 @@
 		0A26B53622DE346B004EE6A7 /* include */ = {
 			isa = PBXGroup;
 			children = (
-				0A26B54722DE346B004EE6A7 /* CLIColor.h */,
-				0A26B53B22DE346B004EE6A7 /* DDAbstractDatabaseLogger.h */,
-				0A26B53E22DE346B004EE6A7 /* DDASLLogCapture.h */,
-				0A26B54822DE346B004EE6A7 /* DDASLLogger.h */,
-				0A26B54222DE346B004EE6A7 /* DDAssertMacros.h */,
-				0A26B54022DE346B004EE6A7 /* DDContextFilterLogFormatter.h */,
-				0A26B54422DE346B004EE6A7 /* DDDispatchQueueLogFormatter.h */,
-				0A26B53F22DE346B004EE6A7 /* DDFileLogger.h */,
-				0A26B54322DE346B004EE6A7 /* DDFileLogger+Buffering.h */,
-				0A26B53822DE346B004EE6A7 /* DDLog.h */,
-				0A26B54622DE346B004EE6A7 /* DDLog+LOGV.h */,
-				0A26B53C22DE346B004EE6A7 /* DDLoggerNames.h */,
-				0A26B53D22DE346B004EE6A7 /* DDLogMacros.h */,
-				0A26B53A22DE346B004EE6A7 /* DDMultiFormatter.h */,
-				0A26B54522DE346B004EE6A7 /* DDOSLogger.h */,
-				0A26B54122DE346B004EE6A7 /* DDTTYLogger.h */,
+				071909CC243C9FF8001C431F /* CocoaLumberjack */,
 			);
 			path = include;
 			sourceTree = "<group>";
@@ -290,7 +299,7 @@
 			children = (
 				0A26B55F22DE346B004EE6A7 /* CocoaLumberjackSwift-Info.plist */,
 				0A26B56022DE346B004EE6A7 /* CocoaLumberjackSwift.h */,
-				0752523B22E075E1005D30B3 /* SwiftLogLevel.h */,
+				071909FD243CA0AC001C431F /* SwiftLogLevel.h */,
 			);
 			path = "Supporting Files";
 			sourceTree = "<group>";
@@ -359,25 +368,25 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0A26B58A22DE34C1004EE6A7 /* DDContextFilterLogFormatter.h in Headers */,
-				0A26B58522DE34C1004EE6A7 /* DDAbstractDatabaseLogger.h in Headers */,
-				0A26B58222DE34C1004EE6A7 /* DDLog.h in Headers */,
-				0A26B58422DE34C1004EE6A7 /* DDMultiFormatter.h in Headers */,
-				0A26B58E22DE34C1004EE6A7 /* DDDispatchQueueLogFormatter.h in Headers */,
-				0A26B58922DE34C1004EE6A7 /* DDFileLogger.h in Headers */,
-				0A26B59122DE34C1004EE6A7 /* CLIColor.h in Headers */,
-				0A26B58B22DE34C1004EE6A7 /* DDTTYLogger.h in Headers */,
+				071909E5243C9FFC001C431F /* DDTTYLogger.h in Headers */,
+				071909E2243C9FFC001C431F /* DDASLLogCapture.h in Headers */,
+				071909E8243C9FFC001C431F /* DDDispatchQueueLogFormatter.h in Headers */,
+				071909EC243C9FFC001C431F /* DDASLLogger.h in Headers */,
+				071909E4243C9FFC001C431F /* DDContextFilterLogFormatter.h in Headers */,
+				071909DE243C9FFC001C431F /* DDMultiFormatter.h in Headers */,
+				071909DF243C9FFC001C431F /* DDAbstractDatabaseLogger.h in Headers */,
+				071909E1243C9FFC001C431F /* DDLogMacros.h in Headers */,
+				071909E3243C9FFC001C431F /* DDFileLogger.h in Headers */,
+				071909E7243C9FFC001C431F /* DDFileLogger+Buffering.h in Headers */,
+				071909E0243C9FFC001C431F /* DDLoggerNames.h in Headers */,
 				0A26B5B622DE3700004EE6A7 /* DDFileLogger+Internal.h in Headers */,
+				071909EA243C9FFC001C431F /* DDLog+LOGV.h in Headers */,
 				0752523E22E07638005D30B3 /* DDLegacyMacros.h in Headers */,
-				0A26B59022DE34C1004EE6A7 /* DDLog+LOGV.h in Headers */,
-				0A26B58F22DE34C1004EE6A7 /* DDOSLogger.h in Headers */,
+				071909EB243C9FFC001C431F /* CLIColor.h in Headers */,
+				071909E9243C9FFC001C431F /* DDOSLogger.h in Headers */,
 				0A26B5BC22DE37FB004EE6A7 /* CocoaLumberjack.h in Headers */,
-				0A26B58C22DE34C1004EE6A7 /* DDAssertMacros.h in Headers */,
-				0A26B58722DE34C1004EE6A7 /* DDLogMacros.h in Headers */,
-				0A26B58D22DE34C1004EE6A7 /* DDFileLogger+Buffering.h in Headers */,
-				0A26B58822DE34C1004EE6A7 /* DDASLLogCapture.h in Headers */,
-				0A26B58622DE34C1004EE6A7 /* DDLoggerNames.h in Headers */,
-				0A26B59222DE34C1004EE6A7 /* DDASLLogger.h in Headers */,
+				071909E6243C9FFC001C431F /* DDAssertMacros.h in Headers */,
+				071909DD243C9FFC001C431F /* DDLog.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -385,7 +394,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0752523C22E075E1005D30B3 /* SwiftLogLevel.h in Headers */,
+				071909FE243CA0DC001C431F /* SwiftLogLevel.h in Headers */,
 				0A26B5A822DE3519004EE6A7 /* CocoaLumberjackSwift.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -399,7 +408,7 @@
 			buildPhases = (
 				18F3BFD31A81E06E00692297 /* Sources */,
 				18F3BFD41A81E06E00692297 /* Frameworks */,
-				18F3BFD51A81E06E00692297 /* CopyFiles */,
+				18F3BFD51A81E06E00692297 /* Copy Files */,
 			);
 			buildRules = (
 			);

Lumberjack.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

Lumberjack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Lumberjack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -9,7 +9,7 @@ let package = Package(
         .iOS(.v8),
         .macOS(.v10_10),
         .watchOS(.v3),
-        .tvOS(.v9)
+        .tvOS(.v9),
     ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
@@ -31,6 +31,6 @@ let package = Package(
                 dependencies: ["CocoaLumberjack", "CocoaLumberjackSwiftSupport"],
                 exclude: ["Supporting Files"]),
         .testTarget(name: "CocoaLumberjackTests",
-                    dependencies: ["CocoaLumberjack"])
+                    dependencies: ["CocoaLumberjack"]),
     ]
 )

Package@swift-5.1.swift

@@ -0,0 +1,36 @@
+// swift-tools-version:5.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "CocoaLumberjack",
+    platforms: [
+        .iOS(.v8),
+        .macOS(.v10_10),
+        .watchOS(.v3),
+        .tvOS(.v9)
+    ],
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "CocoaLumberjack",
+            targets: ["CocoaLumberjack"]),
+        .library(
+            name: "CocoaLumberjackSwift",
+            targets: ["CocoaLumberjackSwift"]),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(name: "CocoaLumberjack",
+                exclude: ["Supporting Files"]),
+        .target(name: "CocoaLumberjackSwiftSupport",
+                dependencies: ["CocoaLumberjack"]),
+        .target(name: "CocoaLumberjackSwift",
+                dependencies: ["CocoaLumberjack", "CocoaLumberjackSwiftSupport"],
+                exclude: ["Supporting Files"]),
+        .testTarget(name: "CocoaLumberjackTests",
+                    dependencies: ["CocoaLumberjack"])
+    ]
+)

Sources/CocoaLumberjack/CLI/CLIColor.m

@@ -15,7 +15,7 @@
 
 #if TARGET_OS_OSX
 
-#import "CLIColor.h"
+#import <CocoaLumberjack/CLIColor.h>
 
 @interface CLIColor () {
     CGFloat _red, _green, _blue, _alpha;

Sources/CocoaLumberjack/DDASLLogCapture.m

@@ -13,13 +13,6 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#import <CocoaLumberjack/DDASLLogCapture.h>
-
-// Disable legacy macros
-#ifndef DD_LEGACY_MACROS
-    #define DD_LEGACY_MACROS 0
-#endif
-
 #if !TARGET_OS_WATCH
 
 #include <asl.h>
@@ -27,6 +20,13 @@
 #include <notify_keys.h>
 #include <sys/time.h>
 
+#import <CocoaLumberjack/DDASLLogCapture.h>
+
+// Disable legacy macros
+#ifndef DD_LEGACY_MACROS
+    #define DD_LEGACY_MACROS 0
+#endif
+
 static BOOL _cancel = YES;
 static DDLogLevel _captureLevel = DDLogLevelVerbose;
 
@@ -112,16 +112,16 @@ static DDLogLevel _captureLevel = DDLogLevelVerbose;
 
     NSDate *timeStamp = [NSDate dateWithTimeIntervalSince1970:totalSeconds];
 
-    DDLogMessage *logMessage = [[DDLogMessage alloc]initWithMessage:message
-                                                              level:_captureLevel
-                                                               flag:flag
-                                                            context:0
-                                                               file:@"DDASLLogCapture"
-                                                           function:nil
-                                                               line:0
-                                                                tag:nil
-                                                            options:0
-                                                          timestamp:timeStamp];
+    DDLogMessage *logMessage = [[DDLogMessage alloc] initWithMessage:message
+                                                               level:_captureLevel
+                                                                flag:flag
+                                                             context:0
+                                                                file:@"DDASLLogCapture"
+                                                            function:nil
+                                                                line:0
+                                                                 tag:nil
+                                                             options:0
+                                                           timestamp:timeStamp];
     
     [DDLog log:async message:logMessage];
 }

Sources/CocoaLumberjack/DDASLLogger.m

@@ -13,17 +13,17 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#import <CocoaLumberjack/DDASLLogger.h>
-
 #if !TARGET_OS_WATCH
-#import <asl.h>
 
 #if !__has_feature(objc_arc)
 #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
 #endif
 
-const char* const kDDASLKeyDDLog = "DDLog";
+#import <asl.h>
+
+#import <CocoaLumberjack/DDASLLogger.h>
 
+const char* const kDDASLKeyDDLog = "DDLog";
 const char* const kDDASLDDLogValue = "1";
 
 static DDASLLogger *sharedInstance;

Sources/CocoaLumberjack/DDAbstractDatabaseLogger.m

@@ -13,13 +13,12 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#import <CocoaLumberjack/DDAbstractDatabaseLogger.h>
-
-
 #if !__has_feature(objc_arc)
 #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
 #endif
 
+#import <CocoaLumberjack/DDAbstractDatabaseLogger.h>
+
 @interface DDAbstractDatabaseLogger ()
 
 - (void)destroySaveTimer;

Sources/CocoaLumberjack/DDFileLogger.m

@@ -13,16 +13,14 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#import <CocoaLumberjack/DDFileLogger.h>
-
-#import "DDFileLogger+Internal.h"
-
-#import <sys/xattr.h>
-
 #if !__has_feature(objc_arc)
 #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
 #endif
 
+#import <sys/xattr.h>
+
+#import "DDFileLogger+Internal.h"
+
 // We probably shouldn't be using DDLog() statements within the DDLog implementation.
 // But we still want to leave our log statements for any future debugging,
 // and to allow other developers to trace the implementation (which is a great learning tool).
@@ -74,7 +72,6 @@ NSTimeInterval     const kDDRollingLeeway              = 1.0;              // 1s
 @synthesize logFilesDiskQuota = _logFilesDiskQuota;
 
 + (BOOL)automaticallyNotifiesObserversForKey:(NSString *)theKey {
-
     if ([theKey isEqualToString:@"maximumNumberOfLogFiles"] || [theKey isEqualToString:@"logFilesDiskQuota"]) {
         return NO;
     } else {

Sources/CocoaLumberjack/DDLog.m

@@ -13,13 +13,10 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-// Disable legacy macros
-#ifndef DD_LEGACY_MACROS
-    #define DD_LEGACY_MACROS 0
+#if !__has_feature(objc_arc)
+#error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
 #endif
 
-#import <CocoaLumberjack/DDLog.h>
-
 #import <pthread.h>
 #import <objc/runtime.h>
 #import <sys/qos.h>
@@ -31,11 +28,13 @@
     #import <AppKit/NSApplication.h>
 #endif
 
-
-#if !__has_feature(objc_arc)
-#error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
+// Disable legacy macros
+#ifndef DD_LEGACY_MACROS
+    #define DD_LEGACY_MACROS 0
 #endif
 
+#import <CocoaLumberjack/DDLog.h>
+
 // We probably shouldn't be using DDLog() statements within the DDLog implementation.
 // But we still want to leave our log statements for any future debugging,
 // and to allow other developers to trace the implementation (which is a great learning tool).

Sources/CocoaLumberjack/DDOSLogger.m

@@ -13,10 +13,10 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#import <CocoaLumberjack/DDOSLogger.h>
-
 #import <os/log.h>
 
+#import <CocoaLumberjack/DDOSLogger.h>
+
 @interface DDOSLogger () {
     NSString *_subsystem;
     NSString *_category;

Sources/CocoaLumberjack/DDTTYLogger.m

@@ -13,14 +13,14 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#import <CocoaLumberjack/DDTTYLogger.h>
-
-#import <sys/uio.h>
-
 #if !__has_feature(objc_arc)
 #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
 #endif
 
+#import <sys/uio.h>
+
+#import <CocoaLumberjack/DDTTYLogger.h>
+
 // We probably shouldn't be using DDLog() statements within the DDLog implementation.
 // But we still want to leave our log statements for any future debugging,
 // and to allow other developers to trace the implementation (which is a great learning tool).

Sources/CocoaLumberjack/Extensions/DDContextFilterLogFormatter.m

@@ -13,13 +13,14 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#import <CocoaLumberjack/DDContextFilterLogFormatter.h>
-#import <pthread/pthread.h>
-
 #if !__has_feature(objc_arc)
 #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
 #endif
 
+#import <pthread/pthread.h>
+
+#import <CocoaLumberjack/DDContextFilterLogFormatter.h>
+
 @interface DDLoggingContextSet : NSObject
 
 @property (readonly, copy, nonnull) NSArray *currentSet;
@@ -38,7 +39,6 @@
 @interface DDContextWhitelistFilterLogFormatter () {
     DDLoggingContextSet *_contextSet;
 }
-
 @end
 
 

Sources/CocoaLumberjack/Extensions/DDDispatchQueueLogFormatter.m

@@ -13,14 +13,15 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#import <CocoaLumberjack/DDDispatchQueueLogFormatter.h>
+#if !__has_feature(objc_arc)
+#error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
+#endif
+
 #import <pthread/pthread.h>
 #import <stdatomic.h>
 #import <sys/qos.h>
 
-#if !__has_feature(objc_arc)
-#error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
-#endif
+#import <CocoaLumberjack/DDDispatchQueueLogFormatter.h>
 
 DDQualityOfServiceName const DDQualityOfServiceUserInteractive = @"UI";
 DDQualityOfServiceName const DDQualityOfServiceUserInitiated   = @"IN";
@@ -51,7 +52,6 @@ static DDQualityOfServiceName _qos_name(NSUInteger qos) {
     NSUInteger _maxQueueLength;           // _prefix == Only access via atomic property
     NSMutableDictionary *_replacements;   // _prefix == Only access from within spinlock
 }
-
 @end
 
 

Sources/CocoaLumberjack/Extensions/DDFileLogger+Buffering.m

@@ -13,11 +13,11 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#import "../DDFileLogger+Internal.h"
-#import <CocoaLumberjack/DDFileLogger+Buffering.h>
-
 #import <sys/mount.h>
 
+#import <CocoaLumberjack/DDFileLogger+Buffering.h>
+#import "../DDFileLogger+Internal.h"
+
 static const NSUInteger kDDDefaultBufferSize = 4096; // 4 kB, block f_bsize on iphone7
 static const NSUInteger kDDMaxBufferSize = 1048576; // ~1 mB, f_iosize on iphone7
 

Sources/CocoaLumberjack/Extensions/DDMultiFormatter.m

@@ -13,12 +13,11 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#import <CocoaLumberjack/DDMultiFormatter.h>
-
 #if !__has_feature(objc_arc)
 #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
 #endif
 
+#import <CocoaLumberjack/DDMultiFormatter.h>
 
 @interface DDMultiFormatter () {
     dispatch_queue_t _queue;

Sources/CocoaLumberjack/include/CocoaLumberjack

@@ -1 +0,0 @@
-.

Sources/CocoaLumberjackSwift/CocoaLumberjack.swift

@@ -13,8 +13,8 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-#if SWIFT_PACKAGE
 @_exported import CocoaLumberjack
+#if SWIFT_PACKAGE
 import CocoaLumberjackSwiftSupport
 #endif
 

Sources/CocoaLumberjackSwift/Supporting Files/CocoaLumberjackSwift.h

@@ -16,6 +16,5 @@
 // This header is mostly blank because all of the declarations are in Swift.
 // Still, this header may still be needed so Swift doesn't complain when importing CocoaLumberjackSwift.
 
-@import CocoaLumberjack;
-
+#import <CocoaLumberjack/CocoaLumberjack.h>
 #import <CocoaLumberjackSwift/SwiftLogLevel.h>

Sources/CocoaLumberjackSwiftSupport/empty.c

@@ -0,0 +1 @@
+/* This file is intentionally left blank */

Sources/CocoaLumberjackSwiftSupport/include/CocoaLumberjackSwiftSupport

@@ -1 +0,0 @@
-.