Update to v2.9.0 (#22)

### 2.9.0 (08/06/2020)

- Drop support for iOS 7, 8 & 9

### 2.8.5 (07/21/2020)

- Improved Swift interface

### 2.8.1 (07/01/2020)

- Convert private static C functions (that take `self` as an argument) to Objective-C `direct` methods
  - Same low overhead, better calling syntax

### 2.8.0 (06/08/2020)

- Update `initWithOutError:` to `initAndReturnError:` for `TLSRollingFileOutputStream`
  - More idiomatic

Author: NSProgrammer

.travis.yml

@@ -1,4 +1,4 @@
 language: objective-c
-osx_image: xcode11.4
+osx_image: xcode11.5
 script:
   ./build.sh

CHANGELOG.md

@@ -2,14 +2,32 @@
 
 ## Info
 
-**Document version:** 2.7.1
+**Document version:** 2.9.0
 
-**Last updated:** 04/12/2020
+**Last updated:** 08/06/2020
 
 **Author:** Nolan O'Brien
 
 ## History
 
+### 2.9.0 (08/06/2020)
+
+- Drop support for iOS 7, 8 & 9
+
+### 2.8.5 (07/21/2020)
+
+- Improved Swift interface
+
+### 2.8.1 (07/01/2020)
+
+- Convert private static C functions (that take `self` as an argument) to Objective-C `direct` methods
+  - Same low overhead, better calling syntax
+
+### 2.8.0 (06/08/2020)
+
+- Update `initWithOutError:` to `initAndReturnError:` for `TLSRollingFileOutputStream`
+  - More idiomatic
+  
 ### 2.7.1 (04/12/2020)
 
  - Increase use of  `@autoreleasepool` to keep memory management tighter

Classes/TLSConsoleOutputStreams.m

@@ -20,14 +20,10 @@
 #import "TLSConsoleOutputStreams.h"
 #import "TLSLog.h"
 
-#if TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
+#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_MAC
 #define OS_LOG_AVAILABLE 1
-#elif TARGET_OS_TV && __TV_OS_VERSION_MAX_ALLOWED >= 100000
-#define OS_LOG_AVAILABLE 1
-#elif TARGET_OS_WATCH && __WATCH_OS_VERSION_MAX_ALLOWED >= 30000
+#elif TARGET_OS_WATCH
 #define OS_LOG_AVAILABLE 0 // not on watch
-#elif TARGET_OS_MAC && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
-#define OS_LOG_AVAILABLE 1
 #else
 #define OS_LOG_AVAILABLE 0
 #endif
@@ -77,9 +73,7 @@ + (BOOL)supported
 #if OS_LOG_AVAILABLE
 
 #if !TARGET_OS_WATCH
-    if (@available(iOS 10, tvOS 10, macOS 10.12, *)) {
-        return YES;
-    }
+    return YES;
 #endif
 
 #endif // OS_LOG_AVAILABLE

Classes/TLSDeclarations.h

@@ -22,7 +22,7 @@
 #pragma mark - Constants
 
 /** Domain for errors stemming from TwitterLoggingService APIs */
-FOUNDATION_EXTERN NSString * __nonnull const TLSErrorDomain;
+FOUNDATION_EXTERN NSErrorDomain __nonnull const TLSErrorDomain;
 
 /** Pull out an name for the current thread or `nil` if no name was identified */
 FOUNDATION_EXTERN NSString * __nullable TLSCurrentThreadName(void);
@@ -40,7 +40,7 @@ FOUNDATION_EXTERN NSString * __nullable TLSCurrentThreadName(void);
  FOUNDATION_EXTERN NSString *TLSLogLevelToString(TLSLogLevel level);
 
  */
-typedef NS_ENUM(NSUInteger, TLSLogLevel)
+typedef NS_ENUM(NSInteger, TLSLogLevel)
 {
     /** Present for syslog compatability */
     TLSLogLevelEmergency = 0,
@@ -61,7 +61,7 @@ typedef NS_ENUM(NSUInteger, TLSLogLevel)
 };
 
 //! Number of log levels
-static const NSUInteger TLSLogLevelCount = TLSLogLevelDebug + 1;
+static const NSInteger TLSLogLevelCount = TLSLogLevelDebug + 1;
 
 /**
  A set of flags that can be used to identify specific log levels in one mask.
@@ -112,9 +112,9 @@ typedef NS_OPTIONS(NSInteger, TLSLogLevelMask)
 /** Advanced options for logging a message */
 typedef NS_OPTIONS(NSInteger, TLSLogMessageOptions) {
     /** no options (default behavior) */
-    TLSLogMessageNoOptions = 0,
+    TLSLogMessageOptionsNone = 0,
     /** ignore the `[TLSLoggingService maximumSafeMessageLength]` capping of the message */
-    TLSLogMessageIgnoringMaximumSafeMessageLength = 1 << 0,
+    TLSLogMessageOptionsIgnoringMaximumSafeMessageLength = 1 << 0,
 };
 
 /**

Classes/TLSDeclarations.m

@@ -23,7 +23,7 @@
 #import <TwitterLoggingService/TLSDeclarations.h>
 #import <TwitterLoggingService/TLSLog.h>
 
-NSString * const TLSErrorDomain = @"TLSErrorDomain";
+NSErrorDomain const TLSErrorDomain = @"TLSErrorDomain";
 
 @implementation TLSLogMessageInfo
 {
@@ -87,7 +87,7 @@ - (NSString *)composeFormattedMessageWithOptions:(TLSComposeLogMessageInfoOption
             // TIMESTAMP
             {
                 NSString *logTimestamp = nil;
-                if (options & TLSComposeLogMessageInfoLogTimestampAsTimeSinceLoggingStarted) {
+                if (TLS_BITMASK_INTERSECTS_FLAGS(options, TLSComposeLogMessageInfoLogTimestampAsTimeSinceLoggingStarted)) {
                     NSTimeInterval logLifespan = self.logLifespan;
                     const BOOL negative = logLifespan < 0.0;
                     if (negative) {
@@ -108,7 +108,7 @@ - (NSString *)composeFormattedMessageWithOptions:(TLSComposeLogMessageInfoOption
                                     minutes,
                                     seconds,
                                     msecs];
-                } else if (options & TLSComposeLogMessageInfoLogTimestampAsLocalTime) {
+                } else if (TLS_BITMASK_INTERSECTS_FLAGS(options, TLSComposeLogMessageInfoLogTimestampAsLocalTime)) {
                     static NSDateFormatter *sFormatter = nil;
                     static dispatch_once_t onceToken;
                     dispatch_once(&onceToken, ^{
@@ -117,7 +117,7 @@ - (NSString *)composeFormattedMessageWithOptions:(TLSComposeLogMessageInfoOption
                         sFormatter.timeZone = [NSTimeZone localTimeZone];
                     });
                     logTimestamp = [sFormatter stringFromDate:self.timestamp];
-                } else if (options & TLSComposeLogMessageInfoLogTimestampAsUTCTime) {
+                } else if (TLS_BITMASK_INTERSECTS_FLAGS(options, TLSComposeLogMessageInfoLogTimestampAsUTCTime)) {
                     static NSDateFormatter *sFormatter = nil;
                     static dispatch_once_t onceToken;
                     dispatch_once(&onceToken, ^{
@@ -134,38 +134,39 @@ - (NSString *)composeFormattedMessageWithOptions:(TLSComposeLogMessageInfoOption
             }
 
             // THREAD
-            if (options & TLSComposeLogMessageInfoLogThreadId || options & TLSComposeLogMessageInfoLogThreadName) {
+            if (TLS_BITMASK_INTERSECTS_FLAGS(options, TLSComposeLogMessageInfoLogThreadId | TLSComposeLogMessageInfoLogThreadName)) {
                 [mComposedMessage appendString:@"["];
                 NSString *threadName = self.threadName;
-                const BOOL hasName = (options & TLSComposeLogMessageInfoLogThreadName && threadName != nil);
+                const BOOL hasName = TLS_BITMASK_INTERSECTS_FLAGS(options, TLSComposeLogMessageInfoLogThreadName)
+                                     && (threadName != nil);
                 if (hasName) {
                     [mComposedMessage appendString:threadName];
                 }
-                if (options & TLSComposeLogMessageInfoLogThreadId) {
+                if (TLS_BITMASK_INTERSECTS_FLAGS(options, TLSComposeLogMessageInfoLogThreadId)) {
                     [mComposedMessage appendFormat:(hasName) ? @"(0x%x)" : @"0x%x", self.threadId];
                 }
                 [mComposedMessage appendString:@"]"];
             }
 
             // CHANNEL
-            if (options & TLSComposeLogMessageInfoLogChannel) {
+            if (TLS_BITMASK_INTERSECTS_FLAGS(options, TLSComposeLogMessageInfoLogChannel)) {
                 [mComposedMessage appendFormat:@"[%@]", self.channel];
             }
 
             // LEVEL
-            if (options & TLSComposeLogMessageInfoLogLevel) {
+            if (TLS_BITMASK_INTERSECTS_FLAGS(options, TLSComposeLogMessageInfoLogLevel)) {
                 [mComposedMessage appendFormat:@"[%@]", TLSLogLevelToString(level)];
             }
 
             // Call Site Info
-            if ((options & TLSComposeLogMessageInfoLogCallsiteInfoAlways) || ((options & TLSComposeLogMessageInfoLogCallsiteInfoForWarnings) && level <= TLSLogLevelWarning)) {
+            if (TLS_BITMASK_INTERSECTS_FLAGS(options, TLSComposeLogMessageInfoLogCallsiteInfoAlways | TLSComposeLogMessageInfoLogCallsiteInfoForWarnings) && level <= TLSLogLevelWarning) {
                 [mComposedMessage appendString:[self composeFileFunctionLineString]];
             }
 
             [mComposedMessage appendFormat:@" : %@", self.message];
 
             composedMessage = [mComposedMessage copy];
-            if (0 == (options & TLSComposeLogMessageInfoDoNotCache)) {
+            if (TLS_BITMASK_EXCLUDES_FLAGS(options, TLSComposeLogMessageInfoDoNotCache)) {
                 if (!_formattedMessages) {
                     _formattedMessages = @{ optionsKey : composedMessage };
                 } else {

Classes/TLSFileOutputStream.h

@@ -132,7 +132,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  Reset the log and clear it
  */
-- (BOOL)resetAndReturnError:(out NSError * __nullable * __nullable)error;
+- (BOOL)resetAndReturnError:(out NSError * __nullable __autoreleasing * __nullable)error;
 
 #pragma mark TLSOutputStream
 

Classes/TLSLog.h

@@ -51,7 +51,7 @@ NS_ASSUME_NONNULL_BEGIN
 //! Root Macro.  Provide the _level_, _channel_ and format string.
 #define TLSLog(level, channel, ...) \
     if (TLSCanLog(nil, level, channel, nil)) { \
-        TLSLogEx(nil, level, channel, @(__FILE__), @(__PRETTY_FUNCTION__), __LINE__, nil, TLSLogMessageNoOptions, __VA_ARGS__); \
+        TLSLogEx(nil, level, channel, @(__FILE__), @(__PRETTY_FUNCTION__), __LINE__, nil, TLSLogMessageOptionsNone, __VA_ARGS__); \
     }
 
 //! Log to Error level

Classes/TLSLog.swift

@@ -31,7 +31,8 @@ public class TLSLog {
 
      See also: `TLSLogError`, `TLSLogWarning`, `TLSLogInformation` and `TLSLogDebug`
      */
-    public final class func log(_ level: TLSLogLevel,
+    public final class func log(service: TLSLoggingService? = nil,
+                                _ level: TLSLogLevel,
                                 _ channel: String,
                                 _ context: Any?,
                                 _ message: @autoclosure () -> String,
@@ -40,11 +41,11 @@ public class TLSLog {
                                 function: StaticString = #function,
                                 line: Int = #line)
     {
-        if (!TLSCanLog(nil, level, channel, context)) {
+        if (!TLSCanLog(service, level, channel, context)) {
             return
         }
 
-        TLSLogString(nil,
+        TLSLogString(service,
                      level,
                      channel,
                      String(describing: file),

Classes/TLSLoggingService+Advanced.h

@@ -67,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
  synchronously execute the given block on the `TLSLoggingService` instance's transaction queue.
  Don't muck with `TLSLoggingService` or other queues/threads from within the _block_.
  */
-- (void)dispatchSynchronousTransaction:(dispatch_block_t)block;
+- (void)dispatchSynchronousTransaction:(dispatch_block_t NS_NOESCAPE)block;
 /**
  asynchronously execute the given block on the `TLSLoggingService` intances's transaction queue.
  Don't muck with `TLSLoggingService` or other queues/threads from within the _block_.