Merge pull request #73 from WideSpectrumComputing/master

fix: Notifier.podspec build issue
rollbar · Apr 19, 2021 · 8fbc611 · 8fbc611
2 parents 9d56010 + 31b4127
commit 8fbc611
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 9 deletions.
diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec
@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
 
-    s.version      = "2.0.0-beta.10"
+    s.version      = "2.0.0-beta.11"
     s.name         = "RollbarCommon"
     s.summary      = "Application or client side SDK for interacting with the Rollbar API Server."
     s.description  = <<-DESC

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

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

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

diff --git a/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m b/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m
@@ -22,7 +22,7 @@
 
 #pragma mark - constants
 
-static NSString * const NOTIFIER_VERSION = @"2.0.0-beta.10";
+static NSString * const NOTIFIER_VERSION = @"2.0.0-beta.11";
 
 static NSString * const NOTIFIER_NAME = @"rollbar-apple";
 

diff --git a/RollbarNotifier/Sources/RollbarNotifier/include/RollbarAulLogLevelConverter.h b/RollbarNotifier/Sources/RollbarNotifier/include/RollbarAulLogLevelConverter.h
@@ -6,12 +6,25 @@
 //
 
 @import Foundation;
-@import OSLog;
+
+//@import OSLog;
+//#if MAC_OS_X_VERSION_MIN_REQUIRED >= __IPHONE_6_0 //or 90000 // ios(9.0) and above
+//@import OSLog;
+//#endif
+//#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0 //or 90000 // ios(9.0) and above
+//@import OSLog;
+//#endif
+#if __has_include(<os/log.h>)
+  #include <os/log.h>
+#endif
 
 #import "RollbarLevel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
+//API_AVAILABLE(macos(10.15))
+//API_UNAVAILABLE(ios, tvos, watchos)
+API_AVAILABLE(macos(10.11), ios(9.0), watchos(2.0), tvos(9.0))
 @interface RollbarAulLogLevelConverter : NSObject
 
 + (os_log_type_t) RollbarLevelToAulLevel:(RollbarLevel)value;

diff --git a/RollbarNotifier/Sources/RollbarNotifier/include/RollbarAulOSLogEntryLogLevelConverter.h b/RollbarNotifier/Sources/RollbarNotifier/include/RollbarAulOSLogEntryLogLevelConverter.h
@@ -6,7 +6,11 @@
 //
 
 @import Foundation;
-@import OSLog;
+
+//@import OSLog;
+#if __has_include(<oslog/OSLog.h>)
+  #include <oslog/OSLog.h>
+#endif
 
 #import "RollbarLevel.h"
 

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

diff --git a/RollbarSDK.experimental_podspec b/RollbarSDK.experimental_podspec
@@ -9,7 +9,7 @@ Pod::Spec.new do |sdk|
 
     # Rollbar SDK:
     # ============
-    sdk.version      = "2.0.0-beta.10"
+    sdk.version      = "2.0.0-beta.11"
     sdk.name         = "RollbarSDK"
     s.summary      = "Application or client side SDK for interacting with the Rollbar API Server."
     sdk.description  = <<-DESC