Update version 2.22.9

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.22.9] - 2019-02-14
+- See https://github.com/nextcloud/ios/milestone/44
+
 ## [2.22.8] - 2019-01-17
 - See https://github.com/nextcloud/ios/milestone/43
 

Cartfile.resolved

@@ -1,5 +1,5 @@
 github "ChangbaDevs/KTVHTTPCache" "1.1.7"
-github "CocoaLumberjack/CocoaLumberjack" "3.4.2"
+github "CocoaLumberjack/CocoaLumberjack" "3.5.1"
 github "MortimerGoro/MGSwipeTableCell" "1.6.8"
 github "SVGKit/SVGKit" "bfe62f6d45f55c9fe39619d9e91fed1844c59da6"
 github "WeTransfer/WeScan" "v0.9.1"
@@ -13,4 +13,4 @@ github "kishikawakatsumi/UICKeyChainStore" "v2.1.2"
 github "malcommac/SwiftRichString" "2.1.0"
 github "realm/realm-cocoa" "v3.13.1"
 github "sgr-ksmt/PDFGenerator" "2.1.1"
-github "tilltue/TLPhotoPicker" "1.8.0"
+github "tilltue/TLPhotoPicker" "1.8.3"

Carthage/Checkouts/CocoaLumberjack/.swift-version

@@ -1 +0,0 @@
-4.0

Carthage/Checkouts/CocoaLumberjack/.travis.yml

@@ -1,6 +1,10 @@
 
 language: objective-c
-osx_image: xcode9.3
+osx_image: xcode10
+
+branches:
+    only:
+        - master
 
 env:
   global:
@@ -14,8 +18,6 @@ before_install:
     - gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
     - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
     - pod --version
-    - pod setup --silent > /dev/null
-    - pod repo update --silent
     - xcpretty --version
     - xcodebuild -version
     - xcodebuild -showsdks
@@ -23,113 +25,65 @@ before_install:
 script:
     - set -o pipefail
 
-    - echo Check if the library described by the podspec can be built
-    - pod lib lint --swift-version=4.0
-
-    - echo Build as static library
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack-iOS-Static' -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Release | xcpretty -c
-
-    - echo Build test app using the static library
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'iOSLibStaticTest' -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Release | xcpretty -c
+    - echo "Check if the library described by the podspec can be built"
+    - pod lib lint
 
+    - echo "Build as static library"
+    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack-Static' -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Release | xcpretty -c
+    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack-Static' -sdk macosx -configuration Release | xcpretty -c
 
     - echo "Build as dynamic framework (ObjectiveC), each platform (iOS, macOS, tvOS, watchOS)"
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack-iOS' -configuration Release -sdk iphonesimulator | xcpretty -c
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack-macOS' -configuration Release -sdk macosx | xcpretty -c
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack-tvOS' -destination 'platform=tvOS Simulator,name=Apple TV 4K' -configuration Release -sdk appletvsimulator | xcpretty -c
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack-watchOS' -configuration Release -sdk watchsimulator | xcpretty -c
-
+    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack' -configuration Release -sdk iphonesimulator | xcpretty -c
+    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack' -configuration Release -sdk macosx | xcpretty -c
+    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack' -destination 'platform=tvOS Simulator,name=Apple TV 4K' -configuration Release -sdk appletvsimulator | xcpretty -c
+    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjack' -configuration Release -sdk watchsimulator | xcpretty -c
 
     - echo "Build as dynamic framework (Swift), each platform (iOS, macOS, tvOS, watchOS)"
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjackSwift-iOS' -configuration Release -sdk iphonesimulator | xcpretty -c
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjackSwift-macOS' -configuration Release -sdk macosx | xcpretty -c
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjackSwift-tvOS' -destination 'platform=tvOS Simulator,name=Apple TV 4K' -configuration Release -sdk appletvsimulator | xcpretty -c
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjackSwift-watchOS' -configuration Release -sdk watchsimulator | xcpretty -c
+    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjackSwift' -configuration Release -sdk iphonesimulator | xcpretty -c
+    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjackSwift' -configuration Release -sdk macosx | xcpretty -c
+    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjackSwift' -destination 'platform=tvOS Simulator,name=Apple TV 4K' -configuration Release -sdk appletvsimulator | xcpretty -c
+    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'CocoaLumberjackSwift' -configuration Release -sdk watchsimulator | xcpretty -c
 
+    - echo "Build test app using the static library"
+    - xcodebuild clean build -project Integration/Integration.xcodeproj -scheme 'iOSStaticLibraryIntegration' -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Release | xcpretty -c
 
     - echo "Build test apps using the dynamic framework, each platform (iOS, macOS, tvOS, watchOS)"
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'SwiftTest' -configuration Release -sdk macosx | xcpretty -c
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'FmwkTest' -configuration Release -sdk macosx | xcpretty -c
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'tvOSSwiftTest' -destination 'platform=tvOS Simulator,name=Apple TV 4K' -configuration Release -sdk appletvsimulator | xcpretty -c
-    - xcodebuild clean build -workspace Framework/Lumberjack.xcworkspace -scheme 'watchOSSwiftTest' -configuration Release -sdk watchsimulator | xcpretty -c
-    
-
-    - echo Run the tests
-    - pod install --project-directory=Tests
-    - xcodebuild test -workspace Framework/Lumberjack.xcworkspace -scheme 'iOS Tests' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7,OS=latest' GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
-    - xcodebuild test -workspace Framework/Lumberjack.xcworkspace -scheme 'OS X Tests' -sdk macosx GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
-
-
-    - echo Building the Demos
-    - cd Demos
-    - pod install --project-directory=ContextFilter
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'ContextFilter' | xcpretty -c
-
-    - pod install --project-directory=CoreDataLogger
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'CoreDataLogger' | xcpretty -c
-
-    - pod install --project-directory=CustomFormatters
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'CustomFormatters' | xcpretty -c
-
-    - pod install --project-directory=CustomLogLevels
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'CustomLogLevels' | xcpretty -c
-
-    - pod install --project-directory=DispatchQueueLogger
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'DispatchQueueLogger' | xcpretty -c
-
-    - pod install --project-directory=FineGrainedLogging
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'FineGrainedLogging' | xcpretty -c
-
-    - pod install --project-directory=GlobalLogLevel
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'GlobalLogLevel' | xcpretty -c
-
-    - pod install --project-directory=LogFileCompressor
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'LogFileCompressor' | xcpretty -c
-
-    - pod install --project-directory=NonArcTest
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'NonArcTest' | xcpretty -c
-
-    - pod install --project-directory=OverflowTestMac
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'OverflowTestMac' | xcpretty -c
-
-    - pod install --project-directory=PerUserLogLevels
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'PerUserLogLevels' | xcpretty -c
-
-    - pod install --project-directory=RegisteredDynamicLogging/Mobile
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'RegisteredLoggingTest (Mobile)' -configuration Release -sdk iphonesimulator | xcpretty -c
-
-    - pod install --project-directory=RegisteredDynamicLogging/Desktop
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'RegisteredLoggingTest (Desktop)' | xcpretty -c
-
-    - pod install --project-directory=RollingTestMac
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'RollingTestMac' | xcpretty -c
-
-    - pod install --project-directory=TestXcodeColors/Desktop
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'TestXcodeColors (Desktop)' | xcpretty -c
-
-    - pod install --project-directory=TestXcodeColors/Mobile
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'TextXcodeColors (Mobile)' -configuration Release -sdk iphonesimulator | xcpretty -c
-
-    - pod install --project-directory=WebServerIPhone
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'WebServerIPhone' -configuration Release -sdk iphonesimulator | xcpretty -c
-
-    - pod install --project-directory=Benchmark/Desktop
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'BenchmarkMac' | xcpretty -c
-
-    - pod install --project-directory=Benchmark/Mobile
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'BenchmarkIPhone' -configuration Release -sdk iphonesimulator | xcpretty -c
-
-    - pod install --project-directory=SQLiteLogger
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'SQLiteLogger' | xcpretty -c
-
-    - pod install --project-directory=UniversalApp
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'UniversalApp' -configuration Release -sdk iphonesimulator | xcpretty -c
-
-    - pod install --project-directory=CLI
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'CLI' | xcpretty -c
-
-    - pod install --project-directory=CaptureASL
-    - xcodebuild clean build -workspace Demos.xcworkspace -scheme 'CaptureASL' -configuration Release -sdk iphonesimulator | xcpretty -c
+    - xcodebuild clean build -project Integration/Integration.xcodeproj -scheme 'macOSSwiftIntegration' -configuration Release -sdk macosx | xcpretty -c
+    - xcodebuild clean build -project Integration/Integration.xcodeproj -scheme 'iOSFrameworkIntegration' -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Release | xcpretty -c
+    - xcodebuild clean build -project Integration/Integration.xcodeproj -scheme 'tvOSSwiftIntegration' -destination 'platform=tvOS Simulator,name=Apple TV 4K' -configuration Release -sdk appletvsimulator | xcpretty -c
+    - xcodebuild clean build -project Integration/Integration.xcodeproj -scheme 'watchOSSwiftIntegration' -configuration Release -sdk watchsimulator -destination 'platform=iOS Simulator,name=iPhone XS Max,OS=12.0' | xcpretty -c
+
+    - echo "Run the tests"
+    - xcodebuild test -skip-testing:'iOS Tests/DDFileLoggerPerformanceTests' -project Tests/Tests.xcodeproj -scheme 'iOS Tests' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
+    - xcodebuild test -skip-testing:'iOS Tests/DDFileLoggerPerformanceTests' -project Tests/Tests.xcodeproj -scheme 'iOS Tests' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7,OS=latest' GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
+    - xcodebuild test -skip-testing:'OS X Tests/DDFileLoggerPerformanceTests' -project Tests/Tests.xcodeproj -scheme 'OS X Tests' -sdk macosx GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
+
+    - echo "Building the Demos"
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'BenchmarkIPhone' -configuration Release -sdk iphonesimulator | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'BenchmarkMac' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'CLI' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'CaptureASL' -configuration Release -sdk iphonesimulator | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'ContextFilter' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'CoreDataLogger' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'CustomFormatters' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'CustomLogLevels' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'DispatchQueueLogger' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'FineGrainedLogging' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'GlobalLogLevel' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'LogFileCompressor' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'NonArcTest' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'OverflowTestMac' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'PerUserLogLevels' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'RegisteredLoggingTest (Desktop)' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'RegisteredLoggingTest (Mobile)' -configuration Release -sdk iphonesimulator | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'RollingTestMac' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'SQLiteLogger' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'TestXcodeColors (Desktop)' | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'TextXcodeColors (Mobile)' -configuration Release -sdk iphonesimulator | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'UniversalApp' -configuration Release -sdk iphonesimulator | xcpretty -c
+    - xcodebuild clean build -workspace Demos/Demos.xcworkspace -scheme 'WebServerIPhone' -configuration Release -sdk iphonesimulator | xcpretty -c
+
+    - bundle exec danger
 
 after_success:
