Merge pull request #99 from WideSpectrumComputing/master

fix: resolve #88, resolve #89, resolve #90, resolve #91
rollbar · May 20, 2021 · 81390e0 · 81390e0
2 parents b88c90f + e9f8114
commit 81390e0
Show file tree

Hide file tree

Showing 36 changed files with 143 additions and 37 deletions.
diff --git a/Demos/macosAppObjC/macosAppObjC.xcodeproj/project.pbxproj b/Demos/macosAppObjC/macosAppObjC.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
 		55759A732477561100ED3F04 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 55759A722477561100ED3F04 /* Assets.xcassets */; };
 		55759A762477561100ED3F04 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 55759A742477561100ED3F04 /* Main.storyboard */; };
 		55759A792477561100ED3F04 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 55759A782477561100ED3F04 /* main.m */; };
+		55847E682655C2990062C242 /* RollbarAUL in Frameworks */ = {isa = PBXBuildFile; productRef = 55847E672655C2990062C242 /* RollbarAUL */; };
 		55A02A60259AAAE40071D60D /* RollbarPLCrashReporter in Frameworks */ = {isa = PBXBuildFile; productRef = 55A02A5F259AAAE40071D60D /* RollbarPLCrashReporter */; };
 		55FD0711247860F1000BBC22 /* RollbarDeploys in Frameworks */ = {isa = PBXBuildFile; productRef = 55FD0710247860F1000BBC22 /* RollbarDeploys */; };
 		55FD07142478614B000BBC22 /* RollbarDeploysDemoClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 55FD07132478614B000BBC22 /* RollbarDeploysDemoClient.m */; };
@@ -43,6 +44,7 @@
 				55684F5A2553981600F82F34 /* RollbarKSCrash in Frameworks */,
 				55FD0711247860F1000BBC22 /* RollbarDeploys in Frameworks */,
 				5547273924903EB7005018BD /* RollbarNotifier in Frameworks */,
+				55847E682655C2990062C242 /* RollbarAUL in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -112,6 +114,7 @@
 				5547273824903EB7005018BD /* RollbarNotifier */,
 				55684F592553981600F82F34 /* RollbarKSCrash */,
 				55A02A5F259AAAE40071D60D /* RollbarPLCrashReporter */,
+				55847E672655C2990062C242 /* RollbarAUL */,
 			);
 			productName = macosAppObjC;
 			productReference = 55759A692477560D00ED3F04 /* macosAppObjC.app */;
@@ -370,6 +373,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = RollbarKSCrash;
 		};
+		55847E672655C2990062C242 /* RollbarAUL */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = RollbarAUL;
+		};
 		55A02A5F259AAAE40071D60D /* RollbarPLCrashReporter */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = RollbarPLCrashReporter;

diff --git a/Demos/macosAppObjC/macosAppObjC/AppDelegate.m b/Demos/macosAppObjC/macosAppObjC/AppDelegate.m
@@ -11,7 +11,7 @@
 #import "RollbarDeploysDemoClient.h"
 
 @import RollbarNotifier;
-
+@import RollbarAUL;
 @import RollbarKSCrash;
 @import RollbarPLCrashReporter;
 
@@ -81,6 +81,9 @@ - (void)initRollbar {
     config.destination.environment = @"samples";
     //config.developerOptions.suppressSdkInfoLogging = YES;
     config.customData = @{ @"someKey": @"someValue", };
+
+    [RollbarAulStoreMonitor.sharedInstance configureRollbarLogger:Rollbar.currentLogger];
+    [RollbarAulStoreMonitor.sharedInstance start];
 
     // optional crash reporter:
     id<RollbarCrashCollector> crashCollector =

diff --git a/Package.swift b/Package.swift
@@ -104,9 +104,6 @@ let package = Package(
         .target(
             name: "RollbarAUL",
             dependencies: ["RollbarCommon", "RollbarNotifier"],
-            platforms: [
-                .macOS(.v10_15),
-            ],
             path: "RollbarAUL/Sources/RollbarAUL",
             publicHeadersPath: "include",
             cSettings: [

diff --git a/RollbarAUL.podspec b/RollbarAUL.podspec
@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
 
-    s.version      = "2.0.0-beta.20"
+    s.version      = "2.0.0-beta.21"
     s.name         = "RollbarAUL"
     s.summary      = "Application or client side SDK for interacting with the Rollbar API Server."
     s.description  = <<-DESC

diff --git a/RollbarAUL/Package.swift b/RollbarAUL/Package.swift
@@ -8,9 +8,9 @@ let package = Package(
     platforms: [
         // Oldest targeted platform versions that are supported by this product.
         .macOS(.v10_15),
-        //.iOS(.v9),
-        //.tvOS(.v11),
-        //.watchOS(.v4),
+        .iOS(.v9),
+        .tvOS(.v11),
+        .watchOS(.v4),
     ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.

diff --git a/RollbarAUL/Sources/RollbarAUL/RollbarAulClient.m b/RollbarAUL/Sources/RollbarAUL/RollbarAulClient.m
@@ -6,6 +6,9 @@
 //
 
 #import "RollbarAulClient.h"
+
+#if TARGET_OS_OSX
+
 #import "RollbarAulPredicateBuilder.h"
 
 API_AVAILABLE(macos(10.15))
@@ -126,3 +129,5 @@ + (nullable OSLogEnumerator *)buildAulLogEnumeratorWithinLogStore:(nullable OSLo
 }
 
 @end
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/RollbarAulEntrySnapper.m b/RollbarAUL/Sources/RollbarAUL/RollbarAulEntrySnapper.m
@@ -6,9 +6,13 @@
 //
 
 #import "RollbarAulEntrySnapper.h"
-#import "RollbarAulOSLogEntryLogLevelConverter.h"
+
+#if TARGET_OS_OSX
+
 @import RollbarCommon;
 
+#import "RollbarAulOSLogEntryLogLevelConverter.h"
+
 API_AVAILABLE(macos(10.15))
 API_UNAVAILABLE(ios, tvos, watchos)
 @implementation RollbarAulEntrySnapper
@@ -118,3 +122,5 @@ - (void)captureOSLogEntryWithPayload:(nullable OSLogEntry<OSLogEntryWithPayload>
 }
 
 @end
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/RollbarAulLogLevelConverter.m b/RollbarAUL/Sources/RollbarAUL/RollbarAulLogLevelConverter.m
@@ -7,6 +7,8 @@
 
 #import "RollbarAulLogLevelConverter.h"
 
+#if TARGET_OS_OSX
+
 API_AVAILABLE(macos(10.11), ios(9.0), tvos(9.0), watchos(2.0))
 @implementation RollbarAulLogLevelConverter
 
@@ -45,3 +47,5 @@ + (RollbarLevel) RollbarLevelFromAulLevel:(os_log_type_t)value
 }
 
 @end
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/RollbarAulOSLogEntryLogLevelConverter.m b/RollbarAUL/Sources/RollbarAUL/RollbarAulOSLogEntryLogLevelConverter.m
@@ -7,6 +7,8 @@
 
 #import "RollbarAulOSLogEntryLogLevelConverter.h"
 
+#if TARGET_OS_OSX
+
 API_AVAILABLE(macos(10.15))
 API_UNAVAILABLE(ios, tvos, watchos)
 @implementation RollbarAulOSLogEntryLogLevelConverter
@@ -72,3 +74,5 @@ + (NSString *) OSLogEntryLogLevelToString:(OSLogEntryLogLevel)value
 }
 
 @end
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/RollbarAulPredicateBuilder.h b/RollbarAUL/Sources/RollbarAUL/RollbarAulPredicateBuilder.h
@@ -8,7 +8,9 @@
 #ifndef RollbarAulPredicateBuilder_h
 #define RollbarAulPredicateBuilder_h
 
-#import <Foundation/Foundation.h>
+@import Foundation;
+
+#if TARGET_OS_OSX
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -38,7 +40,10 @@ API_UNAVAILABLE(ios, tvos, watchos)
 
 + (nullable NSPredicate *)buildAulProcessPredicate;
 
-+ (nullable NSPredicate *)buildAulFaultsPredicate;
++ (nullable NSPredicate *)buildAulFaultsPredicate
+API_AVAILABLE(macos(10.15))
+API_UNAVAILABLE(ios, tvos, watchos)
+;
 
 - (instancetype)init NS_UNAVAILABLE; // This is static utility class. No instances needed...
 
@@ -47,3 +52,5 @@ API_UNAVAILABLE(ios, tvos, watchos)
 NS_ASSUME_NONNULL_END
 
 #endif //RollbarAulPredicateBuilder_h
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/RollbarAulPredicateBuilder.m b/RollbarAUL/Sources/RollbarAUL/RollbarAulPredicateBuilder.m
@@ -7,6 +7,8 @@
 
 #import "RollbarAulPredicateBuilder.h"
 
+#if TARGET_OS_OSX
+
 //@import OSLog;
 #if __has_include(<OSLog/OSLog.h>)
   #include <OSLog/OSLog.h>
@@ -130,8 +132,9 @@ + (nullable NSPredicate *)buildAulProcessPredicate {
 
 + (nullable NSPredicate *)buildAulFaultsPredicate {
 
-    NSPredicate *faultsPredicate = [RollbarPredicateBuilder buildIntegerPredicateWithValue:OSLogEntryLogLevelFault
-                                                                                          forProperty:@"level"];
+    NSPredicate *faultsPredicate =
+    [RollbarPredicateBuilder buildIntegerPredicateWithValue:OSLogEntryLogLevelFault
+                                                forProperty:@"level"];
     return faultsPredicate;
 }
 
@@ -182,3 +185,5 @@ + (nullable NSPredicate *)safelyCombinePredicate:(nullable NSPredicate *)leftPre
 }
 
 @end
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/RollbarAulStoreMonitor.m b/RollbarAUL/Sources/RollbarAUL/RollbarAulStoreMonitor.m
@@ -6,6 +6,9 @@
 //
 
 #import "RollbarAulStoreMonitor.h"
+
+#if TARGET_OS_OSX
+
 #import "RollbarAulStoreMonitorOptions.h"
 #import "RollbarAulPredicateBuilder.h"
 #import "RollbarAulClient.h"
@@ -278,3 +281,5 @@ - (void)dealloc {
 }
 
 @end
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/RollbarAulStoreMonitorOptions.m b/RollbarAUL/Sources/RollbarAUL/RollbarAulStoreMonitorOptions.m
@@ -7,6 +7,8 @@
 
 #import "RollbarAulStoreMonitorOptions.h"
 
+#if TARGET_OS_OSX
+
 #pragma mark - data field keys
 
 API_AVAILABLE(macos(10.15))
@@ -108,3 +110,5 @@ - (void)removeAulCategory:(NSString *)category {
 }
 
 @end
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/include/RollbarAulClient.h b/RollbarAUL/Sources/RollbarAUL/include/RollbarAulClient.h
@@ -10,6 +10,8 @@
 
 @import Foundation;
 
+#if TARGET_OS_OSX
+
 //@import OSLog;
 #if __has_include(<OSLog/OSLog.h>)
   #include <OSLog/OSLog.h>
@@ -55,3 +57,5 @@ API_UNAVAILABLE(ios, tvos, watchos)
 NS_ASSUME_NONNULL_END
 
 #endif //RollbarAulClient_h
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/include/RollbarAulEntrySnapper.h b/RollbarAUL/Sources/RollbarAUL/include/RollbarAulEntrySnapper.h
@@ -10,6 +10,8 @@
 
 @import Foundation;
 
+#if TARGET_OS_OSX
+
 //@import OSLog;
 #if __has_include(<OSLog/OSLog.h>)
   #include <OSLog/OSLog.h>
@@ -23,10 +25,15 @@ API_UNAVAILABLE(ios, tvos, watchos)
 @interface RollbarAulEntrySnapper : NSObject
 
 - (void)captureOSLogEntry:(nullable OSLogEntry *)entry
-             intoSnapshot:(nonnull NSMutableDictionary<NSString *, id> *)snapshot;
+             intoSnapshot:(nonnull NSMutableDictionary<NSString *, id> *)snapshot
+API_AVAILABLE(macos(10.15))
+API_UNAVAILABLE(ios, tvos, watchos)
+;
 
 @end
 
 NS_ASSUME_NONNULL_END
 
 #endif //RollbarAulEntrySnapper_h
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/include/RollbarAulLogLevelConverter.h b/RollbarAUL/Sources/RollbarAUL/include/RollbarAulLogLevelConverter.h
@@ -9,6 +9,9 @@
 #define RollbarAulLogLevelConverter_h
 
 @import Foundation;
+
+#if TARGET_OS_OSX
+
 @import RollbarNotifier;
 
 #if __has_include(<os/log.h>)
@@ -34,3 +37,5 @@ API_AVAILABLE(macos(10.11), ios(9.0), tvos(9.0), watchos(2.0))
 NS_ASSUME_NONNULL_END
 
 #endif //RollbarAulLogLevelConverter_h
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/include/RollbarAulOSLogEntryLogLevelConverter.h b/RollbarAUL/Sources/RollbarAUL/include/RollbarAulOSLogEntryLogLevelConverter.h
@@ -9,6 +9,9 @@
 #define RollbarAulOSLogEntryLogLevelConverter_h
 
 @import Foundation;
+
+#if TARGET_OS_OSX
+
 @import RollbarNotifier;
 
 #if __has_include(<oslog/OSLog.h>)
@@ -42,3 +45,5 @@ API_UNAVAILABLE(ios, tvos, watchos)
 NS_ASSUME_NONNULL_END
 
 #endif //RollbarAulOSLogEntryLogLevelConverter_h
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/include/RollbarAulStoreMonitor.h b/RollbarAUL/Sources/RollbarAUL/include/RollbarAulStoreMonitor.h
@@ -9,6 +9,9 @@
 #define RollbarAulStoreMonitor_h
 
 @import Foundation;
+
+#if TARGET_OS_OSX
+
 @import RollbarCommon;
 @import RollbarNotifier;
 
@@ -46,3 +49,5 @@ API_UNAVAILABLE(ios, tvos, watchos)
 NS_ASSUME_NONNULL_END
 
 #endif //RollbarAulStoreMonitor_h
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Sources/RollbarAUL/include/RollbarAulStoreMonitorOptions.h b/RollbarAUL/Sources/RollbarAUL/include/RollbarAulStoreMonitorOptions.h
@@ -9,6 +9,9 @@
 #define RollbarAulStoreMonitorOptions_h
 
 @import Foundation;
+
+#if TARGET_OS_OSX
+
 @import RollbarCommon;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -51,3 +54,5 @@ NS_UNAVAILABLE;
 NS_ASSUME_NONNULL_END
 
 #endif //RollbarAulStoreMonitorOptions_h
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Tests/RollbarAULTests-ObjC/RollbarAulLogLevelConverterTests.m b/RollbarAUL/Tests/RollbarAULTests-ObjC/RollbarAulLogLevelConverterTests.m
@@ -1,9 +1,11 @@
 @import Foundation;
+
+#if TARGET_OS_OSX
+
 @import OSLog;
 @import RollbarAUL;
 @import RollbarNotifier;
 
-
 #if !TARGET_OS_WATCH
 #import <XCTest/XCTest.h>
 
@@ -64,4 +66,7 @@ - (void)testRollbarLevelToAulLevel {
 }
 
 @end
-#endif
+
+#endif // !TARGET_OS_WATCH
+
+#endif //TARGET_OS_OSX
diff --git a/RollbarAUL/Tests/RollbarAULTests-ObjC/RollbarAulOSLogEntryLogLevelConverterTests.m b/RollbarAUL/Tests/RollbarAULTests-ObjC/RollbarAulOSLogEntryLogLevelConverterTests.m
@@ -1,4 +1,7 @@
 @import Foundation;
+
+#if TARGET_OS_OSX
+
 @import OSLog;
 @import RollbarNotifier;
 @import RollbarAUL;
@@ -51,4 +54,7 @@ - (void)testRollbarLevelToOSLogEntryLogLevel {
 }
 
 @end
-#endif
+
+#endif //!TARGET_OS_WATCH
+
+#endif //TARGET_OS_OSX