-    - bash <(curl -s https://codecov.io/bash)
+    - bash <(curl -s https://codecov.io/bash)

Carthage/Checkouts/CocoaLumberjack/Benchmarking/BaseNSLogging.h

@@ -1,5 +1,11 @@
-#import <Foundation/Foundation.h>
+//
+//  BaseNSLogging.h
+//  Benchmarking
+//
+//  CocoaLumberjack Demos
+//
 
+#import <Foundation/Foundation.h>
 
 @interface BaseNSLogging : NSObject
 

Carthage/Checkouts/CocoaLumberjack/Benchmarking/BaseNSLogging.m

@@ -1,3 +1,10 @@
+//
+//  BaseNSLogging.m
+//  Benchmarking
+//
+//  CocoaLumberjack Demos
+//
+
 #import "BaseNSLogging.h"
 #import "PerformanceTesting.h"
 
@@ -8,7 +15,6 @@
 
 #define FILENAME @"BaseNSLogging " // Trailing space to match exactly the others in length
 
-
 @implementation BaseNSLogging
 
 + (void)speedTest0

Carthage/Checkouts/CocoaLumberjack/Benchmarking/DynamicLogging.h

@@ -1,5 +1,11 @@
-#import <Foundation/Foundation.h>
+//
+//  DynamicLogging.h
+//  Benchmarking
+//
+//  CocoaLumberjack Demos
+//
 
+#import <Foundation/Foundation.h>
 
 @interface DynamicLogging : NSObject
 

Carthage/Checkouts/CocoaLumberjack/Benchmarking/DynamicLogging.m

@@ -1,13 +1,19 @@
+//
+//  DynamicLogging.m
+//  Benchmarking
+//
+//  CocoaLumberjack Demos
+//
+
 #import "DynamicLogging.h"
 #import "PerformanceTesting.h"
-#import "DDLogMacros.h"
+#import <CocoaLumberjack/CocoaLumberjack.h>
 
 #define FILENAME @"DynamicLogging"
 
 // Debug levels: off, error, warn, info, verbose
 static DDLogLevel ddLogLevel = DDLogLevelWarning; // NOT CONST
 
-
 @implementation DynamicLogging
 
 + (DDLogLevel)ddLogLevel

Carthage/Checkouts/CocoaLumberjack/Benchmarking/PerformanceTesting.h

@@ -1,3 +1,10 @@
+//
+//  PerformanceTesting.h
+//  Benchmarking
+//
+//  CocoaLumberjack Demos
+//
+
 #import <Foundation/Foundation.h>
 
 #define SPEED_TEST_0_COUNT 1000 // Total log statements

Carthage/Checkouts/CocoaLumberjack/Benchmarking/PerformanceTesting.m

@@ -1,9 +1,12 @@
-#import "PerformanceTesting.h"
-#import "DDLog.h"
-#import "DDASLLogger.h"
-#import "DDTTYLogger.h"
-#import "DDFileLogger.h"
+//
+//  PerformanceTesting.m
+//  Benchmarking
+//
+//  CocoaLumberjack Demos
+//
 
+#import "PerformanceTesting.h"
+#import <CocoaLumberjack/CocoaLumberjack.h>
 
 #import "BaseNSLogging.h"
 #import "StaticLogging.h"
@@ -407,8 +410,8 @@ static DDFileLogger *fileLogger = nil;
 	
 	NSFileHandle *csvResultsFile = [NSFileHandle fileHandleForWritingAtPath:csvResultsPath];
 	
-	NSString *csvRsults = [self csvResults];
-	[csvResultsFile writeData:[csvRsults dataUsingEncoding:NSUTF8StringEncoding]];
+	NSString *csvResults = [self csvResults];
+	[csvResultsFile writeData:[csvResults dataUsingEncoding:NSUTF8StringEncoding]];
 	
 	NSLog(@"CSV results file written to:\n%@", csvResultsPath);
 }

Carthage/Checkouts/CocoaLumberjack/Benchmarking/StaticLogging.h

@@ -1,5 +1,11 @@
-#import <Foundation/Foundation.h>
+//
+//  StaticLogging.h
+//  Benchmarking
+//
+//  CocoaLumberjack Demos
+//
 
+#import <Foundation/Foundation.h>
 
 @interface StaticLogging : NSObject
 

Carthage/Checkouts/CocoaLumberjack/Benchmarking/StaticLogging.m

@@ -1,13 +1,19 @@
+//
+//  StaticLogging.m
+//  Benchmarking
+//
+//  CocoaLumberjack Demos
+//
+
 #import "StaticLogging.h"
 #import "PerformanceTesting.h"
-#import "DDLogMacros.h"
+#import <CocoaLumberjack/CocoaLumberjack.h>
 
 #define FILENAME @"StaticLogging " // Trailing space to match exactly the others in length
 
 // Debug levels: off, error, warn, info, verbose
 static const DDLogLevel ddLogLevel = DDLogLevelWarning; // CONST
 
-
 @implementation StaticLogging
 
 + (void)speedTest0

Carthage/Checkouts/CocoaLumberjack/CHANGELOG.md

@@ -1,3 +1,42 @@
+## [3.5.1 - Xcode 10 on Feb 4th, 2019](https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/3.5.1)
+
+### Public
+- Fix high CPU usage because of empty fileAttributes and / or too high rollingFrequceny (#1028)
+
+## [3.5.0 - Xcode 10 on Jan 25th, 2019](https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/3.5.0)
+
+### Public
+- Added `logFileHeader` property to `DDLogFileManagerDefault`. Override to set header for each created file. #998
+- `DDFileLogger` now accepts a `dispatch_queue_t` which it uses to run callbacks. If not provided, the default global queue is used. #1003
+- Added opt-in buffering to `DDFileLogger`. Call `wrapWithBuffer` to create a file logger which buffers. #1001, #1012
+- Add `DDAssert` and `DDAssertionFailure` functions for Swift #934
+- Add `DD_LOG_LEVEL` define (which can be set in `GCC_PREPROCESSOR_DEFINITIONS`) for Swift to set default log level (enables stripping for strings that are not logged). #952
+- Add `asyncLoggingEnabled` global variable to control asynchronous logging. #1019
+
+### Internal
+- Prevent memory access errors caused by a failed fetch #944
+- Fix common warnings emitted by `-Wall`, `-Wconversion`, `-Wextra`, etc #943, #931
+- Fixes issue that could cause log messages to become interleaved when there are multiple `DDFileLogger`s #985
+- `DispatchQueueFormatter` knows about `com.apple.root.default-qos.overcommit` now #932
+- Fix thread safety issues in `DDFileLogger`. Makes it a little harder to deadlock in some cases. #986, #1003, #946
+- Fix availability checks and memory leak #996
+
+### Repository
+- Reduce podspec to two subspecs and remove customized modulemap #976
+- Add danger support for PR checks #962 - fixes #956
+- Merged framework targets + using `xcconfig` + deployment target `iOS 8` and `Mac OS 10.10` #959 e97da34
+- Documentation update #955 e7414ae 0239196 #933
+- Full links to Docs and other resources so they are resolved on external pages (i.e. https://cocoapods.org/pods/CocoaLumberjack) e9d6971
+- Replace `OSAtomic` with `stdatomic` in `DDDispatchQueueLogFormatter` #957 #958
+- Add Stale Bot + configuration #953
+- Update to Xcode 10 and Swift 4.2 compiler #950
+- Xcode 10 scheme changes #949
+- Update incomplete BSD 3-Clause License #942
+- Updated to CocoaPods 1.5.3 2d0590f
+- Use Xcode 9.4 image for tests #939
+- Xcode (schemes) version bumps #938
+- Update demo and documentation about CustomLogLevels #1023
+
 ## [3.4.2 - Xcode 9.3 on Apr 17th, 2018](https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/3.4.2)
 - Update README.md #912
 - Fixed typo in pull request template #913
@@ -181,7 +220,7 @@ See [Migration from 1.x to 2.x](https://github.com/CocoaLumberjack/CocoaLumberja
 
 - Major refactoring and clean up.
 - Remove superfluous `log` from property names and use underscore for direct variable access.
-- Preliminar Swift support through `CocoaLumberjack.swift`.
+- Preliminary Swift support through `CocoaLumberjack.swift`.
 - Automatic 1.9.x legacy support when `DDLog.h` is imported instead of the new `CocoaLumberjack.h`.
 
 ## [2.0.0-beta3 on Oct 21st, 2014](https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/2.0.0-beta3)
@@ -209,7 +248,7 @@ See [Migrate from 1.x to 2.x](https://github.com/CocoaLumberjack/CocoaLumberjack
 - Change the mechanism for adding new line character (i.e. '\n\) to log messages in some logger - [#308](https://github.com/CocoaLumberjack/CocoaLumberjack/issues/308) [#310](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/310) 
 - Fixed deprecations - [#320](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/320) [#312](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/312) [#317](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/317) 
 - `aslmsg` not freed and causing memory leak - [#314](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/314) 
-- Fixed `CompresingLogFileManager` compression bug - [#315](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/315) 
+- Fixed `CompressingLogFileManager` compression bug - [#315](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/315)
 - Remove unnecessary `NULL` check before `free()` - [#316](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/316) 
 
 ## [1.9.1 Patch release for 1.9.0 on Jun 30th, 2014](https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/1.9.1)
@@ -290,7 +329,7 @@ See [Migrate from 1.x to 2.x](https://github.com/CocoaLumberjack/CocoaLumberjack
 
 Other:
 - Implemented multiple formatter (`DDMultiFormatter` - alows chaining of formatters) [#178](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/178)
-- Added DD preffix to extension classes (`ContextFilterLogFormatter` and `DispatchQueueLogFormatter`) [#178](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/178)
+- Added DD prefix to extension classes (`ContextFilterLogFormatter` and `DispatchQueueLogFormatter`) [#178](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/178)
 - Updated code indentation: Tabs changed to spaces [#180](https://github.com/CocoaLumberjack/CocoaLumberjack/pull/180)
 - Included `DDLog+LOGV.h` in Cocoapods sources [d253bd7](https://github.com/CocoaLumberjack/CocoaLumberjack/commit/d253bd7)
 - other fixes/improvements

Carthage/Checkouts/CocoaLumberjack/Classes/CLI/CLIColor.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -13,6 +13,8 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
+#if TARGET_OS_OSX
+
 #import <Foundation/Foundation.h>
 #import <QuartzCore/QuartzCore.h>
 
@@ -42,3 +44,5 @@
 - (void)getRed:(CGFloat *)red green:(CGFloat *)green blue:(CGFloat *)blue alpha:(CGFloat *)alpha NS_SWIFT_NAME(get(red:green:blue:alpha:));
 
 @end
+
+#endif

Carthage/Checkouts/CocoaLumberjack/Classes/CLI/CLIColor.m

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -13,6 +13,8 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
+#if TARGET_OS_OSX
+
 #import "CLIColor.h"
 
 @interface CLIColor () {
@@ -53,3 +55,5 @@
 }
 
 @end
+
+#endif

Carthage/Checkouts/CocoaLumberjack/Classes/CocoaLumberjack.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -59,6 +59,12 @@
 
 #import <Foundation/Foundation.h>
 
+//! Project version number for CocoaLumberjack.
+FOUNDATION_EXPORT double CocoaLumberjackVersionNumber;
+
+//! Project version string for CocoaLumberjack.
+FOUNDATION_EXPORT const unsigned char CocoaLumberjackVersionString[];
+
 // Disable legacy macros
 #ifndef DD_LEGACY_MACROS
     #define DD_LEGACY_MACROS 0
@@ -75,12 +81,23 @@
 #import "DDASLLogCapture.h"
 
 // Loggers
+#import "DDLoggerNames.h"
+
 #import "DDTTYLogger.h"
 #import "DDASLLogger.h"
 #import "DDFileLogger.h"
 #import "DDOSLogger.h"
 
+// Extensions
+#import "DDContextFilterLogFormatter.h"
+#import "DDDispatchQueueLogFormatter.h"
+#import "DDMultiFormatter.h"
+#import "DDFileLogger+Buffering.h"
+
 // CLI
-#if __has_include("CLIColor.h") && TARGET_OS_OSX
 #import "CLIColor.h"
-#endif
+
+// etc
+#import "DDAbstractDatabaseLogger.h"
+#import "DDLog+LOGV.h"
+#import "DDLegacyMacros.h"

Carthage/Checkouts/CocoaLumberjack/Classes/CocoaLumberjack.swift

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2014-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -13,18 +13,16 @@
 //   to endorse or promote products derived from this software without specific
 //   prior written permission of Deusty, LLC.
 
-import Foundation
-
 extension DDLogFlag {
     public static func from(_ logLevel: DDLogLevel) -> DDLogFlag {
         return DDLogFlag(rawValue: logLevel.rawValue)
     }
-	
+
 	public init(_ logLevel: DDLogLevel) {
         self = DDLogFlag(rawValue: logLevel.rawValue)
 	}
-    
-    ///returns the log level, or the lowest equivalant.
+
+    /// Returns the log level, or the lowest equivalent.
     public func toLogLevel() -> DDLogLevel {
         if let ourValid = DDLogLevel(rawValue: rawValue) {
             return ourValid
@@ -46,44 +44,132 @@ extension DDLogFlag {
     }
 }
 
-public var defaultDebugLevel = DDLogLevel.verbose
+/// The log level that can dynamically limit log messages (vs. the static DDDefaultLogLevel). This log level will only be checked, if the message passes the `DDDefaultLogLevel`.
+public var dynamicLogLevel = DDLogLevel.all
+
+/// Resets the `dynamicLogLevel` to `.all`.
+/// - SeeAlso: `dynamicLogLevel`
+@inlinable
+public func resetDynamicLogLevel() {
+    dynamicLogLevel = .all
+}
+
+@available(*, deprecated, message: "Please use dynamicLogLevel", renamed: "dynamicLogLevel")
+public var defaultDebugLevel: DDLogLevel {
+    get {
+        return dynamicLogLevel
+    }
+    set {
+        dynamicLogLevel = newValue
+    }
+}
 
+@available(*, deprecated, message: "Please use resetDynamicLogLevel", renamed: "resetDynamicLogLevel")
 public func resetDefaultDebugLevel() {
-    defaultDebugLevel = DDLogLevel.verbose
+    resetDynamicLogLevel()
 }
 
-public func _DDLogMessage(_ message: @autoclosure () -> String, level: DDLogLevel, flag: DDLogFlag, context: Int, file: StaticString, function: StaticString, line: UInt, tag: Any?, asynchronous: Bool, ddlog: DDLog) {
-    if level.rawValue & flag.rawValue != 0 {
+/// If `true`, all logs (except errors) are logged asynchronously by default.
+public var asyncLoggingEnabled = true
+
+@inlinable
+public func _DDLogMessage(_ message: @autoclosure () -> String,
+                          level: DDLogLevel,
+                          flag: DDLogFlag,
+                          context: Int,
+                          file: StaticString,
+                          function: StaticString,
+                          line: UInt,
+                          tag: Any?,
+                          asynchronous: Bool,
+                          ddlog: DDLog) {
+    // The `dynamicLogLevel` will always be checked here (instead of being passed in).
+    // We cannot "mix" it with the `DDDefaultLogLevel`, because otherwise the compiler won't strip strings that are not logged.
+    if level.rawValue & flag.rawValue != 0 && dynamicLogLevel.rawValue & flag.rawValue != 0 {
         // Tell the DDLogMessage constructor to copy the C strings that get passed to it.
-        let logMessage = DDLogMessage(message: message(), level: level, flag: flag, context: context, file: String(describing: file), function: String(describing: function), line: line, tag: tag, options: [.copyFile, .copyFunction], timestamp: nil)
+        let logMessage = DDLogMessage(message: message(),
+                                      level: level,
+                                      flag: flag,
+                                      context: context,
+                                      file: String(describing: file),
+                                      function: String(describing: function),
+                                      line: line,
+                                      tag: tag,
+                                      options: [.copyFile, .copyFunction],
+                                      timestamp: nil)
         ddlog.log(asynchronous: asynchronous, message: logMessage)
     }
 }
 
-public func DDLogDebug(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
+@inlinable
+public func DDLogDebug(_ message: @autoclosure () -> String,
+                       level: DDLogLevel = DDDefaultLogLevel,
+                       context: Int = 0,
+                       file: StaticString = #file,
+                       function: StaticString = #function,
+                       line: UInt = #line,
+                       tag: Any? = nil,
+                       asynchronous async: Bool = asyncLoggingEnabled,
+                       ddlog: DDLog = .sharedInstance) {
     _DDLogMessage(message, level: level, flag: .debug, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
 }
 
-public func DDLogInfo(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
+@inlinable
+public func DDLogInfo(_ message: @autoclosure () -> String,
+                      level: DDLogLevel = DDDefaultLogLevel,
+                      context: Int = 0,
+                      file: StaticString = #file,
+                      function: StaticString = #function,
+                      line: UInt = #line,
+                      tag: Any? = nil,
+                      asynchronous async: Bool = asyncLoggingEnabled,
+                      ddlog: DDLog = .sharedInstance) {
     _DDLogMessage(message, level: level, flag: .info, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
 }
 
-public func DDLogWarn(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
+@inlinable
+public func DDLogWarn(_ message: @autoclosure () -> String,
+                      level: DDLogLevel = DDDefaultLogLevel,
+                      context: Int = 0,
+                      file: StaticString = #file,
+                      function: StaticString = #function,
+                      line: UInt = #line,
+                      tag: Any? = nil,
+                      asynchronous async: Bool = asyncLoggingEnabled,
+                      ddlog: DDLog = .sharedInstance) {
     _DDLogMessage(message, level: level, flag: .warning, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
 }
 
-public func DDLogVerbose(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
+@inlinable
+public func DDLogVerbose(_ message: @autoclosure () -> String,
+                         level: DDLogLevel = DDDefaultLogLevel,
+                         context: Int = 0,
+                         file: StaticString = #file,
+                         function: StaticString = #function,
+                         line: UInt = #line,
+                         tag: Any? = nil,
+                         asynchronous async: Bool = asyncLoggingEnabled,
+                         ddlog: DDLog = .sharedInstance) {
     _DDLogMessage(message, level: level, flag: .verbose, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
 }
 
-public func DDLogError(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = false, ddlog: DDLog = DDLog.sharedInstance) {
+@inlinable
+public func DDLogError(_ message: @autoclosure () -> String,
+                       level: DDLogLevel = DDDefaultLogLevel,
+                       context: Int = 0,
+                       file: StaticString = #file,
+                       function: StaticString = #function,
+                       line: UInt = #line,
+                       tag: Any? = nil,
+                       asynchronous async: Bool = false,
+                       ddlog: DDLog = .sharedInstance) {
     _DDLogMessage(message, level: level, flag: .error, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
 }
 
 /// Returns a String of the current filename, without full path or extension.
 ///
 /// Analogous to the C preprocessor macro `THIS_FILE`.
-public func CurrentFileName(_ fileName: StaticString = #file) -> String {
+public func currentFileName(_ fileName: StaticString = #file) -> String {
     var str = String(describing: fileName)
     if let idx = str.range(of: "/", options: .backwards)?.upperBound {
         str = String(str[idx...])
@@ -93,3 +179,10 @@ public func CurrentFileName(_ fileName: StaticString = #file) -> String {
     }
     return str
 }
+
+// swiftlint:disable identifier_name
+// swiftlint doesn't like func names that begin with a capital letter - deprecated
+@available(*, deprecated, message: "Please use currentFileName", renamed: "currentFileName")
+public func CurrentFileName(_ fileName: StaticString = #file) -> String {
+    return currentFileName(fileName)
+}

Carthage/Checkouts/CocoaLumberjack/Classes/DDASLLogCapture.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -20,6 +20,7 @@
 /**
  *  This class provides the ability to capture the ASL (Apple System Logs)
  */
+API_DEPRECATED("Use DDOSLogger instead", macosx(10.4,10.12), ios(2.0,10.0), watchos(2.0,3.0), tvos(9.0,10.0))
 @interface DDASLLogCapture : NSObject
 
 /**

Carthage/Checkouts/CocoaLumberjack/Classes/DDASLLogCapture.m

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -20,7 +20,7 @@
     #define DD_LEGACY_MACROS 0
 #endif
 
-#import "DDLog.h"
+#if !TARGET_OS_WATCH
 
 #include <asl.h>
 #include <notify.h>
@@ -30,40 +30,8 @@
 static BOOL _cancel = YES;
 static DDLogLevel _captureLevel = DDLogLevelVerbose;
 
-#ifdef __IPHONE_8_0
-    #define DDASL_IOS_PIVOT_VERSION __IPHONE_8_0
-#endif
-#ifdef __MAC_10_10
-    #define DDASL_OSX_PIVOT_VERSION __MAC_10_10
-#endif
-
 @implementation DDASLLogCapture
 
-static aslmsg (*dd_asl_next)(aslresponse obj);
-static void (*dd_asl_release)(aslresponse obj);
-
-+ (void)initialize
-{
-    #if (defined(DDASL_IOS_PIVOT_VERSION) && __IPHONE_OS_VERSION_MAX_ALLOWED >= DDASL_IOS_PIVOT_VERSION) || (defined(DDASL_OSX_PIVOT_VERSION) && __MAC_OS_X_VERSION_MAX_ALLOWED >= DDASL_OSX_PIVOT_VERSION)
-        #if __IPHONE_OS_VERSION_MIN_REQUIRED < DDASL_IOS_PIVOT_VERSION || __MAC_OS_X_VERSION_MIN_REQUIRED < DDASL_OSX_PIVOT_VERSION
-            #pragma GCC diagnostic push
-            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-                // Building on falsely advertised SDK, targeting deprecated API
-                dd_asl_next    = &aslresponse_next;
-                dd_asl_release = &aslresponse_free;
-            #pragma GCC diagnostic pop
-        #else
-            // Building on lastest, correct SDK, targeting latest API
-            dd_asl_next    = &asl_next;
-            dd_asl_release = &asl_release;
-        #endif
-    #else
-        // Building on old SDKs, targeting deprecated API
-        dd_asl_next    = &aslresponse_next;
-        dd_asl_release = &aslresponse_free;
-    #endif
-}
-
 + (void)start {
     // Ignore subsequent calls
     if (!_cancel) {
@@ -99,7 +67,7 @@ static void (*dd_asl_release)(aslresponse obj);
     // Don't retrieve logs from our own DDASLLogger
     asl_set_query(query, kDDASLKeyDDLog, kDDASLDDLogValue, ASL_QUERY_OP_NOT_EQUAL);
     
-#if !TARGET_OS_IPHONE || TARGET_SIMULATOR
+#if !TARGET_OS_IPHONE || (defined(TARGET_SIMULATOR) && TARGET_SIMULATOR)
     int processId = [[NSProcessInfo processInfo] processIdentifier];
     char pid[16];
     sprintf(pid, "%d", processId);
@@ -112,7 +80,7 @@ static void (*dd_asl_release)(aslresponse obj);
     if ( messageCString == NULL )
         return;
 
-    int flag;
+    DDLogFlag flag;
     BOOL async;
 
     const char* levelCString = asl_get(msg, ASL_KEY_LEVEL);
@@ -149,7 +117,7 @@ static void (*dd_asl_release)(aslresponse obj);
                                                                flag:flag
                                                             context:0
                                                                file:@"DDASLLogCapture"
-                                                           function:0
+                                                           function:nil
                                                                line:0
                                                                 tag:nil
                                                             options:0
@@ -171,7 +139,7 @@ static void (*dd_asl_release)(aslresponse obj);
             .tv_sec = 0
         };
         gettimeofday(&timeval, NULL);
-        unsigned long long startTime = timeval.tv_sec;
+        unsigned long long startTime = (unsigned long long)timeval.tv_sec;
         __block unsigned long long lastSeenID = 0;
 
         /*
@@ -207,14 +175,14 @@ static void (*dd_asl_release)(aslresponse obj);
                 aslmsg msg;
                 aslresponse response = asl_search(NULL, query);
                 
-                while ((msg = dd_asl_next(response)))
+                while ((msg = asl_next(response)))
                 {
                     [self aslMessageReceived:msg];
 
                     // Keep track of which messages we've seen.
-                    lastSeenID = atoll(asl_get(msg, ASL_KEY_MSG_ID));
+                    lastSeenID = (unsigned long long)atoll(asl_get(msg, ASL_KEY_MSG_ID));
                 }
-                dd_asl_release(response);
+                asl_release(response);
                 asl_free(query);
 
                 if (_cancel) {
@@ -228,3 +196,5 @@ static void (*dd_asl_release)(aslresponse obj);
 }
 
 @end
+
+#endif

Carthage/Checkouts/CocoaLumberjack/Classes/DDASLLogger.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -41,6 +41,7 @@ extern const char* const kDDASLDDLogValue;
  * However, if you instead choose to use file logging (for faster performance),
  * you may choose to use a file logger and a tty logger.
  **/
+API_DEPRECATED("Use DDOSLogger instead", macosx(10.4,10.12), ios(2.0,10.0), watchos(2.0,3.0), tvos(9.0,10.0))
 @interface DDASLLogger : DDAbstractLogger <DDLogger>
 
 /**

Carthage/Checkouts/CocoaLumberjack/Classes/DDASLLogger.m

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -14,6 +14,8 @@
 //   prior written permission of Deusty, LLC.
 
 #import "DDASLLogger.h"
+
+#if !TARGET_OS_WATCH
 #import <asl.h>
 
 #if !__has_feature(objc_arc)
@@ -90,7 +92,7 @@ static DDASLLogger *sharedInstance;
 
         char readUIDString[16];
 #ifndef NS_BLOCK_ASSERTIONS
-        size_t l = snprintf(readUIDString, sizeof(readUIDString), "%d", readUID);
+        size_t l = (size_t)snprintf(readUIDString, sizeof(readUIDString), "%d", readUID);
 #else
         snprintf(readUIDString, sizeof(readUIDString), "%d", readUID);
 #endif
@@ -114,8 +116,10 @@ static DDASLLogger *sharedInstance;
     }
 }
 
-- (NSString *)loggerName {
-    return @"cocoa.lumberjack.aslLogger";
+- (DDLoggerName)loggerName {
+    return DDLoggerNameASL;
 }
 
 @end
+
+#endif

Carthage/Checkouts/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,

Carthage/Checkouts/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -14,7 +14,6 @@
 //   prior written permission of Deusty, LLC.
 
 #import "DDAbstractDatabaseLogger.h"
-#import <math.h>
 
 
 #if !__has_feature(objc_arc)
@@ -52,7 +51,7 @@
 #pragma mark Override Me
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-- (BOOL)db_log:(DDLogMessage *)logMessage {
+- (BOOL)db_log:(__unused DDLogMessage *)logMessage {
     // Override me and add your implementation.
     //
     // Return YES if an item was added to the buffer.
@@ -127,7 +126,7 @@
 - (void)updateAndResumeSaveTimer {
     if ((_saveTimer != NULL) && (_saveInterval > 0.0) && (_unsavedTime > 0.0)) {
         uint64_t interval = (uint64_t)(_saveInterval * (NSTimeInterval) NSEC_PER_SEC);
-        dispatch_time_t startTime = dispatch_time(_unsavedTime, interval);
+        dispatch_time_t startTime = dispatch_time(_unsavedTime, (int64_t)interval);
 
         dispatch_source_set_timer(_saveTimer, startTime, interval, 1ull * NSEC_PER_SEC);
 
@@ -162,7 +161,7 @@
 
 - (void)updateDeleteTimer {
     if ((_deleteTimer != NULL) && (_deleteInterval > 0.0) && (_maxAge > 0.0)) {
-        uint64_t interval = (uint64_t)(_deleteInterval * (NSTimeInterval) NSEC_PER_SEC);
+        int64_t interval = (int64_t)(_deleteInterval * (NSTimeInterval) NSEC_PER_SEC);
         dispatch_time_t startTime;
 
         if (_lastDeleteTime > 0) {
@@ -171,7 +170,7 @@
             startTime = dispatch_time(DISPATCH_TIME_NOW, interval);
         }
 
-        dispatch_source_set_timer(_deleteTimer, startTime, interval, 1ull * NSEC_PER_SEC);
+        dispatch_source_set_timer(_deleteTimer, startTime, (uint64_t)interval, 1ull * NSEC_PER_SEC);
     }
 }
 

Carthage/Checkouts/CocoaLumberjack/Classes/DDAssertMacros.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -14,7 +14,7 @@
 //   prior written permission of Deusty, LLC.
 
 /**
- * NSAsset replacement that will output a log message even when assertions are disabled.
+ * NSAssert replacement that will output a log message even when assertions are disabled.
  **/
 #define DDAssert(condition, frmt, ...)                                                \
         if (!(condition)) {                                                           \

Carthage/Checkouts/CocoaLumberjack/Classes/DDFileLogger.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -20,6 +20,8 @@
 
 #import "DDLog.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class DDLogFileInfo;
 
 /**
@@ -85,7 +87,7 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 @property (readwrite, assign, atomic) NSUInteger maximumNumberOfLogFiles;
 
 /**
- * The maximum space that logs can take. On rolling logfile all old logfiles that exceed logFilesDiskQuota will
+ * The maximum space that logs can take. On rolling logfile all old log files that exceed logFilesDiskQuota will
  * be deleted.
  *
  * You may optionally disable this option by setting it to zero.
@@ -143,6 +145,8 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 
 /**
  * Generates a new unique log file path, and creates the corresponding log file.
+ * This method is executed directly on the file logger's internal queue.
+ * The file has to exist by the time the method returns.
  **/
 - (NSString *)createNewLogFile;
 
@@ -151,12 +155,13 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 // Notifications from DDFileLogger
 
 /**
- *  Called when a log file was archieved
+ *  Called when a log file was archived. Executed on global queue with default priority.
  */
 - (void)didArchiveLogFile:(NSString *)logFilePath NS_SWIFT_NAME(didArchiveLogFile(atPath:));
 
 /**
- *  Called when the roll action was executed and the log was archieved
+ *  Called when the roll action was executed and the log was archived.
+ *  Executed on global queue with default priority.
  */
 - (void)didRollAndArchiveLogFile:(NSString *)logFilePath NS_SWIFT_NAME(didRollAndArchiveLogFile(atPath:));
 
@@ -187,9 +192,10 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 - (instancetype)init;
 
 /**
- *  Designated initialized, requires the logs directory
+ *  If logDirectory is not specified, then a folder called "Logs" is created in the app's cache directory.
+ *  While running on the simulator, the "Logs" folder is located in the library temporary directory.
  */
-- (instancetype)initWithLogsDirectory:(NSString *)logsDirectory NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithLogsDirectory:(NSString * __nullable)logsDirectory NS_DESIGNATED_INITIALIZER;
 
 #if TARGET_OS_IPHONE
 /*
@@ -203,7 +209,8 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
  *    null
  *    cy#
  **/
-- (instancetype)initWithLogsDirectory:(NSString *)logsDirectory defaultFileProtectionLevel:(NSFileProtectionType)fileProtectionLevel;
+- (instancetype)initWithLogsDirectory:(NSString * __nullable)logsDirectory
+           defaultFileProtectionLevel:(NSFileProtectionType)fileProtectionLevel;
 #endif
 
 /*
@@ -214,7 +221,7 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
  *
  * If you wish to change default filename, you can override following two methods.
  * - `newLogFileName` method would be called on new logfile creation.
- * - `isLogFile:` method would be called to filter logfiles from all other files in logsDirectory.
+ * - `isLogFile:` method would be called to filter log files from all other files in logsDirectory.
  *   You have to parse given filename and return YES if it is logFile.
  *
  * **NOTE**
@@ -248,6 +255,14 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
  **/
 - (BOOL)isLogFile:(NSString *)fileName NS_SWIFT_NAME(isLogFile(withName:));
 
+/**
+ * New log files are created empty by default in `createNewLogFile:` method
+ *
+ * If you wish to specify a common file header to use in your log files,
+ * you can set the initial log file contents by overriding `logFileHeader`
+ **/
+@property (readonly, copy, nullable) NSString *logFileHeader;
+
 /* Inherited from DDLogFileManager protocol:
 
    @property (readwrite, assign, atomic) NSUInteger maximumNumberOfLogFiles;
@@ -291,7 +306,7 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 /**
  *  Designated initializer, requires a date formatter
  */
-- (instancetype)initWithDateFormatter:(NSDateFormatter *)dateFormatter NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithDateFormatter:(NSDateFormatter * __nullable)dateFormatter NS_DESIGNATED_INITIALIZER;
 
 @end
 
@@ -302,19 +317,27 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 /**
  *  The standard implementation for a file logger
  */
-@interface DDFileLogger : DDAbstractLogger <DDLogger> {
-	DDLogFileInfo *_currentLogFileInfo;
-}
+@interface DDFileLogger : DDAbstractLogger <DDLogger>
 
 /**
- *  Default initializer
+ *  Default initializer.
  */
 - (instancetype)init;
 
 /**
- *  Designated initializer, requires a `DDLogFileManager` instance
+ *  Designated initializer, requires a `DDLogFileManager` instance.
+ *  A global queue w/ default priority is used to run callbacks.
+ *  If needed, specify queue using `initWithLogFileManager:completionQueue:`.
  */
-- (instancetype)initWithLogFileManager:(id <DDLogFileManager>)logFileManager NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithLogFileManager:(id <DDLogFileManager> __nullable)logFileManager;
+
+/**
+ *  Designated initializer, requires a `DDLogFileManager` instance.
+ *  The completionQueue is used to execute `didArchiveLogFile`, `didRollAndArchiveLogFile`,
+ *  and the callback in `rollLog`. If nil, a global queue w/ default priority is used.
+ */
+- (instancetype)initWithLogFileManager:(id <DDLogFileManager> __nullable)logFileManager
+                       completionQueue:(dispatch_queue_t __nullable)dispatchQueue NS_DESIGNATED_INITIALIZER;
 
 /**
  *  Called when the logger is about to write message. Call super before your implementation.
@@ -328,12 +351,14 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 
 /**
  *  Writes all in-memory log data to the permanent storage. Call super before your implementation.
+ *  Don't call this method directly, instead use the `[DDLog flushLog]` to ensure all log messages are included in flush.
  */
 - (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.
+ *  Called when the logger checks archive or not current log file.
+ *  Override this method to extend standard behavior. By default returns NO.
+ *  This is executed directly on the logger's internal queue, so keep processing light!
  */
 - (BOOL)shouldArchiveRecentLogFileInfo:(DDLogFileInfo *)recentLogFileInfo;
 
@@ -402,7 +427,8 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
  *  You can optionally force the current log file to be rolled with this method.
  *  CompletionBlock will be called on main queue.
  */
-- (void)rollLogFileWithCompletionBlock:(void (^)(void))completionBlock NS_SWIFT_NAME(rollLogFile(withCompletion:));
+- (void)rollLogFileWithCompletionBlock:(void (^ __nullable)(void))completionBlock
+    NS_SWIFT_NAME(rollLogFile(withCompletion:));
 
 /**
  *  Method is deprecated.
@@ -515,3 +541,5 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 - (NSComparisonResult)reverseCompareByModificationDate:(DDLogFileInfo *)another;
 
 @end
+
+NS_ASSUME_NONNULL_END

Carthage/Checkouts/CocoaLumberjack/Classes/DDLegacyMacros.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,

Carthage/Checkouts/CocoaLumberjack/Classes/DDLog+LOGV.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -39,15 +39,15 @@
  * This big multiline macro makes all the other macros easier to read.
  **/
 #define LOGV_MACRO(isAsynchronous, lvl, flg, ctx, atag, fnct, frmt, avalist) \
-        [DDLog log : isAsynchronous                                     \
-             level : lvl                                                \
-              flag : flg                                                \
-           context : ctx                                                \
-              file : __FILE__                                           \
-          function : fnct                                               \
-              line : __LINE__                                           \
-               tag : atag                                               \
-            format : frmt                                               \
+        [DDLog log : isAsynchronous                                          \
+             level : lvl                                                     \
+              flag : flg                                                     \
+           context : ctx                                                     \
+              file : __FILE__                                                \
+          function : fnct                                                    \
+              line : __LINE__                                                \
+               tag : atag                                                    \
+            format : frmt                                                    \
               args : avalist]
 
 /**

Carthage/Checkouts/CocoaLumberjack/Classes/DDLog.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -22,6 +22,9 @@
 // DD_LEGACY_MACROS is checked in the file itself
 #import "DDLegacyMacros.h"
 
+// Names of loggers.
+#import "DDLoggerNames.h"
+
 #if OS_OBJECT_USE_OBJC
     #define DISPATCH_QUEUE_REFERENCE_TYPE strong
 #else
@@ -331,7 +334,7 @@ FOUNDATION_EXTERN NSString * __nullable DDExtractFileNameWithoutExtension(const
 /**
  * Logging Primitive.
  *
- * This method can be used if you manualy prepared DDLogMessage.
+ * This method can be used if you manually prepared DDLogMessage.
  *
  *  @param asynchronous YES if the logging is done async, NO if you want to force sync
  *  @param logMessage   the log message stored in a `DDLogMessage` model object
@@ -342,7 +345,7 @@ FOUNDATION_EXTERN NSString * __nullable DDExtractFileNameWithoutExtension(const
 /**
  * Logging Primitive.
  *
- * This method can be used if you manualy prepared DDLogMessage.
+ * This method can be used if you manually prepared DDLogMessage.
  *
  *  @param asynchronous YES if the logging is done async, NO if you want to force sync
  *  @param logMessage   the log message stored in a `DDLogMessage` model object
@@ -606,13 +609,13 @@ FOUNDATION_EXTERN NSString * __nullable DDExtractFileNameWithoutExtension(const
 - (void)didAddLoggerInQueue:(dispatch_queue_t)queue;
 
 /**
- *  See the above description for `didAddLoger`
+ *  See the above description for `didAddLogger`
  */
 - (void)willRemoveLogger;
 
 /**
  * Some loggers may buffer IO for optimization purposes.
- * For example, a database logger may only save occasionaly as the disk IO is slow.
+ * For example, a database logger may only save occasionally as the disk IO is slow.
  * In such loggers, this method should be implemented to flush any pending IO.
  *
  * This allows invocations of DDLog's flushLog method to be propogated to loggers that need it.
@@ -635,7 +638,7 @@ FOUNDATION_EXTERN NSString * __nullable DDExtractFileNameWithoutExtension(const
  * The created queue will receive its name from this method.
  * This may be helpful for debugging or profiling reasons.
  **/
-@property (nonatomic, readonly) NSString *loggerName;
+@property (copy, nonatomic, readonly) DDLoggerName loggerName;
 
 @end
 
@@ -855,10 +858,10 @@ typedef NS_OPTIONS(NSInteger, DDLogMessageOptions){
  * The `DDLogger` protocol specifies that an optional formatter can be added to a logger.
  * Most (but not all) loggers will want to support formatters.
  *
- * However, writting getters and setters in a thread safe manner,
+ * However, writing getters and setters in a thread safe manner,
  * while still maintaining maximum speed for the logging process, is a difficult task.
  *
- * To do it right, the implementation of the getter/setter has strict requiremenets:
+ * To do it right, the implementation of the getter/setter has strict requirements:
  * - Must NOT require the `logMessage:` method to acquire a lock.
  * - Must NOT require the `logMessage:` method to access an atomic property (also a lock of sorts).
  *

Carthage/Checkouts/CocoaLumberjack/Classes/DDLog.m

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -21,14 +21,13 @@
 #import "DDLog.h"
 
 #import <pthread.h>
-#import <dispatch/dispatch.h>
 #import <objc/runtime.h>
-#import <mach/mach_host.h>
-#import <mach/host_info.h>
-#import <libkern/OSAtomic.h>
-#import <Availability.h>
+
 #if TARGET_OS_IOS
     #import <UIKit/UIDevice.h>
+    #import <UIKit/UIApplication.h>
+#elif !defined(DD_CLI) && __has_include(<AppKit/NSApplication.h>)
+    #import <AppKit/NSApplication.h>
 #endif
 
 
@@ -52,7 +51,7 @@
 // Specifies the maximum queue size of the logging thread.
 //
 // Since most logging is asynchronous, its possible for rogue threads to flood the logging queue.
-// That is, to issue an abundance of log statements faster than the logging thread can keepup.
+// That is, to issue an abundance of log statements faster than the logging thread can keep up.
 // Typically such a scenario occurs when log statements are added haphazardly within large loops,
 // but may also be possible if relatively slow loggers are being used.
 //
@@ -110,7 +109,7 @@ static void *const GlobalLoggingQueueIdentityKey = (void *)&GlobalLoggingQueueId
 static dispatch_queue_t _loggingQueue;
 
 // Individual loggers are executed concurrently per log statement.
-// Each logger has it's own associated queue, and a dispatch group is used for synchrnoization.
+// Each logger has it's own associated queue, and a dispatch group is used for synchronization.
 static dispatch_group_t _loggingGroup;
 
 // In order to prevent to queue from growing infinitely large,
@@ -143,7 +142,7 @@ static NSUInteger _numProcessors;
  * method may never be invoked if the class is not used.) The runtime sends the initialize message to
  * classes in a thread-safe manner. Superclasses receive this message before their subclasses.
  *
- * This method may also be called directly (assumably by accident), hence the safety mechanism.
+ * This method may also be called directly, hence the safety mechanism.
  **/
 + (void)initialize {
     static dispatch_once_t DDLogOnceToken;
@@ -181,24 +180,23 @@ static NSUInteger _numProcessors;
         self._loggers = [[NSMutableArray alloc] initWithCapacity:4];
         
 #if TARGET_OS_IOS
-        NSString *notificationName = @"UIApplicationWillTerminateNotification";
+        NSString *notificationName = UIApplicationWillTerminateNotification;
 #else
         NSString *notificationName = nil;
-        
-        // On Command Line Tool apps AppKit may not be avaliable
-#ifdef NSAppKitVersionNumber10_0
-        
+
+        // On Command Line Tool apps AppKit may not be available
+#if !defined(DD_CLI) && __has_include(<AppKit/NSApplication.h>)
         if (NSApp) {
-            notificationName = @"NSApplicationWillTerminateNotification";
+            notificationName = NSApplicationWillTerminateNotification;
         }
-        
 #endif
-        
+
         if (!notificationName) {
             // If there is no NSApp -> we are running Command Line Tool app.
             // In this case terminate notification wouldn't be fired, so we use workaround.
+            __weak __auto_type weakSelf = self;
             atexit_b (^{
-                [self applicationWillTerminate:nil];
+                [weakSelf applicationWillTerminate:nil];
             });
         }
         
@@ -343,7 +341,7 @@ static NSUInteger _numProcessors;
 
     // We are using a counting semaphore provided by GCD.
     // The semaphore is initialized with our DDLOG_MAX_QUEUE_SIZE value.
-    // Everytime we want to queue a log message we decrement this value.
+    // Every time we want to queue a log message we decrement this value.
     // If the resulting value is less than zero,
     // the semaphore function waits in FIFO order for a signal to occur before returning.
     //
@@ -353,16 +351,18 @@ static NSUInteger _numProcessors;
 
     dispatch_block_t logBlock = ^{
         dispatch_semaphore_wait(_queueSemaphore, DISPATCH_TIME_FOREVER);
+        // We're now sure we won't overflow the queue.
+        // It is time to queue our log message.
         @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 if (dispatch_get_specific(GlobalLoggingQueueIdentityKey)) {
+        // We've logged an error message while on the logging queue...
+        logBlock();
     } else {
         dispatch_sync(_loggingQueue, logBlock);
     }
@@ -843,7 +843,7 @@ static NSUInteger _numProcessors;
         
         dispatch_group_wait(_loggingGroup, DISPATCH_TIME_FOREVER);
     } else {
-        // Execute each logger serialy, each within its own queue.
+        // Execute each logger serially, each within its own queue.
         
         for (DDLoggerNode *loggerNode in self._loggers) {
             // skip the loggers that shouldn't write this message based on the log level
@@ -878,7 +878,7 @@ static NSUInteger _numProcessors;
 - (void)lt_flush {
     // All log statements issued before the flush method was invoked have now been executed.
     //
-    // Now we need to propogate the flush request to any loggers that implement the flush method.
+    // Now we need to propagate the flush request to any loggers that implement the flush method.
     // This is designed for loggers that buffer IO.
     
     NSAssert(dispatch_get_specific(GlobalLoggingQueueIdentityKey),
@@ -1004,114 +1004,6 @@ NSString * __nullable DDExtractFileNameWithoutExtension(const char *filePath, BO
 
 @implementation DDLogMessage
 
-// Can we use DISPATCH_CURRENT_QUEUE_LABEL ?
-// Can we use dispatch_get_current_queue (without it crashing) ?
-//
-// a) Compiling against newer SDK's (iOS 7+/OS X 10.9+) where DISPATCH_CURRENT_QUEUE_LABEL is defined
-//    on a (iOS 7.0+/OS X 10.9+) runtime version
-//
-// b) Systems where dispatch_get_current_queue is not yet deprecated and won't crash (< iOS 6.0/OS X 10.9)
-//
-//    dispatch_get_current_queue(void);
-//      __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_6,__MAC_10_9,__IPHONE_4_0,__IPHONE_6_0)
-
-#if TARGET_OS_IOS
-
-// Compiling for iOS
-
-static BOOL _use_dispatch_current_queue_label;
-static BOOL _use_dispatch_get_current_queue;
-
-static void _dispatch_queue_label_init_once(void * __attribute__((unused)) context)
-{
-    _use_dispatch_current_queue_label = (UIDevice.currentDevice.systemVersion.floatValue >= 7.0f);
-    _use_dispatch_get_current_queue = (!_use_dispatch_current_queue_label && UIDevice.currentDevice.systemVersion.floatValue >= 6.1f);
-}
-
-static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_init()
-{
-    static dispatch_once_t onceToken;
-    dispatch_once_f(&onceToken, NULL, _dispatch_queue_label_init_once);
-}
-
-  #define USE_DISPATCH_CURRENT_QUEUE_LABEL (_dispatch_queue_label_init(), _use_dispatch_current_queue_label)
-  #define USE_DISPATCH_GET_CURRENT_QUEUE   (_dispatch_queue_label_init(), _use_dispatch_get_current_queue)
-
-#elif TARGET_OS_WATCH || TARGET_OS_TV
-
-// Compiling for watchOS, tvOS
-
-  #define USE_DISPATCH_CURRENT_QUEUE_LABEL YES
-  #define USE_DISPATCH_GET_CURRENT_QUEUE   NO
-
-#else
-
-// Compiling for Mac OS X
-
-  #ifndef MAC_OS_X_VERSION_10_9
-    #define MAC_OS_X_VERSION_10_9            1090
-  #endif
-
-  #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 // Mac OS X 10.9 or later required
-
-    #define USE_DISPATCH_CURRENT_QUEUE_LABEL YES
-    #define USE_DISPATCH_GET_CURRENT_QUEUE   NO
-
-  #else
-
-static BOOL _use_dispatch_current_queue_label;
-static BOOL _use_dispatch_get_current_queue;
-
-static void _dispatch_queue_label_init_once(void * __attribute__((unused)) context)
-{
-    _use_dispatch_current_queue_label = [NSTimer instancesRespondToSelector : @selector(tolerance)]; // OS X 10.9+
-    _use_dispatch_get_current_queue = !_use_dispatch_current_queue_label;                            // < OS X 10.9
-}
-
-static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_init()
-{
-    static dispatch_once_t onceToken;
-    dispatch_once_f(&onceToken, NULL, _dispatch_queue_label_init_once);
-}
-
-    #define USE_DISPATCH_CURRENT_QUEUE_LABEL (_dispatch_queue_label_init(), _use_dispatch_current_queue_label)
-    #define USE_DISPATCH_GET_CURRENT_QUEUE   (_dispatch_queue_label_init(), _use_dispatch_get_current_queue)
-
-  #endif
-
-#endif /* if TARGET_OS_IOS */
-
-// Should we use pthread_threadid_np ?
-// With iOS 8+/OSX 10.10+ NSLog uses pthread_threadid_np instead of pthread_mach_thread_np
-
-#if TARGET_OS_IOS
-
-// Compiling for iOS
-
-  #ifndef kCFCoreFoundationVersionNumber_iOS_8_0
-    #define kCFCoreFoundationVersionNumber_iOS_8_0 1140.10
-  #endif
-
-  #define USE_PTHREAD_THREADID_NP                (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_8_0)
-
-#elif TARGET_OS_WATCH || TARGET_OS_TV
-
-// Compiling for watchOS, tvOS
-
-  #define USE_PTHREAD_THREADID_NP                YES
-
-#else
-
-// Compiling for Mac OS X
-
-  #ifndef kCFCoreFoundationVersionNumber10_10
-    #define kCFCoreFoundationVersionNumber10_10    1151.16
-  #endif
-
-  #define USE_PTHREAD_THREADID_NP                (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber10_10)
-
-#endif /* if TARGET_OS_IOS */
-
 - (instancetype)init {
     self = [super init];
     return self;
@@ -1145,12 +1037,11 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_
         _options      = options;
         _timestamp    = timestamp ?: [NSDate new];
 
-        if (USE_PTHREAD_THREADID_NP) {
-            __uint64_t tid;
-            pthread_threadid_np(NULL, &tid);
+        __uint64_t tid;
+        if (pthread_threadid_np(NULL, &tid) == 0) {
             _threadID = [[NSString alloc] initWithFormat:@"%llu", tid];
         } else {
-            _threadID = [[NSString alloc] initWithFormat:@"%x", pthread_mach_thread_np(pthread_self())];
+            _threadID = @"missing threadId";
         }
         _threadName   = NSThread.currentThread.name;
 
@@ -1163,17 +1054,7 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_
         }
         
         // Try to get the current queue's label
-        if (USE_DISPATCH_CURRENT_QUEUE_LABEL) {
-            _queueLabel = [[NSString alloc] initWithFormat:@"%s", dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL)];
-        } else if (USE_DISPATCH_GET_CURRENT_QUEUE) {
-            #pragma clang diagnostic push
-            #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-            dispatch_queue_t currentQueue = dispatch_get_current_queue();
-            #pragma clang diagnostic pop
-            _queueLabel = [[NSString alloc] initWithFormat:@"%s", dispatch_queue_get_label(currentQueue)];
-        } else {
-            _queueLabel = @""; // iOS 6.x only
-        }
+        _queueLabel = [[NSString alloc] initWithFormat:@"%s", dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL)];
     }
     return self;
 }
@@ -1293,7 +1174,7 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_
     //
     // globalLoggingQueue : The queue that all log messages go through before they arrive in our loggerQueue.
     //
-    // All log statements go through the serial gloabalLoggingQueue before they arrive at our loggerQueue.
+    // All log statements go through the serial globalLoggingQueue before they arrive at our loggerQueue.
     // Thus this method also goes through the serial globalLoggingQueue to ensure intuitive operation.
 
     // IMPORTANT NOTE:

Carthage/Checkouts/CocoaLumberjack/Classes/DDLogMacros.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,

Carthage/Checkouts/CocoaLumberjack/Classes/DDOSLogger.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -25,6 +25,7 @@
 /**
  * This class provides a logger for the Apple os_log facility.
  **/
+API_AVAILABLE(macos(10.12), ios(10.0), watchos(3.0), tvos(10.0))
 @interface DDOSLogger : DDAbstractLogger <DDLogger>
 
 /**

Carthage/Checkouts/CocoaLumberjack/Classes/DDOSLogger.m

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -14,12 +14,13 @@
 //   prior written permission of Deusty, LLC.
 
 #import "DDOSLogger.h"
-#import <os/log.h>
 
-static DDOSLogger *sharedInstance;
+#import <os/log.h>
 
 @implementation DDOSLogger
 
+static DDOSLogger *sharedInstance;
+
 + (instancetype)sharedInstance {
     static dispatch_once_t DDOSLoggerOnceToken;
 
@@ -74,8 +75,8 @@ static DDOSLogger *sharedInstance;
 
 }
 
-- (NSString *)loggerName {
-    return @"cocoa.lumberjack.osLogger";
+- (DDLoggerName)loggerName {
+    return DDLoggerNameOS;
 }
 
 @end

Carthage/Checkouts/CocoaLumberjack/Classes/DDTTYLogger.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -133,7 +133,7 @@
  * A logging context is often used to identify log messages coming from a 3rd party framework,
  * although logging context's can be used for many different functions.
  *
- * Use LOG_CONTEXT_ALL to set the deafult color for all contexts that have no specific color set defined.
+ * Use LOG_CONTEXT_ALL to set the default color for all contexts that have no specific color set defined.
  *
  * Logging context's are explained in further detail here:
  * Documentation/CustomContext.md

Carthage/Checkouts/CocoaLumberjack/Classes/DDTTYLogger.m

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -15,7 +15,6 @@
 
 #import "DDTTYLogger.h"
 
-#import <unistd.h>
 #import <sys/uio.h>
 
 #if !__has_feature(objc_arc)
@@ -79,6 +78,11 @@
 
 #define MAP_TO_TERMINAL_APP_COLORS 1
 
+typedef struct {
+  uint8_t r;
+  uint8_t g;
+  uint8_t b;
+} DDRGBColor;
 
 @interface DDTTYLoggerColorProfile : NSObject {
     @public
@@ -157,71 +161,74 @@ static DDTTYLogger *sharedInstance;
         return;
     }
 
-    NSMutableArray *m_codes_fg = [NSMutableArray arrayWithCapacity:16];
-    NSMutableArray *m_codes_bg = [NSMutableArray arrayWithCapacity:16];
     NSMutableArray *m_colors   = [NSMutableArray arrayWithCapacity:16];
 
     // In a standard shell only 16 colors are supported.
     //
     // More information about ansi escape codes can be found online.
     // http://en.wikipedia.org/wiki/ANSI_escape_code
+    codes_fg = @[
+        @"30m",  // normal - black
+        @"31m",  // normal - red
+        @"32m",  // normal - green
+        @"33m",  // normal - yellow
+        @"34m",  // normal - blue
+        @"35m",  // normal - magenta
+        @"36m",  // normal - cyan
+        @"37m",  // normal - gray
+        @"1;30m",  // bright - darkgray
+        @"1;31m",  // bright - red
+        @"1;32m",  // bright - green
+        @"1;33m",  // bright - yellow
+        @"1;34m",  // bright - blue
+        @"1;35m",  // bright - magenta
+        @"1;36m",  // bright - cyan
+        @"1;37m",  // bright - white
+    ];
+
+    codes_bg = @[
+        @"40m",  // normal - black
+        @"41m",  // normal - red
+        @"42m",  // normal - green
+        @"43m",  // normal - yellow
+        @"44m",  // normal - blue
+        @"45m",  // normal - magenta
+        @"46m",  // normal - cyan
+        @"47m",  // normal - gray
+        @"1;40m",  // bright - darkgray
+        @"1;41m",  // bright - red
+        @"1;42m",  // bright - green
+        @"1;43m",  // bright - yellow
+        @"1;44m",  // bright - blue
+        @"1;45m",  // bright - magenta
+        @"1;46m",  // bright - cyan
+        @"1;47m",  // bright - white
+    ];
 
-    [m_codes_fg addObject:@"30m"];   // normal - black
-    [m_codes_fg addObject:@"31m"];   // normal - red
-    [m_codes_fg addObject:@"32m"];   // normal - green
-    [m_codes_fg addObject:@"33m"];   // normal - yellow
-    [m_codes_fg addObject:@"34m"];   // normal - blue
-    [m_codes_fg addObject:@"35m"];   // normal - magenta
-    [m_codes_fg addObject:@"36m"];   // normal - cyan
-    [m_codes_fg addObject:@"37m"];   // normal - gray
-    [m_codes_fg addObject:@"1;30m"]; // bright - darkgray
-    [m_codes_fg addObject:@"1;31m"]; // bright - red
-    [m_codes_fg addObject:@"1;32m"]; // bright - green
-    [m_codes_fg addObject:@"1;33m"]; // bright - yellow
-    [m_codes_fg addObject:@"1;34m"]; // bright - blue
-    [m_codes_fg addObject:@"1;35m"]; // bright - magenta
-    [m_codes_fg addObject:@"1;36m"]; // bright - cyan
-    [m_codes_fg addObject:@"1;37m"]; // bright - white
-
-    [m_codes_bg addObject:@"40m"];   // normal - black
-    [m_codes_bg addObject:@"41m"];   // normal - red
-    [m_codes_bg addObject:@"42m"];   // normal - green
-    [m_codes_bg addObject:@"43m"];   // normal - yellow
-    [m_codes_bg addObject:@"44m"];   // normal - blue
-    [m_codes_bg addObject:@"45m"];   // normal - magenta
-    [m_codes_bg addObject:@"46m"];   // normal - cyan
-    [m_codes_bg addObject:@"47m"];   // normal - gray
-    [m_codes_bg addObject:@"1;40m"]; // bright - darkgray
-    [m_codes_bg addObject:@"1;41m"]; // bright - red
-    [m_codes_bg addObject:@"1;42m"]; // bright - green
-    [m_codes_bg addObject:@"1;43m"]; // bright - yellow
-    [m_codes_bg addObject:@"1;44m"]; // bright - blue
-    [m_codes_bg addObject:@"1;45m"]; // bright - magenta
-    [m_codes_bg addObject:@"1;46m"]; // bright - cyan
-    [m_codes_bg addObject:@"1;47m"]; // bright - white
 
 #if MAP_TO_TERMINAL_APP_COLORS
 
     // Standard Terminal.app colors:
     //
     // These are the default colors used by Apple's Terminal.app.
-
-    [m_colors addObject:DDMakeColor(  0,   0,   0)]; // normal - black
-    [m_colors addObject:DDMakeColor(194,  54,  33)]; // normal - red
-    [m_colors addObject:DDMakeColor( 37, 188,  36)]; // normal - green
-    [m_colors addObject:DDMakeColor(173, 173,  39)]; // normal - yellow
-    [m_colors addObject:DDMakeColor( 73,  46, 225)]; // normal - blue
-    [m_colors addObject:DDMakeColor(211,  56, 211)]; // normal - magenta
-    [m_colors addObject:DDMakeColor( 51, 187, 200)]; // normal - cyan
-    [m_colors addObject:DDMakeColor(203, 204, 205)]; // normal - gray
-    [m_colors addObject:DDMakeColor(129, 131, 131)]; // bright - darkgray
-    [m_colors addObject:DDMakeColor(252,  57,  31)]; // bright - red
-    [m_colors addObject:DDMakeColor( 49, 231,  34)]; // bright - green
-    [m_colors addObject:DDMakeColor(234, 236,  35)]; // bright - yellow
-    [m_colors addObject:DDMakeColor( 88,  51, 255)]; // bright - blue
-    [m_colors addObject:DDMakeColor(249,  53, 248)]; // bright - magenta
-    [m_colors addObject:DDMakeColor( 20, 240, 240)]; // bright - cyan
-    [m_colors addObject:DDMakeColor(233, 235, 235)]; // bright - white
+    DDRGBColor rgbColors[] = {
+        {  0,   0,   0}, // normal - black
+        {194,  54,  33}, // normal - red
+        { 37, 188,  36}, // normal - green
+        {173, 173,  39}, // normal - yellow
+        { 73,  46, 225}, // normal - blue
+        {211,  56, 211}, // normal - magenta
+        { 51, 187, 200}, // normal - cyan
+        {203, 204, 205}, // normal - gray
+        {129, 131, 131}, // bright - darkgray
+        {252,  57,  31}, // bright - red
+        { 49, 231,  34}, // bright - green
+        {234, 236,  35}, // bright - yellow
+        { 88,  51, 255}, // bright - blue
+        {249,  53, 248}, // bright - magenta
+        { 20, 240, 240}, // bright - cyan
+        {233, 235, 235}, // bright - white
+    };
 
 #else /* if MAP_TO_TERMINAL_APP_COLORS */
 
@@ -229,27 +236,29 @@ static DDTTYLogger *sharedInstance;
     //
     // These are the default colors used by most xterm shells.
 
-    [m_colors addObject:DDMakeColor(  0,   0,   0)]; // normal - black
-    [m_colors addObject:DDMakeColor(205,   0,   0)]; // normal - red
-    [m_colors addObject:DDMakeColor(  0, 205,   0)]; // normal - green
-    [m_colors addObject:DDMakeColor(205, 205,   0)]; // normal - yellow
-    [m_colors addObject:DDMakeColor(  0,   0, 238)]; // normal - blue
-    [m_colors addObject:DDMakeColor(205,   0, 205)]; // normal - magenta
-    [m_colors addObject:DDMakeColor(  0, 205, 205)]; // normal - cyan
-    [m_colors addObject:DDMakeColor(229, 229, 229)]; // normal - gray
-    [m_colors addObject:DDMakeColor(127, 127, 127)]; // bright - darkgray
-    [m_colors addObject:DDMakeColor(255,   0,   0)]; // bright - red
-    [m_colors addObject:DDMakeColor(  0, 255,   0)]; // bright - green
-    [m_colors addObject:DDMakeColor(255, 255,   0)]; // bright - yellow
-    [m_colors addObject:DDMakeColor( 92,  92, 255)]; // bright - blue
-    [m_colors addObject:DDMakeColor(255,   0, 255)]; // bright - magenta
-    [m_colors addObject:DDMakeColor(  0, 255, 255)]; // bright - cyan
-    [m_colors addObject:DDMakeColor(255, 255, 255)]; // bright - white
-
+    DDRGBColor rgbColors[] = {
+        {  0,   0,   0}, // normal - black
+        {205,   0,   0}, // normal - red
+        {  0, 205,   0}, // normal - green
+        {205, 205,   0}, // normal - yellow
+        {  0,   0, 238}, // normal - blue
+        {205,   0, 205}, // normal - magenta
+        {  0, 205, 205}, // normal - cyan
+        {229, 229, 229}, // normal - gray
+        {127, 127, 127}, // bright - darkgray
+        {255,   0,   0}, // bright - red
+        {  0, 255,   0}, // bright - green
+        {255, 255,   0}, // bright - yellow
+        { 92,  92, 255}, // bright - blue
+        {255,   0, 255}, // bright - magenta
+        {  0, 255, 255}, // bright - cyan
+        {255, 255, 255}, // bright - white
+    };
 #endif /* if MAP_TO_TERMINAL_APP_COLORS */
 
-    codes_fg = [m_codes_fg copy];
-    codes_bg = [m_codes_bg copy];
+    for (size_t i = 0; i < sizeof(rgbColors) / sizeof(rgbColors[0]); ++i) {
+        [m_colors addObject:DDMakeColor(rgbColors[i].r, rgbColors[i].g, rgbColors[i].b)];
+    }
     colors   = [m_colors   copy];
 
     NSAssert([codes_fg count] == [codes_bg count], @"Invalid colors/codes array(s)");
@@ -298,289 +307,294 @@ static DDTTYLogger *sharedInstance;
     // http://en.wikipedia.org/wiki/ANSI_escape_code
 
     // Colors
+    DDRGBColor rgbColors[] = {
+        { 47,  49,  49},
+        { 60,  42, 144},
+        { 66,  44, 183},
+        { 73,  46, 222},
+        { 81,  50, 253},
+        { 88,  51, 255},
+
+        { 42, 128,  37},
+        { 42, 127, 128},
+        { 44, 126, 169},
+        { 56, 125, 209},
+        { 59, 124, 245},
+        { 66, 123, 255},
+
+        { 51, 163,  41},
+        { 39, 162, 121},
+        { 42, 161, 162},
+        { 53, 160, 202},
+        { 45, 159, 240},
+        { 58, 158, 255},
+
+        { 31, 196,  37},
+        { 48, 196, 115},
+        { 39, 195, 155},
+        { 49, 195, 195},
+        { 32, 194, 235},
+        { 53, 193, 255},
+
+        { 50, 229,  35},
+        { 40, 229, 109},
+        { 27, 229, 149},
+        { 49, 228, 189},
+        { 33, 228, 228},
+        { 53, 227, 255},
+
+        { 27, 254,  30},
+        { 30, 254, 103},
+        { 45, 254, 143},
+        { 38, 253, 182},
+        { 38, 253, 222},
+        { 42, 253, 252},
+
+        {140,  48,  40},
+        {136,  51, 136},
+        {135,  52, 177},
+        {134,  52, 217},
+        {135,  56, 248},
+        {134,  53, 255},
+
+        {125, 125,  38},
+        {124, 125, 125},
+        {122, 124, 166},
+        {123, 124, 207},
+        {123, 122, 247},
+        {124, 121, 255},
+
+        {119, 160,  35},
+        {117, 160, 120},
+        {117, 160, 160},
+        {115, 159, 201},
+        {116, 158, 240},
+        {117, 157, 255},
+
+        {113, 195,  39},
+        {110, 194, 114},
+        {111, 194, 154},
+        {108, 194, 194},
+        {109, 193, 234},
+        {108, 192, 255},
+
+        {105, 228,  30},
+        {103, 228, 109},
+        {105, 228, 148},
+        {100, 227, 188},
+        { 99, 227, 227},
+        { 99, 226, 253},
+
+        { 92, 253,  34},
+        { 96, 253, 103},
+        { 97, 253, 142},
+        { 88, 253, 182},
+        { 93, 253, 221},
+        { 88, 254, 251},
+
+        {177,  53,  34},
+        {174,  54, 131},
+        {172,  55, 172},
+        {171,  57, 213},
+        {170,  55, 249},
+        {170,  57, 255},
+
+        {165, 123,  37},
+        {163, 123, 123},
+        {162, 123, 164},
+        {161, 122, 205},
+        {161, 121, 241},
+        {161, 121, 255},
+
+        {158, 159,  33},
+        {157, 158, 118},
+        {157, 158, 159},
+        {155, 157, 199},
+        {155, 157, 239},
+        {154, 156, 255},
+
+        {152, 193,  40},
+        {151, 193, 113},
+        {150, 193, 153},
+        {150, 192, 193},
+        {148, 192, 232},
+        {149, 191, 253},
+
+        {146, 227,  28},
+        {144, 227, 108},
+        {144, 227, 147},
+        {144, 227, 187},
+        {142, 226, 227},
+        {142, 225, 252},
+
+        {138, 253,  36},
+        {137, 253, 102},
+        {136, 253, 141},
+        {138, 254, 181},
+        {135, 255, 220},
+        {133, 255, 250},
+
+        {214,  57,  30},
+        {211,  59, 126},
+        {209,  57, 168},
+        {208,  55, 208},
+        {207,  58, 247},
+        {206,  61, 255},
+
+        {204, 121,  32},
+        {202, 121, 121},
+        {201, 121, 161},
+        {200, 120, 202},
+        {200, 120, 241},
+        {198, 119, 255},
+
+        {198, 157,  37},
+        {196, 157, 116},
+        {195, 156, 157},
+        {195, 156, 197},
+        {194, 155, 236},
+        {193, 155, 255},
+
+        {191, 192,  36},
+        {190, 191, 112},
+        {189, 191, 152},
+        {189, 191, 191},
+        {188, 190, 230},
+        {187, 190, 253},
+
+        {185, 226,  28},
+        {184, 226, 106},
+        {183, 225, 146},
+        {183, 225, 186},
+        {182, 225, 225},
+        {181, 224, 252},
+
+        {178, 255,  35},
+        {178, 255, 101},
+        {177, 254, 141},
+        {176, 254, 180},
+        {176, 254, 220},
+        {175, 253, 249},
+
+        {247,  56,  30},
+        {245,  57, 122},
+        {243,  59, 163},
+        {244,  60, 204},
+        {242,  59, 241},
+        {240,  55, 255},
+
+        {241, 119,  36},
+        {240, 120, 118},
+        {238, 119, 158},
+        {237, 119, 199},
+        {237, 118, 238},
+        {236, 118, 255},
+
+        {235, 154,  36},
+        {235, 154, 114},
+        {234, 154, 154},
+        {232, 154, 194},
+        {232, 153, 234},
+        {232, 153, 255},
+
+        {230, 190,  30},
+        {229, 189, 110},
+        {228, 189, 150},
+        {227, 189, 190},
+        {227, 189, 229},
+        {226, 188, 255},
+
+        {224, 224,  35},
+        {223, 224, 105},
+        {222, 224, 144},
+        {222, 223, 184},
+        {222, 223, 224},
+        {220, 223, 253},
+
+        {217, 253,  28},
+        {217, 253,  99},
+        {216, 252, 139},
+        {216, 252, 179},
+        {215, 252, 218},
+        {215, 251, 250},
+
+        {255,  61,  30},
+        {255,  60, 118},
+        {255,  58, 159},
+        {255,  56, 199},
+        {255,  55, 238},
+        {255,  59, 255},
+
+        {255, 117,  29},
+        {255, 117, 115},
+        {255, 117, 155},
+        {255, 117, 195},
+        {255, 116, 235},
+        {254, 116, 255},
+
+        {255, 152,  27},
+        {255, 152, 111},
+        {254, 152, 152},
+        {255, 152, 192},
+        {254, 151, 231},
+        {253, 151, 253},
+
+        {255, 187,  33},
+        {253, 187, 107},
+        {252, 187, 148},
+        {253, 187, 187},
+        {254, 187, 227},
+        {252, 186, 252},
+
+        {252, 222,  34},
+        {251, 222, 103},
+        {251, 222, 143},
+        {250, 222, 182},
+        {251, 221, 222},
+        {252, 221, 252},
+
+        {251, 252,  15},
+        {251, 252,  97},
+        {249, 252, 137},
+        {247, 252, 177},
+        {247, 253, 217},
+        {254, 255, 255},
+
+        // Grayscale
+
+        { 52,  53,  53},
+        { 57,  58,  59},
+        { 66,  67,  67},
+        { 75,  76,  76},
+        { 83,  85,  85},
+        { 92,  93,  94},
+
+        {101, 102, 102},
+        {109, 111, 111},
+        {118, 119, 119},
+        {126, 127, 128},
+        {134, 136, 136},
+        {143, 144, 145},
+
+        {151, 152, 153},
+        {159, 161, 161},
+        {167, 169, 169},
+        {176, 177, 177},
+        {184, 185, 186},
+        {192, 193, 194},
+
+        {200, 201, 202},
+        {208, 209, 210},
+        {216, 218, 218},
+        {224, 226, 226},
+        {232, 234, 234},
+        {240, 242, 242},
+    };
+
+    for (size_t i = 0; i < sizeof(rgbColors) / sizeof(rgbColors[0]); ++i) {
+        [m_colors addObject:DDMakeColor(rgbColors[i].r, rgbColors[i].g, rgbColors[i].b)];
+    }
 
-    [m_colors addObject:DDMakeColor( 47,  49,  49)];
-    [m_colors addObject:DDMakeColor( 60,  42, 144)];
-    [m_colors addObject:DDMakeColor( 66,  44, 183)];
-    [m_colors addObject:DDMakeColor( 73,  46, 222)];
-    [m_colors addObject:DDMakeColor( 81,  50, 253)];
-    [m_colors addObject:DDMakeColor( 88,  51, 255)];
-    
-    [m_colors addObject:DDMakeColor( 42, 128,  37)];
-    [m_colors addObject:DDMakeColor( 42, 127, 128)];
-    [m_colors addObject:DDMakeColor( 44, 126, 169)];
-    [m_colors addObject:DDMakeColor( 56, 125, 209)];
-    [m_colors addObject:DDMakeColor( 59, 124, 245)];
-    [m_colors addObject:DDMakeColor( 66, 123, 255)];
-    
-    [m_colors addObject:DDMakeColor( 51, 163,  41)];
-    [m_colors addObject:DDMakeColor( 39, 162, 121)];
-    [m_colors addObject:DDMakeColor( 42, 161, 162)];
-    [m_colors addObject:DDMakeColor( 53, 160, 202)];
-    [m_colors addObject:DDMakeColor( 45, 159, 240)];
-    [m_colors addObject:DDMakeColor( 58, 158, 255)];
-    
-    [m_colors addObject:DDMakeColor( 31, 196,  37)];
-    [m_colors addObject:DDMakeColor( 48, 196, 115)];
-    [m_colors addObject:DDMakeColor( 39, 195, 155)];
-    [m_colors addObject:DDMakeColor( 49, 195, 195)];
-    [m_colors addObject:DDMakeColor( 32, 194, 235)];
-    [m_colors addObject:DDMakeColor( 53, 193, 255)];
-    
-    [m_colors addObject:DDMakeColor( 50, 229,  35)];
-    [m_colors addObject:DDMakeColor( 40, 229, 109)];
-    [m_colors addObject:DDMakeColor( 27, 229, 149)];
-    [m_colors addObject:DDMakeColor( 49, 228, 189)];
-    [m_colors addObject:DDMakeColor( 33, 228, 228)];
-    [m_colors addObject:DDMakeColor( 53, 227, 255)];
-    
-    [m_colors addObject:DDMakeColor( 27, 254,  30)];
-    [m_colors addObject:DDMakeColor( 30, 254, 103)];
-    [m_colors addObject:DDMakeColor( 45, 254, 143)];
-    [m_colors addObject:DDMakeColor( 38, 253, 182)];
-    [m_colors addObject:DDMakeColor( 38, 253, 222)];
-    [m_colors addObject:DDMakeColor( 42, 253, 252)];
-    
-    [m_colors addObject:DDMakeColor(140,  48,  40)];
-    [m_colors addObject:DDMakeColor(136,  51, 136)];
-    [m_colors addObject:DDMakeColor(135,  52, 177)];
-    [m_colors addObject:DDMakeColor(134,  52, 217)];
-    [m_colors addObject:DDMakeColor(135,  56, 248)];
-    [m_colors addObject:DDMakeColor(134,  53, 255)];
-    
-    [m_colors addObject:DDMakeColor(125, 125,  38)];
-    [m_colors addObject:DDMakeColor(124, 125, 125)];
-    [m_colors addObject:DDMakeColor(122, 124, 166)];
-    [m_colors addObject:DDMakeColor(123, 124, 207)];
-    [m_colors addObject:DDMakeColor(123, 122, 247)];
-    [m_colors addObject:DDMakeColor(124, 121, 255)];
-    
-    [m_colors addObject:DDMakeColor(119, 160,  35)];
-    [m_colors addObject:DDMakeColor(117, 160, 120)];
-    [m_colors addObject:DDMakeColor(117, 160, 160)];
-    [m_colors addObject:DDMakeColor(115, 159, 201)];
-    [m_colors addObject:DDMakeColor(116, 158, 240)];
-    [m_colors addObject:DDMakeColor(117, 157, 255)];
-    
-    [m_colors addObject:DDMakeColor(113, 195,  39)];
-    [m_colors addObject:DDMakeColor(110, 194, 114)];
-    [m_colors addObject:DDMakeColor(111, 194, 154)];
-    [m_colors addObject:DDMakeColor(108, 194, 194)];
-    [m_colors addObject:DDMakeColor(109, 193, 234)];
-    [m_colors addObject:DDMakeColor(108, 192, 255)];
-    
-    [m_colors addObject:DDMakeColor(105, 228,  30)];
-    [m_colors addObject:DDMakeColor(103, 228, 109)];
-    [m_colors addObject:DDMakeColor(105, 228, 148)];
-    [m_colors addObject:DDMakeColor(100, 227, 188)];
-    [m_colors addObject:DDMakeColor( 99, 227, 227)];
-    [m_colors addObject:DDMakeColor( 99, 226, 253)];
-    
-    [m_colors addObject:DDMakeColor( 92, 253,  34)];
-    [m_colors addObject:DDMakeColor( 96, 253, 103)];
-    [m_colors addObject:DDMakeColor( 97, 253, 142)];
-    [m_colors addObject:DDMakeColor( 88, 253, 182)];
-    [m_colors addObject:DDMakeColor( 93, 253, 221)];
-    [m_colors addObject:DDMakeColor( 88, 254, 251)];
-    
-    [m_colors addObject:DDMakeColor(177,  53,  34)];
-    [m_colors addObject:DDMakeColor(174,  54, 131)];
-    [m_colors addObject:DDMakeColor(172,  55, 172)];
-    [m_colors addObject:DDMakeColor(171,  57, 213)];
-    [m_colors addObject:DDMakeColor(170,  55, 249)];
-    [m_colors addObject:DDMakeColor(170,  57, 255)];
-    
-    [m_colors addObject:DDMakeColor(165, 123,  37)];
-    [m_colors addObject:DDMakeColor(163, 123, 123)];
-    [m_colors addObject:DDMakeColor(162, 123, 164)];
-    [m_colors addObject:DDMakeColor(161, 122, 205)];
-    [m_colors addObject:DDMakeColor(161, 121, 241)];
-    [m_colors addObject:DDMakeColor(161, 121, 255)];
-    
-    [m_colors addObject:DDMakeColor(158, 159,  33)];
-    [m_colors addObject:DDMakeColor(157, 158, 118)];
-    [m_colors addObject:DDMakeColor(157, 158, 159)];
-    [m_colors addObject:DDMakeColor(155, 157, 199)];
-    [m_colors addObject:DDMakeColor(155, 157, 239)];
-    [m_colors addObject:DDMakeColor(154, 156, 255)];
-    
-    [m_colors addObject:DDMakeColor(152, 193,  40)];
-    [m_colors addObject:DDMakeColor(151, 193, 113)];
-    [m_colors addObject:DDMakeColor(150, 193, 153)];
-    [m_colors addObject:DDMakeColor(150, 192, 193)];
-    [m_colors addObject:DDMakeColor(148, 192, 232)];
-    [m_colors addObject:DDMakeColor(149, 191, 253)];
-    
-    [m_colors addObject:DDMakeColor(146, 227,  28)];
-    [m_colors addObject:DDMakeColor(144, 227, 108)];
-    [m_colors addObject:DDMakeColor(144, 227, 147)];
-    [m_colors addObject:DDMakeColor(144, 227, 187)];
-    [m_colors addObject:DDMakeColor(142, 226, 227)];
-    [m_colors addObject:DDMakeColor(142, 225, 252)];
-    
-    [m_colors addObject:DDMakeColor(138, 253,  36)];
-    [m_colors addObject:DDMakeColor(137, 253, 102)];
-    [m_colors addObject:DDMakeColor(136, 253, 141)];
-    [m_colors addObject:DDMakeColor(138, 254, 181)];
-    [m_colors addObject:DDMakeColor(135, 255, 220)];
-    [m_colors addObject:DDMakeColor(133, 255, 250)];
-    
-    [m_colors addObject:DDMakeColor(214,  57,  30)];
-    [m_colors addObject:DDMakeColor(211,  59, 126)];
-    [m_colors addObject:DDMakeColor(209,  57, 168)];
-    [m_colors addObject:DDMakeColor(208,  55, 208)];
-    [m_colors addObject:DDMakeColor(207,  58, 247)];
-    [m_colors addObject:DDMakeColor(206,  61, 255)];
-    
-    [m_colors addObject:DDMakeColor(204, 121,  32)];
-    [m_colors addObject:DDMakeColor(202, 121, 121)];
-    [m_colors addObject:DDMakeColor(201, 121, 161)];
-    [m_colors addObject:DDMakeColor(200, 120, 202)];
-    [m_colors addObject:DDMakeColor(200, 120, 241)];
-    [m_colors addObject:DDMakeColor(198, 119, 255)];
-    
-    [m_colors addObject:DDMakeColor(198, 157,  37)];
-    [m_colors addObject:DDMakeColor(196, 157, 116)];
-    [m_colors addObject:DDMakeColor(195, 156, 157)];
-    [m_colors addObject:DDMakeColor(195, 156, 197)];
-    [m_colors addObject:DDMakeColor(194, 155, 236)];
-    [m_colors addObject:DDMakeColor(193, 155, 255)];
-    
-    [m_colors addObject:DDMakeColor(191, 192,  36)];
-    [m_colors addObject:DDMakeColor(190, 191, 112)];
-    [m_colors addObject:DDMakeColor(189, 191, 152)];
-    [m_colors addObject:DDMakeColor(189, 191, 191)];
-    [m_colors addObject:DDMakeColor(188, 190, 230)];
-    [m_colors addObject:DDMakeColor(187, 190, 253)];
-    
-    [m_colors addObject:DDMakeColor(185, 226,  28)];
-    [m_colors addObject:DDMakeColor(184, 226, 106)];
-    [m_colors addObject:DDMakeColor(183, 225, 146)];
-    [m_colors addObject:DDMakeColor(183, 225, 186)];
-    [m_colors addObject:DDMakeColor(182, 225, 225)];
-    [m_colors addObject:DDMakeColor(181, 224, 252)];
-    
-    [m_colors addObject:DDMakeColor(178, 255,  35)];
-    [m_colors addObject:DDMakeColor(178, 255, 101)];
-    [m_colors addObject:DDMakeColor(177, 254, 141)];
-    [m_colors addObject:DDMakeColor(176, 254, 180)];
-    [m_colors addObject:DDMakeColor(176, 254, 220)];
-    [m_colors addObject:DDMakeColor(175, 253, 249)];
-    
-    [m_colors addObject:DDMakeColor(247,  56,  30)];
-    [m_colors addObject:DDMakeColor(245,  57, 122)];
-    [m_colors addObject:DDMakeColor(243,  59, 163)];
-    [m_colors addObject:DDMakeColor(244,  60, 204)];
-    [m_colors addObject:DDMakeColor(242,  59, 241)];
-    [m_colors addObject:DDMakeColor(240,  55, 255)];
-    
-    [m_colors addObject:DDMakeColor(241, 119,  36)];
-    [m_colors addObject:DDMakeColor(240, 120, 118)];
-    [m_colors addObject:DDMakeColor(238, 119, 158)];
-    [m_colors addObject:DDMakeColor(237, 119, 199)];
-    [m_colors addObject:DDMakeColor(237, 118, 238)];
-    [m_colors addObject:DDMakeColor(236, 118, 255)];
-    
-    [m_colors addObject:DDMakeColor(235, 154,  36)];
-    [m_colors addObject:DDMakeColor(235, 154, 114)];
-    [m_colors addObject:DDMakeColor(234, 154, 154)];
-    [m_colors addObject:DDMakeColor(232, 154, 194)];
-    [m_colors addObject:DDMakeColor(232, 153, 234)];
-    [m_colors addObject:DDMakeColor(232, 153, 255)];
-    
-    [m_colors addObject:DDMakeColor(230, 190,  30)];
-    [m_colors addObject:DDMakeColor(229, 189, 110)];
-    [m_colors addObject:DDMakeColor(228, 189, 150)];
-    [m_colors addObject:DDMakeColor(227, 189, 190)];
-    [m_colors addObject:DDMakeColor(227, 189, 229)];
-    [m_colors addObject:DDMakeColor(226, 188, 255)];
-    
-    [m_colors addObject:DDMakeColor(224, 224,  35)];
-    [m_colors addObject:DDMakeColor(223, 224, 105)];
-    [m_colors addObject:DDMakeColor(222, 224, 144)];
-    [m_colors addObject:DDMakeColor(222, 223, 184)];
-    [m_colors addObject:DDMakeColor(222, 223, 224)];
-    [m_colors addObject:DDMakeColor(220, 223, 253)];
-    
-    [m_colors addObject:DDMakeColor(217, 253,  28)];
-    [m_colors addObject:DDMakeColor(217, 253,  99)];
-    [m_colors addObject:DDMakeColor(216, 252, 139)];
-    [m_colors addObject:DDMakeColor(216, 252, 179)];
-    [m_colors addObject:DDMakeColor(215, 252, 218)];
-    [m_colors addObject:DDMakeColor(215, 251, 250)];
-    
-    [m_colors addObject:DDMakeColor(255,  61,  30)];
-    [m_colors addObject:DDMakeColor(255,  60, 118)];
-    [m_colors addObject:DDMakeColor(255,  58, 159)];
-    [m_colors addObject:DDMakeColor(255,  56, 199)];
-    [m_colors addObject:DDMakeColor(255,  55, 238)];
-    [m_colors addObject:DDMakeColor(255,  59, 255)];
-    
-    [m_colors addObject:DDMakeColor(255, 117,  29)];
-    [m_colors addObject:DDMakeColor(255, 117, 115)];
-    [m_colors addObject:DDMakeColor(255, 117, 155)];
-    [m_colors addObject:DDMakeColor(255, 117, 195)];
-    [m_colors addObject:DDMakeColor(255, 116, 235)];
-    [m_colors addObject:DDMakeColor(254, 116, 255)];
-    
-    [m_colors addObject:DDMakeColor(255, 152,  27)];
-    [m_colors addObject:DDMakeColor(255, 152, 111)];
-    [m_colors addObject:DDMakeColor(254, 152, 152)];
-    [m_colors addObject:DDMakeColor(255, 152, 192)];
-    [m_colors addObject:DDMakeColor(254, 151, 231)];
-    [m_colors addObject:DDMakeColor(253, 151, 253)];
-    
-    [m_colors addObject:DDMakeColor(255, 187,  33)];
-    [m_colors addObject:DDMakeColor(253, 187, 107)];
-    [m_colors addObject:DDMakeColor(252, 187, 148)];
-    [m_colors addObject:DDMakeColor(253, 187, 187)];
-    [m_colors addObject:DDMakeColor(254, 187, 227)];
-    [m_colors addObject:DDMakeColor(252, 186, 252)];
-    
-    [m_colors addObject:DDMakeColor(252, 222,  34)];
-    [m_colors addObject:DDMakeColor(251, 222, 103)];
-    [m_colors addObject:DDMakeColor(251, 222, 143)];
-    [m_colors addObject:DDMakeColor(250, 222, 182)];
-    [m_colors addObject:DDMakeColor(251, 221, 222)];
-    [m_colors addObject:DDMakeColor(252, 221, 252)];
-    
-    [m_colors addObject:DDMakeColor(251, 252,  15)];
-    [m_colors addObject:DDMakeColor(251, 252,  97)];
-    [m_colors addObject:DDMakeColor(249, 252, 137)];
-    [m_colors addObject:DDMakeColor(247, 252, 177)];
-    [m_colors addObject:DDMakeColor(247, 253, 217)];
-    [m_colors addObject:DDMakeColor(254, 255, 255)];
-    
-    // Grayscale
-    
-    [m_colors addObject:DDMakeColor( 52,  53,  53)];
-    [m_colors addObject:DDMakeColor( 57,  58,  59)];
-    [m_colors addObject:DDMakeColor( 66,  67,  67)];
-    [m_colors addObject:DDMakeColor( 75,  76,  76)];
-    [m_colors addObject:DDMakeColor( 83,  85,  85)];
-    [m_colors addObject:DDMakeColor( 92,  93,  94)];
-    
-    [m_colors addObject:DDMakeColor(101, 102, 102)];
-    [m_colors addObject:DDMakeColor(109, 111, 111)];
-    [m_colors addObject:DDMakeColor(118, 119, 119)];
-    [m_colors addObject:DDMakeColor(126, 127, 128)];
-    [m_colors addObject:DDMakeColor(134, 136, 136)];
-    [m_colors addObject:DDMakeColor(143, 144, 145)];
-    
-    [m_colors addObject:DDMakeColor(151, 152, 153)];
-    [m_colors addObject:DDMakeColor(159, 161, 161)];
-    [m_colors addObject:DDMakeColor(167, 169, 169)];
-    [m_colors addObject:DDMakeColor(176, 177, 177)];
-    [m_colors addObject:DDMakeColor(184, 185, 186)];
-    [m_colors addObject:DDMakeColor(192, 193, 194)];
-    
-    [m_colors addObject:DDMakeColor(200, 201, 202)];
-    [m_colors addObject:DDMakeColor(208, 209, 210)];
-    [m_colors addObject:DDMakeColor(216, 218, 218)];
-    [m_colors addObject:DDMakeColor(224, 226, 226)];
-    [m_colors addObject:DDMakeColor(232, 234, 234)];
-    [m_colors addObject:DDMakeColor(240, 242, 242)];
-    
     // Color codes
 
     int index = 16;
@@ -819,7 +833,7 @@ static DDTTYLogger *sharedInstance;
     }
 
     if ((self = [super init])) {
-        // Initialze 'app' variable (char *)
+        // Initialize 'app' variable (char *)
 
         _appName = [[NSProcessInfo processInfo] processName];
 
@@ -1352,8 +1366,8 @@ static DDTTYLogger *sharedInstance;
     }
 }
 
-- (NSString *)loggerName {
-    return @"cocoa.lumberjack.ttyLogger";
+- (DDLoggerName)loggerName {
+    return DDLoggerNameTTY;
 }
 
 @end

Carthage/Checkouts/CocoaLumberjack/Classes/Extensions/DDContextFilterLogFormatter.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -53,14 +53,14 @@
  *
  *  @param loggingContext the context
  */
-- (void)addToWhitelist:(NSUInteger)loggingContext;
+- (void)addToWhitelist:(NSInteger)loggingContext;
 
 /**
  *  Remove context from whitelist
  *
  *  @param loggingContext the context
  */
-- (void)removeFromWhitelist:(NSUInteger)loggingContext;
+- (void)removeFromWhitelist:(NSInteger)loggingContext;
 
 /**
  *  Return the whitelist
@@ -72,7 +72,7 @@
  *
  *  @param loggingContext the context
  */
-- (BOOL)isOnWhitelist:(NSUInteger)loggingContext;
+- (BOOL)isOnWhitelist:(NSInteger)loggingContext;
 
 @end
 
@@ -92,14 +92,14 @@
  *
  *  @param loggingContext the context
  */
-- (void)addToBlacklist:(NSUInteger)loggingContext;
+- (void)addToBlacklist:(NSInteger)loggingContext;
 
 /**
  *  Remove context from blacklist
  *
  *  @param loggingContext the context
  */
-- (void)removeFromBlacklist:(NSUInteger)loggingContext;
+- (void)removeFromBlacklist:(NSInteger)loggingContext;
 
 /**
  *  Return the blacklist
@@ -112,6 +112,6 @@
  *
  *  @param loggingContext the context
  */
-- (BOOL)isOnBlacklist:(NSUInteger)loggingContext;
+- (BOOL)isOnBlacklist:(NSInteger)loggingContext;
 
 @end

Carthage/Checkouts/CocoaLumberjack/Classes/Extensions/DDContextFilterLogFormatter.m

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -22,12 +22,12 @@
 
 @interface DDLoggingContextSet : NSObject
 
-- (void)addToSet:(NSUInteger)loggingContext;
-- (void)removeFromSet:(NSUInteger)loggingContext;
+- (void)addToSet:(NSInteger)loggingContext;
+- (void)removeFromSet:(NSInteger)loggingContext;
 
 @property (readonly, copy) NSArray *currentSet;
 
-- (BOOL)isInSet:(NSUInteger)loggingContext;
+- (BOOL)isInSet:(NSInteger)loggingContext;
 
 @end
 
@@ -52,11 +52,11 @@
     return self;
 }
 
-- (void)addToWhitelist:(NSUInteger)loggingContext {
+- (void)addToWhitelist:(NSInteger)loggingContext {
     [_contextSet addToSet:loggingContext];
 }
 
-- (void)removeFromWhitelist:(NSUInteger)loggingContext {
+- (void)removeFromWhitelist:(NSInteger)loggingContext {
     [_contextSet removeFromSet:loggingContext];
 }
 
@@ -64,7 +64,7 @@
     return [_contextSet currentSet];
 }
 
-- (BOOL)isOnWhitelist:(NSUInteger)loggingContext {
+- (BOOL)isOnWhitelist:(NSInteger)loggingContext {
     return [_contextSet isInSet:loggingContext];
 }
 
@@ -99,11 +99,11 @@
     return self;
 }
 
-- (void)addToBlacklist:(NSUInteger)loggingContext {
+- (void)addToBlacklist:(NSInteger)loggingContext {
     [_contextSet addToSet:loggingContext];
 }
 
-- (void)removeFromBlacklist:(NSUInteger)loggingContext {
+- (void)removeFromBlacklist:(NSInteger)loggingContext {
     [_contextSet removeFromSet:loggingContext];
 }
 
@@ -111,7 +111,7 @@
     return [_contextSet currentSet];
 }
 
-- (BOOL)isOnBlacklist:(NSUInteger)loggingContext {
+- (BOOL)isOnBlacklist:(NSInteger)loggingContext {
     return [_contextSet isInSet:loggingContext];
 }
 
@@ -153,7 +153,7 @@
     pthread_mutex_destroy(&_mutex);
 }
 
-- (void)addToSet:(NSUInteger)loggingContext {
+- (void)addToSet:(NSInteger)loggingContext {
     pthread_mutex_lock(&_mutex);
     {
         [_set addObject:@(loggingContext)];
@@ -161,7 +161,7 @@
     pthread_mutex_unlock(&_mutex);
 }
 
-- (void)removeFromSet:(NSUInteger)loggingContext {
+- (void)removeFromSet:(NSInteger)loggingContext {
     pthread_mutex_lock(&_mutex);
     {
         [_set removeObject:@(loggingContext)];
@@ -181,7 +181,7 @@
     return result;
 }
 
-- (BOOL)isInSet:(NSUInteger)loggingContext {
+- (BOOL)isInSet:(NSInteger)loggingContext {
     BOOL result = NO;
 
     pthread_mutex_lock(&_mutex);

Carthage/Checkouts/CocoaLumberjack/Classes/Extensions/DDDispatchQueueLogFormatter.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -14,7 +14,6 @@
 //   prior written permission of Deusty, LLC.
 
 #import <Foundation/Foundation.h>
-#import <libkern/OSAtomic.h>
 
 // Disable legacy macros
 #ifndef DD_LEGACY_MACROS
@@ -176,3 +175,17 @@ typedef NS_ENUM(NSUInteger, DDDispatchQueueLogFormatterMode){
 - (NSString *)formatLogMessage:(DDLogMessage *)logMessage;
 
 @end
+
+#pragma mark - DDAtomicCounter
+
+@protocol DDAtomicCountable <NSObject>
+
+- (instancetype)initWithDefaultValue:(int32_t)defaultValue;
+- (int32_t)increment;
+- (int32_t)decrement;
+- (int32_t)value;
+
+@end
+
+@interface DDAtomicCounter: NSObject<DDAtomicCountable>
+@end

Carthage/Checkouts/CocoaLumberjack/Classes/Extensions/DDDispatchQueueLogFormatter.m

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -21,11 +21,12 @@
 #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
 #endif
 
+#pragma mark - DDDispatchQueueLogFormatter
+
 @interface DDDispatchQueueLogFormatter () {
     DDDispatchQueueLogFormatterMode _mode;
     NSString *_dateFormatterKey;
-    
-    int32_t _atomicLoggerCount;
+    DDAtomicCounter *_atomicLoggerCounter;
     NSDateFormatter *_threadUnsafeDateFormatter; // Use [self stringFromDate]
     
     pthread_mutex_t _mutex;
@@ -57,7 +58,7 @@
         // now `cls` is the class that provides implementation for `configureDateFormatter:`
         _dateFormatterKey = [NSString stringWithFormat:@"%s_NSDateFormatter", class_getName(cls)];
 
-        _atomicLoggerCount = 0;
+        _atomicLoggerCounter = [[DDAtomicCounter alloc] initWithDefaultValue:0];
         _threadUnsafeDateFormatter = nil;
 
         _minQueueLength = 0;
@@ -130,12 +131,7 @@
     [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss:SSS"];
     [dateFormatter setLocale:[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]];
 
-    NSString *calendarIdentifier = nil;
-#if defined(__IPHONE_8_0) || defined(__MAC_10_10)
-    calendarIdentifier = NSCalendarIdentifierGregorian;
-#else
-    calendarIdentifier = NSGregorianCalendar;
-#endif
+    NSString *calendarIdentifier = NSCalendarIdentifierGregorian;
 
     [dateFormatter setCalendar:[[NSCalendar alloc] initWithCalendarIdentifier:calendarIdentifier]];
 }
@@ -192,7 +188,8 @@
             @"com.apple.root.high-priority",
             @"com.apple.root.low-overcommit-priority",
             @"com.apple.root.default-overcommit-priority",
-            @"com.apple.root.high-overcommit-priority"
+            @"com.apple.root.high-overcommit-priority",
+            @"com.apple.root.default-qos.overcommit"
         ];
 
         for (NSString * name in names) {
@@ -269,13 +266,65 @@
 }
 
 - (void)didAddToLogger:(id <DDLogger>  __attribute__((unused)))logger {
-    int32_t count = 0;
-    count = OSAtomicIncrement32(&_atomicLoggerCount);
-    NSAssert(count <= 1 || _mode == DDDispatchQueueLogFormatterModeShareble, @"Can't reuse formatter with multiple loggers in non-shareable mode.");
+    NSAssert([_atomicLoggerCounter increment] <= 1 || _mode == DDDispatchQueueLogFormatterModeShareble, @"Can't reuse formatter with multiple loggers in non-shareable mode.");
 }
 
 - (void)willRemoveFromLogger:(id <DDLogger> __attribute__((unused)))logger {
-    OSAtomicDecrement32(&_atomicLoggerCount);
+    [_atomicLoggerCounter decrement];
 }
 
 @end
+
+#pragma mark - DDAtomicCounter
+
+#define DD_OSATOMIC_API_DEPRECATED (TARGET_OS_OSX && MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (TARGET_OS_WATCH && __WATCH_OS_VERSION_MIN_REQUIRED >= 30000) || (TARGET_OS_TV && __TV_OS_VERSION_MIN_REQUIRED >= 100000)
+
+#if DD_OSATOMIC_API_DEPRECATED
+#import <stdatomic.h>
+#else
+#import <libkern/OSAtomic.h>
+#endif
+
+@interface DDAtomicCounter() {
+#if DD_OSATOMIC_API_DEPRECATED
+    _Atomic(int32_t) _value;
+#else
+    int32_t _value;
+#endif
+}
+@end
+
+@implementation DDAtomicCounter
+
+- (instancetype)initWithDefaultValue:(int32_t)defaultValue {
+    if ((self = [super init])) {
+        _value = defaultValue;
+    }
+    return self;
+}
+
+- (int32_t)value {
+    return _value;
+}
+
+#if DD_OSATOMIC_API_DEPRECATED
+- (int32_t)increment {
+    atomic_fetch_add_explicit(&_value, 1, memory_order_relaxed);
+    return _value;
+}
+
+- (int32_t)decrement {
+    atomic_fetch_sub_explicit(&_value, 1, memory_order_relaxed);
+    return _value;
+}
+#else
+- (int32_t)increment {
+    return OSAtomicIncrement32(&_value);
+}
+
+- (int32_t)decrement {
+    return OSAtomicDecrement32(&_value);
+}
+#endif
+
+@end

Carthage/Checkouts/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.h

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,

Carthage/Checkouts/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m

@@ -1,6 +1,6 @@
 // Software License Agreement (BSD License)
 //
-// Copyright (c) 2010-2016, Deusty, LLC
+// Copyright (c) 2010-2018, Deusty, LLC
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
@@ -15,27 +15,6 @@
 
 #import "DDMultiFormatter.h"
 
-
-#if TARGET_OS_IOS
-// Compiling for iOS
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000 // iOS 6.0 or later
-#define NEEDS_DISPATCH_RETAIN_RELEASE 0
-#else                                         // iOS 5.X or earlier
-#define NEEDS_DISPATCH_RETAIN_RELEASE 1
-#endif
-#elif TARGET_OS_WATCH || TARGET_OS_TV
-// Compiling for watchOS, tvOS
-#define NEEDS_DISPATCH_RETAIN_RELEASE 0
-#else
-// Compiling for Mac OS X
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080     // Mac OS X 10.8 or later
-#define NEEDS_DISPATCH_RETAIN_RELEASE 0
-#else                                         // Mac OS X 10.7 or earlier
-#define NEEDS_DISPATCH_RETAIN_RELEASE 1
-#endif
-#endif
-
-
 #if !__has_feature(objc_arc)
 #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
 #endif
@@ -57,24 +36,13 @@
     self = [super init];
 
     if (self) {
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
         _queue = dispatch_queue_create("cocoa.lumberjack.multiformatter", DISPATCH_QUEUE_CONCURRENT);
-#else
-        _queue = dispatch_queue_create("cocoa.lumberjack.multiformatter", NULL);
-#endif
         _formatters = [NSMutableArray new];
     }
 
     return self;
 }
 
-#if NEEDS_DISPATCH_RETAIN_RELEASE
-- (void)dealloc {
-    dispatch_release(_queue);
-}
-
-#endif
-
 #pragma mark Processing
 
 - (NSString *)formatLogMessage:(DDLogMessage *)logMessage {

Carthage/Checkouts/CocoaLumberjack/CocoaLumberjack.podspec

@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name     = 'CocoaLumberjack'
-  s.version  = '3.4.2'
+  s.version  = '3.5.1'
   s.license  = 'BSD'
   s.summary  = 'A fast & simple, yet powerful & flexible logging framework for Mac and iOS.'
   s.homepage = 'https://github.com/CocoaLumberjack/CocoaLumberjack'
@@ -17,45 +17,24 @@ Pod::Spec.new do |s|
 
   s.requires_arc   = true
 
-  s.preserve_paths = 'README.md', 'Classes/CocoaLumberjack.swift', 'Framework/Lumberjack/CocoaLumberjack.modulemap'
-  
-  s.ios.deployment_target     = '6.0'
-  s.osx.deployment_target     = '10.8'
-  s.watchos.deployment_target = '2.0'
-  s.tvos.deployment_target    = '9.0'
+  s.preserve_paths = 'README.md'
 
-  s.default_subspecs = 'Default', 'Extensions'
+  s.ios.deployment_target     = '8.0'
+  s.osx.deployment_target     = '10.10'
+  s.watchos.deployment_target = '3.0'
+  s.tvos.deployment_target    = '9.0'
+  s.swift_version = '4.2'
 
-  s.subspec 'Default' do |ss|
-    ss.source_files         = 'Classes/CocoaLumberjack.h', 'Classes/DD*.{h,m}'
-    ss.public_header_files  = 'Classes/CocoaLumberjack.h', 'Classes/DD*.h'
-  end
+  s.default_subspecs = 'Core'
 
   s.subspec 'Core' do |ss|
-    ss.source_files         = 'Classes/DD*.{h,m}'
-    ss.public_header_files  = 'Classes/DD*.h'
-  end
-
-  s.subspec 'Extensions' do |ss|
-    ss.dependency 'CocoaLumberjack/Default'
-    ss.source_files         = 'Classes/Extensions/*.{h,m}'
-    ss.public_header_files  = 'Classes/Extensions/*.h'
-  end
-  
-  s.subspec 'CLI' do |ss|
-    ss.osx.deployment_target    = '10.8'
-    ss.osx.dependency 'CocoaLumberjack/Default'
-    ss.osx.source_files         = 'Classes/CLI/*.{h,m}'
-    ss.osx.public_header_files  = 'Classes/CLI/*.h'
+    ss.source_files         = 'Classes/CocoaLumberjack.h', 'Classes/DD*.{h,m}', 'Classes/Extensions/*.{h,m}', 'Classes/CLI/*.{h,m}'
+    ss.private_header_files = 'Classes/DD*Internal.{h}'
   end
 
   s.subspec 'Swift' do |ss|
-    ss.ios.deployment_target      = '8.0'
-    ss.osx.deployment_target      = '10.10'
-    ss.watchos.deployment_target  = '2.0'
-    ss.tvos.deployment_target     = '9.0'
-    ss.dependency 'CocoaLumberjack/Default'
-    ss.source_files               = 'Classes/CocoaLumberjack.swift'
+    ss.dependency 'CocoaLumberjack/Core'
+    ss.source_files        = 'Classes/CocoaLumberjack.swift', 'Classes/DDAssert.swift', 'Classes/SwiftLogLevel.h'
   end
-  
+
 end

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Desktop/BenchmarkMac/AppDelegate.h

@@ -2,7 +2,7 @@
 //  AppDelegate.h
 //  BenchmarkMac
 //
-//  Created by Robbie Hanson on 11/15/11.
+//  CocoaLumberjack Demos
 //
 
 #import <Cocoa/Cocoa.h>

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Desktop/BenchmarkMac/AppDelegate.m

@@ -1,7 +1,13 @@
+//
+//  AppDelegate.m
+//  BenchmarkMac
+//
+//  CocoaLumberjack Demos
+//
+
 #import "AppDelegate.h"
 #import "PerformanceTesting.h"
 
-
 @implementation AppDelegate
 
 @synthesize window = _window;

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Desktop/BenchmarkMac/BenchmarkMac-Prefix.pch

@@ -1,4 +1,10 @@
 //
+//  BenchmarkMac-Prefix.pch
+//  BenchmarkMac
+//
+//  CocoaLumberjack Demos
+//
+//
 // Prefix header for all source files of the 'BenchmarkMac' target in the 'BenchmarkMac' project
 //
 

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Desktop/BenchmarkMac/main.m

@@ -2,7 +2,7 @@
 //  main.m
 //  BenchmarkMac
 //
-//  Created by Robbie Hanson on 11/15/11.
+//  CocoaLumberjack Demos
 //
 
 #import <Cocoa/Cocoa.h>

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Desktop/Podfile

@@ -1,10 +0,0 @@
-
-project 'BenchmarkMac'
-workspace '../../Demos'
-
-target :'BenchmarkMac' do
-  platform :osx, '10.8'
-  use_frameworks!
-  pod 'CocoaLumberjack', :path => '../../../'
-end
-

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Mobile/BenchmarkIPhone_Prefix.pch

@@ -1,4 +1,10 @@
 //
+//  BenchmarkIPhone_Prefix.pch
+//  BenchmarkIPhone
+//
+//  CocoaLumberjack Demos
+//
+//
 // Prefix header for all source files of the 'BenchmarkIPhone' target in the 'BenchmarkIPhone' project
 //
 

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Mobile/Classes/BenchmarkIPhoneAppDelegate.h

@@ -1,8 +1,14 @@
+//
+//  BenchmarkIPhoneAppDelegate.h
+//  BenchmarkIPhone
+//
+//  CocoaLumberjack Demos
+//
+
 #import <UIKit/UIKit.h>
 
 @class BenchmarkIPhoneViewController;
 
-
 @interface BenchmarkIPhoneAppDelegate : NSObject <UIApplicationDelegate>
 {
     UIWindow *window;
@@ -13,4 +19,3 @@
 @property (nonatomic, strong) IBOutlet BenchmarkIPhoneViewController *viewController;
 
 @end
-

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Mobile/Classes/BenchmarkIPhoneAppDelegate.m

@@ -1,14 +1,19 @@
+//
+//  BenchmarkIPhoneAppDelegate.m
+//  BenchmarkIPhone
+//
+//  CocoaLumberjack Demos
+//
+
 #import "BenchmarkIPhoneAppDelegate.h"
 #import "BenchmarkIPhoneViewController.h"
 #import "PerformanceTesting.h"
 
-
 @implementation BenchmarkIPhoneAppDelegate
 
 @synthesize window;
 @synthesize viewController;
 
-
 - (void)applicationDidFinishLaunching:(UIApplication *)application
 {
     window.rootViewController = viewController;
@@ -17,5 +22,4 @@
     [PerformanceTesting startPerformanceTests];
 }
 
-
 @end

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Mobile/Classes/BenchmarkIPhoneViewController.h

@@ -1,10 +1,12 @@
-#import <UIKit/UIKit.h>
+//
+//  BenchmarkIPhoneViewController.h
+//  BenchmarkIPhone
+//
+//  CocoaLumberjack Demos
+//
 
+#import <UIKit/UIKit.h>
 
 @interface BenchmarkIPhoneViewController : UIViewController
-{
-    
-}
 
 @end
-

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Mobile/Classes/BenchmarkIPhoneViewController.m

@@ -1,46 +1,12 @@
-#import "BenchmarkIPhoneViewController.h"
+//
+//  BenchmarkIPhoneViewController.m
+//  BenchmarkIPhone
+//
+//  CocoaLumberjack Demos
+//
 
+#import "BenchmarkIPhoneViewController.h"
 
 @implementation BenchmarkIPhoneViewController
 
-/*
-// The designated initializer. Override to perform setup that is required before the view is loaded.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-/*
-// Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
-}
-*/
-
-
-/*
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-}
-*/
-
-
-/*
-// Override to allow orientations other than the default portrait orientation.
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    // Return YES for supported orientations
-    return (interfaceOrientation == UIInterfaceOrientationPortrait);
-}
-*/
-
-- (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
 @end

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Mobile/Podfile

@@ -1,10 +0,0 @@
-
-project 'BenchmarkIPhone'
-workspace '../../Demos'
-
-target :'BenchmarkIPhone' do
-  platform :ios, '8.0'
-  use_frameworks!
-  pod 'CocoaLumberjack', :path => '../../../'
-end
-

Carthage/Checkouts/CocoaLumberjack/Demos/Benchmark/Mobile/main.m

@@ -2,13 +2,12 @@
 //  main.m
 //  BenchmarkIPhone
 //
-//  Created by Robbie Hanson on 5/6/10.
+//  CocoaLumberjack Demos
 //
 
 #import <UIKit/UIKit.h>
 
 int main(int argc, char *argv[]) {
-    
     @autoreleasepool {
         int retVal = UIApplicationMain(argc, argv, nil, nil);
         return retVal;

Carthage/Checkouts/CocoaLumberjack/Demos/CLI/CLI/CLI-Prefix.pch

@@ -1,4 +1,10 @@
 //
+//  CLI-Prefix.pch
+//  CLI
+//
+//  CocoaLumberjack Demos
+//
+//
 //  Prefix header
 //
 //  The contents of this file are implicitly included at the beginning of every source file.

Carthage/Checkouts/CocoaLumberjack/Demos/CLI/CLI/main.m

@@ -2,7 +2,7 @@
 //  main.m
 //  CLI
 //
-//  Created by Ernesto Rivera on 2013/12/19.
+//  CocoaLumberjack Demos
 //
 
 #import <Foundation/Foundation.h>
@@ -28,4 +28,3 @@ int main(int argc, const char * argv[])
     }
     return 0;
 }
-

Carthage/Checkouts/CocoaLumberjack/Demos/CLI/Podfile

@@ -1,10 +0,0 @@
-
-project 'CLI'
-workspace '../Demos'
-
-target :'CLI' do
-  platform :osx, '10.8'
-
-  pod 'CocoaLumberjack/CLI', :path => '../../'
-end
-

Carthage/Checkouts/CocoaLumberjack/Demos/CaptureASL/CaptureASL/AppDelegate.h

@@ -2,8 +2,7 @@
 //  AppDelegate.h
 //  CaptureASL
 //
-//  Created by Ernesto Rivera on 2014/03/20.
-//
+//  CocoaLumberjack Demos
 //
 
 #import <UIKit/UIKit.h>

Carthage/Checkouts/CocoaLumberjack/Demos/CaptureASL/CaptureASL/AppDelegate.m

@@ -2,8 +2,7 @@
 //  AppDelegate.m
 //  CaptureASL
 //
-//  Created by Ernesto Rivera on 2014/03/20.
-//
+//  CocoaLumberjack Demos
 //
 
 #import "AppDelegate.h"
@@ -37,5 +36,3 @@
 }
 							
 @end
-
-

Carthage/Checkouts/CocoaLumberjack/Demos/CaptureASL/CaptureASL/CaptureASL-Prefix.pch

@@ -1,4 +1,10 @@
 //
+//  CaptureASL-Prefix.pch
+//  CaptureASL
+//
+//  CocoaLumberjack Demos
+//
+//
 //  Prefix header
 //
 //  The contents of this file are implicitly included at the beginning of every source file.

Carthage/Checkouts/CocoaLumberjack/Demos/CaptureASL/CaptureASL/ViewController.h

@@ -2,8 +2,7 @@
 //  ViewController.h
 //  CaptureASL
 //
-//  Created by Ernesto Rivera on 2014/03/20.
-//
+//  CocoaLumberjack Demos
 //
 
 #import <UIKit/UIKit.h>

Carthage/Checkouts/CocoaLumberjack/Demos/CaptureASL/CaptureASL/ViewController.m

@@ -2,8 +2,7 @@
 //  ViewController.m
 //  CaptureASL
 //
-//  Created by Ernesto Rivera on 2014/03/20.
-//
+//  CocoaLumberjack Demos
 //
 
 #import "ViewController.h"

Carthage/Checkouts/CocoaLumberjack/Demos/CaptureASL/CaptureASL/main.m

@@ -2,12 +2,10 @@
 //  main.m
 //  CaptureASL
 //
-//  Created by Ernesto Rivera on 2014/03/20.
-//
+//  CocoaLumberjack Demos
 //
 
 #import <UIKit/UIKit.h>
-
 #import "AppDelegate.h"
 
 int main(int argc, char * argv[])

Carthage/Checkouts/CocoaLumberjack/Demos/CaptureASL/Podfile

@@ -1,10 +0,0 @@
-
-project 'CaptureASL'
-workspace '../Demos'
-
-target :'CaptureASL' do
-  platform :ios, '8.0'
-  use_frameworks!
-  pod 'CocoaLumberjack', :path => '../../'
-end
-

Carthage/Checkouts/CocoaLumberjack/Demos/ContextFilter/ContextFilterAppDelegate.h

@@ -2,8 +2,7 @@
 //  ContextFilterAppDelegate.h
 //  ContextFilter
 //
-//  Created by Robbie Hanson on 11/22/10.
-//  Copyright 2010 Voalte. All rights reserved.
+//  CocoaLumberjack Demos
 //
 
 #import <Cocoa/Cocoa.h>

Carthage/Checkouts/CocoaLumberjack/Demos/ContextFilter/ContextFilterAppDelegate.m

@@ -1,3 +1,10 @@
+//
+//  ContextFilterAppDelegate.m
+//  ContextFilter
+//
+//  CocoaLumberjack Demos
+//
+
 #import "ContextFilterAppDelegate.h"
 #import <CocoaLumberjack/CocoaLumberjack.h>
 #import "MyContextFilter.h"
@@ -6,9 +13,7 @@
 // Log levels: off, error, warn, info, verbose
 static const DDLogLevel ddLogLevel = DDLogLevelVerbose;
 
-
 @implementation ContextFilterAppDelegate
-
 @synthesize window;
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification

Carthage/Checkouts/CocoaLumberjack/Demos/ContextFilter/ContextFilter_Prefix.pch

@@ -1,4 +1,10 @@
 //
+//  ContextFilter_Prefix.pch
+//  ContextFilter
+//
+//  CocoaLumberjack Demos
+//
+//
 // Prefix header for all source files of the 'ContextFilter' target in the 'ContextFilter' project
 //
 

Carthage/Checkouts/CocoaLumberjack/Demos/ContextFilter/MyContextFilter.h

@@ -1,8 +1,13 @@
+//
+//  MyContextFilter.h
+//  ContextFilter
+//
+//  CocoaLumberjack Demos
+//
+
 #import <Foundation/Foundation.h>
 #import <CocoaLumberjack/CocoaLumberjack.h>
 
 @interface MyContextFilter : NSObject <DDLogFormatter>
-{
-}
 
 @end

Carthage/Checkouts/CocoaLumberjack/Demos/ContextFilter/MyContextFilter.m

@@ -1,7 +1,13 @@
+//
+//  MyContextFilter.m
+//  ContextFilter
+//
+//  CocoaLumberjack Demos
+//
+
 #import "MyContextFilter.h"
 #import "ThirdPartyFramework.h"
 
-
 @implementation MyContextFilter
 
 - (NSString *)formatLogMessage:(DDLogMessage *)logMessage

Carthage/Checkouts/CocoaLumberjack/Demos/ContextFilter/Podfile

@@ -1,10 +0,0 @@
-
-project 'ContextFilter'
-workspace '../Demos'
-
-target :'ContextFilter' do
-  platform :osx, '10.8'
-  use_frameworks!
-  pod 'CocoaLumberjack', :path => '../../'
-end
-

Carthage/Checkouts/CocoaLumberjack/Demos/ContextFilter/ThirdPartyFramework.h

@@ -1,11 +1,16 @@
+//
+//  ThirdPartyFramework.h
+//  ContextFilter
+//
+//  CocoaLumberjack Demos
+//
+
 #import <Foundation/Foundation.h>
 
 #define TP_LOG_CONTEXT 1044
 
-
 @interface ThirdPartyFramework : NSObject
 
 + (void)start;
 
-
 @end

Carthage/Checkouts/CocoaLumberjack/Demos/ContextFilter/ThirdPartyFramework.m

@@ -1,3 +1,10 @@
+//
+//  ThirdPartyFramework.m
+//  ContextFilter
+//
+//  CocoaLumberjack Demos
+//
+
 #import "ThirdPartyFramework.h"
 #import <CocoaLumberjack/DDLogMacros.h>
 

Carthage/Checkouts/CocoaLumberjack/Demos/ContextFilter/main.m

@@ -2,8 +2,7 @@
 //  main.m
 //  ContextFilter
 //
-//  Created by Robbie Hanson on 11/22/10.
-//  Copyright 2010 Voalte. All rights reserved.
+//  CocoaLumberjack Demos
 //
 
 #import <Cocoa/Cocoa.h>

Carthage/Checkouts/CocoaLumberjack/Demos/CoreDataLogger/CoreDataLogger/CoreDataLogger-Prefix.pch

@@ -1,4 +1,10 @@
 //
+//  CoreDataLogger-Prefix.pch
+//  CoreDataLogger
+//
+//  CocoaLumberjack Demos
+//
+//
 // Prefix header for all source files of the 'CoreDataLogger' target in the 'CoreDataLogger' project
 //
 

Carthage/Checkouts/CocoaLumberjack/Demos/CoreDataLogger/CoreDataLogger/CoreDataLogger.h

@@ -1,7 +1,13 @@
+//
+//  CoreDataLogger.h
+//  CoreDataLogger
+//
+//  CocoaLumberjack Demos
+//
+
 #import <Foundation/Foundation.h>
 #import <CocoaLumberjack/DDAbstractDatabaseLogger.h>
 
-
 @interface CoreDataLogger : DDAbstractDatabaseLogger <DDLogger>
 {
   @private

Carthage/Checkouts/CocoaLumberjack/Demos/CoreDataLogger/CoreDataLogger/CoreDataLogger.m

@@ -1,3 +1,10 @@
+//
+//  CoreDataLogger.m
+//  CoreDataLogger
+//
+//  CocoaLumberjack Demos
+//
+
 #import "CoreDataLogger.h"
 #import "LogEntry.h"
 
@@ -24,7 +31,6 @@
     return self;
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Private API
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Carthage/Checkouts/CocoaLumberjack/Demos/CoreDataLogger/CoreDataLogger/CoreDataLoggerAppDelegate.h

@@ -1,8 +1,14 @@
+//
+//  CoreDataLoggerAppDelegate.h
+//  CoreDataLogger
+//
+//  CocoaLumberjack Demos
+//
+
 #import <Cocoa/Cocoa.h>
 
 @class CoreDataLogger;
 
-
 @interface CoreDataLoggerAppDelegate : NSObject <NSApplicationDelegate> {
 @private
     CoreDataLogger *coreDataLogger;

Carthage/Checkouts/CocoaLumberjack/Demos/CoreDataLogger/CoreDataLogger/CoreDataLoggerAppDelegate.m

@@ -1,3 +1,10 @@
+//
+//  CoreDataLoggerAppDelegate.m
+//  CoreDataLogger
+//
+//  CocoaLumberjack Demos
+//
+
 #import "CoreDataLoggerAppDelegate.h"
 #import <CocoaLumberjack/CocoaLumberjack.h>
 #import "CoreDataLogger.h"
@@ -5,7 +12,6 @@
 // Log levels: off, error, warn, info, verbose
 static const DDLogLevel ddLogLevel = DDLogLevelVerbose;
 
-
 @implementation CoreDataLoggerAppDelegate
 
 @synthesize window;

Carthage/Checkouts/CocoaLumberjack/Demos/CoreDataLogger/CoreDataLogger/LogEntry.h

@@ -1,7 +1,13 @@
+//
+//  LogEntry.h
+//  CoreDataLogger
+//
+//  CocoaLumberjack Demos
+//
+
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
 
-
 @interface LogEntry : NSManagedObject
 
 @property (nonatomic, strong) NSNumber * context;

Carthage/Checkouts/CocoaLumberjack/Demos/CoreDataLogger/CoreDataLogger/LogEntry.m

@@ -1,5 +1,11 @@
-#import "LogEntry.h"
+//
+//  LogEntry.m
+//  CoreDataLogger
+//
+//  CocoaLumberjack Demos
+//
 
+#import "LogEntry.h"
 
 @implementation LogEntry
 

Carthage/Checkouts/CocoaLumberjack/Demos/CoreDataLogger/CoreDataLogger/main.m

@@ -2,7 +2,7 @@
 //  main.m
 //  CoreDataLogger
 //
-//  Created by Robbie Hanson on 3/30/11.
+//  CocoaLumberjack Demos
 //
 
 #import <Cocoa/Cocoa.h>

Carthage/Checkouts/CocoaLumberjack/Demos/CoreDataLogger/Podfile

@@ -1,10 +0,0 @@
-
-project 'CoreDataLogger'
-workspace '../Demos'
-
-target :'CoreDataLogger' do
-  platform :osx, '10.8'
-  use_frameworks!
-  pod 'CocoaLumberjack', :path => '../../'
-end
-

Carthage/Checkouts/CocoaLumberjack/Demos/CustomFormatters/CustomFormattersAppDelegate.h

@@ -1,5 +1,11 @@
-#import <Cocoa/Cocoa.h>
+//
+//  CustomFormattersAppDelegate.h
+//  CustomFormatters
+//
+//  CocoaLumberjack Demos
+//
 
+#import <Cocoa/Cocoa.h>
 
 @interface CustomFormattersAppDelegate : NSObject <NSApplicationDelegate> {
     NSWindow *__unsafe_unretained window;

Carthage/Checkouts/CocoaLumberjack/Demos/CustomFormatters/CustomFormattersAppDelegate.m

@@ -1,3 +1,10 @@
+//
+//  CustomFormattersAppDelegate.m
+//  CustomFormatters
+//
+//  CocoaLumberjack Demos
+//
+
 #import "CustomFormattersAppDelegate.h"
 
 #import <CocoaLumberjack/CocoaLumberjack.h>
@@ -6,7 +13,6 @@
 // Debug levels: off, error, warn, info, verbose
 static const DDLogLevel ddLogLevel = DDLogLevelVerbose;
 
-
 @implementation CustomFormattersAppDelegate
 
 @synthesize window;

Carthage/Checkouts/CocoaLumberjack/Demos/CustomFormatters/CustomFormatters_Prefix.pch

@@ -1,4 +1,10 @@
 //
+//  CustomFormatters_Prefix.pch
+//  CustomFormatters
+//
+//  CocoaLumberjack Demos
+//
+//
 // Prefix header for all source files of the 'CustomFormatters' target in the 'CustomFormatters' project
 //
 

Carthage/Checkouts/CocoaLumberjack/Demos/CustomFormatters/Podfile

@@ -1,10 +0,0 @@
-
-project 'CustomFormatters'
-workspace '../Demos'
-
-target :'CustomFormatters' do
-  platform :osx, '10.8'
-  use_frameworks!
-  pod 'CocoaLumberjack', :path => '../../'
-end
-

Carthage/Checkouts/CocoaLumberjack/Demos/CustomFormatters/TestFormatter.h

@@ -1,7 +1,13 @@
+//
+//  TestFormatter.h
+//  CustomFormatters
+//
+//  CocoaLumberjack Demos
+//
+
 #import <Foundation/Foundation.h>
 #import <CocoaLumberjack/CocoaLumberjack.h>
 
-
 @interface TestFormatter : NSObject <DDLogFormatter>
 
 @end

Carthage/Checkouts/CocoaLumberjack/Demos/CustomFormatters/TestFormatter.m

@@ -1,5 +1,11 @@
-#import "TestFormatter.h"
+//
+//  TestFormatter.m
+//  CustomFormatters
+//
+//  CocoaLumberjack Demos
+//
 
+#import "TestFormatter.h"
 
 /**
  * For more information about creating custom formatters, see the wiki article:

Carthage/Checkouts/CocoaLumberjack/Demos/CustomFormatters/main.m

@@ -2,7 +2,7 @@
 //  main.m
 //  CustomFormatters
 //
-//  Created by Robbie Hanson on 5/13/10.
+//  CocoaLumberjack Demos
 //
 
 #import <Cocoa/Cocoa.h>

Carthage/Checkouts/CocoaLumberjack/Demos/CustomLogLevels/CustomLogLevelsAppDelegate.h

@@ -1,5 +1,11 @@
-#import <Cocoa/Cocoa.h>
+//
+//  CustomLogLevelsAppDelegate.h
+//  CustomLogLevels
+//
+//  CocoaLumberjack Demos
+//
 
+#import <Cocoa/Cocoa.h>
 
 @interface CustomLogLevelsAppDelegate : NSObject <NSApplicationDelegate> {
     NSWindow *__unsafe_unretained window;

Carthage/Checkouts/CocoaLumberjack/Demos/CustomLogLevels/CustomLogLevelsAppDelegate.m

@@ -1,10 +1,16 @@
+//
+//  CustomLogLevelsAppDelegate.m
+//  CustomLogLevels
+//
+//  CocoaLumberjack Demos
+//
+
 #import "CustomLogLevelsAppDelegate.h"
 
 #import "MYLog.h"
 
 // Debug levels: off, fatal, error, warn, notice, info, debug
-static const DDLogLevel ddLogLevel = DDLogLevelDebug;
-
+static const DDLogLevel ddLogLevel = LOG_LEVEL_DEBUG;
 
 @implementation CustomLogLevelsAppDelegate
 
@@ -13,8 +19,8 @@ static const DDLogLevel ddLogLevel = DDLogLevelDebug;
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
     // since the verbose log level was undefined, we need to specify the log level for every logger
-    [DDLog addLogger:[DDASLLogger sharedInstance] withLevel:DDLogLevelDebug];
-    [DDLog addLogger:[DDTTYLogger sharedInstance] withLevel:DDLogLevelDebug];
+    [DDLog addLogger:[DDASLLogger sharedInstance] withLevel:LOG_LEVEL_DEBUG];
+    [DDLog addLogger:[DDTTYLogger sharedInstance] withLevel:LOG_LEVEL_DEBUG];
     
     DDLogFatal(@"Fatal");
     DDLogError(@"Error");

Carthage/Checkouts/CocoaLumberjack/Demos/CustomLogLevels/CustomLogLevels_Prefix.pch

@@ -1,4 +1,10 @@
 //
+//  CustomLogLevels_Prefix.pch
+//  CustomLogLevels
+//
+//  CocoaLumberjack Demos
+//
+//
 // Prefix header for all source files of the 'CustomLogLevels' target in the 'CustomLogLevels' project
 //
 

Carthage/Checkouts/CocoaLumberjack/Demos/CustomLogLevels/MYLog.h

@@ -1,3 +1,9 @@
+//
+//  MYLog.h
+//  CustomLogLevels
+//
+//  CocoaLumberjack Demos
+//
 
 #import <CocoaLumberjack/CocoaLumberjack.h>
 
@@ -43,4 +49,3 @@
 #define DDLogNotice(frmt, ...)  LOG_MAYBE(YES, ddLogLevel, LOG_FLAG_NOTICE, 0, nil, __PRETTY_FUNCTION__, frmt, ##__VA_ARGS__)
 #define DDLogInfo(frmt, ...)    LOG_MAYBE(YES, ddLogLevel, LOG_FLAG_INFO,   0, nil, __PRETTY_FUNCTION__, frmt, ##__VA_ARGS__)
 #define DDLogDebug(frmt, ...)   LOG_MAYBE(YES, ddLogLevel, LOG_FLAG_DEBUG,  0, nil, __PRETTY_FUNCTION__, frmt, ##__VA_ARGS__)
-

Carthage/Checkouts/CocoaLumberjack/Demos/CustomLogLevels/Podfile

@@ -1,10 +0,0 @@
-
-project 'CustomLogLevels'
-workspace '../Demos'
-
-target :'CustomLogLevels' do
-  platform :osx, '10.8'
-  use_frameworks!
-  pod 'CocoaLumberjack', :path => '../../'
-end
-

Carthage/Checkouts/CocoaLumberjack/Demos/CustomLogLevels/main.m

@@ -2,7 +2,7 @@
 //  main.m
 //  CustomLogLevels
 //
-//  Created by Robbie Hanson on 5/13/10.
+//  CocoaLumberjack Demos
 //
 
 #import <Cocoa/Cocoa.h>

Carthage/Checkouts/CocoaLumberjack/Demos/Demos.xcworkspace/contents.xcworkspacedata

@@ -2,144 +2,75 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:../Classes">
+      location = "group:../Lumberjack.xcodeproj">
    </FileRef>
    <FileRef
       location = "group:Benchmark/Mobile/BenchmarkIPhone.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Benchmark/Mobile/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:Benchmark/Desktop/BenchmarkMac.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Benchmark/Desktop/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:CaptureASL/CaptureASL.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:CaptureASL/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:CLI/CLI.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:CLI/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:ContextFilter/ContextFilter.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:ContextFilter/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:CoreDataLogger/CoreDataLogger.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:CoreDataLogger/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:CustomFormatters/CustomFormatters.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:CustomFormatters/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:CustomLogLevels/CustomLogLevels.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:CustomLogLevels/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:DispatchQueueLogger/DispatchQueueLogger.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:DispatchQueueLogger/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:FineGrainedLogging/FineGrainedLogging.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:FineGrainedLogging/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:GlobalLogLevel/GlobalLogLevel.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:GlobalLogLevel/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:LogFileCompressor/LogFileCompressor.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:LogFileCompressor/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:OverflowTestMac/OverflowTestMac.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:OverflowTestMac/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:PerUserLogLevels/PerUserLogLevels.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:PerUserLogLevels/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:RollingTestMac/RollingTestMac.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:RollingTestMac/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:SQLiteLogger/SQLiteLogger.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:SQLiteLogger/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:UniversalApp/UniversalApp.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:UniversalApp/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:WebServerIPhone/WebServerIPhone.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:WebServerIPhone/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:NonArcTest/NonArcTest.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:NonArcTest/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:RegisteredDynamicLogging/Desktop/RegisteredLoggingTest.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:RegisteredDynamicLogging/Desktop/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:RegisteredDynamicLogging/Mobile/RegisteredLoggingTest.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:RegisteredDynamicLogging/Mobile/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:TestXcodeColors/Desktop/TestXcodeColors.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:TestXcodeColors/Desktop/Pods/Pods.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:TestXcodeColors/Mobile/TextXcodeColors.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:TestXcodeColors/Mobile/Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>

Carthage/Checkouts/CocoaLumberjack/Demos/DispatchQueueLogger/DispatchQueueLogger/AppDelegate.h

@@ -2,7 +2,7 @@
 //  AppDelegate.h
 //  DispatchQueueLogger
 //
-//  Created by Robbie Hanson on 11/8/11.
+//  CocoaLumberjack Demos
 //
 
 #import <Cocoa/Cocoa.h>

Carthage/Checkouts/CocoaLumberjack/Demos/DispatchQueueLogger/DispatchQueueLogger/AppDelegate.m

@@ -1,3 +1,10 @@
+//
+//  AppDelegate.m
+//  DispatchQueueLogger
+//
+//  CocoaLumberjack Demos
+//
+
 #import "AppDelegate.h"
 #import <CocoaLumberjack/CocoaLumberjack.h>
 #import <CocoaLumberjack/DDDispatchQueueLogFormatter.h>
@@ -5,7 +12,6 @@
 // Log levels: 0-off, 1-error, 2-warn, 3-info, 4-verbose
 static const DDLogLevel ddLogLevel = DDLogLevelVerbose;
 
-
 @implementation AppDelegate
 {
     dispatch_queue_t downloadingQueue;

Carthage/Checkouts/CocoaLumberjack/Demos/DispatchQueueLogger/DispatchQueueLogger/DispatchQueueLogger-Prefix.pch

@@ -1,4 +1,10 @@
 //
+//  DispatchQueueLogger-Prefix.pch
+//  DispatchQueueLogger
+//
+//  CocoaLumberjack Demos
+//
+//
 // Prefix header for all source files of the 'DispatchQueueLogger' target in the 'DispatchQueueLogger' project
 //
 

Carthage/Checkouts/CocoaLumberjack/Demos/DispatchQueueLogger/DispatchQueueLogger/main.m

@@ -2,7 +2,7 @@
 //  main.m
 //  DispatchQueueLogger
 //
-//  Created by Robbie Hanson on 11/8/11.
+//  CocoaLumberjack Demos
 //
 
 #import <Cocoa/Cocoa.h>