From 31b412729c6449314b976c0aa53b141da9f6d514 Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Mon, 19 Apr 2021 14:17:37 -0700 Subject: [PATCH] fix: Notifier.podspec build issue --- RollbarCommon.podspec | 2 +- RollbarDeploys.podspec | 2 +- RollbarKSCrash.podspec | 2 +- RollbarNotifier.podspec | 2 +- .../Sources/RollbarNotifier/DTOs/RollbarConfig.m | 2 +- .../include/RollbarAulLogLevelConverter.h | 15 ++++++++++++++- .../RollbarAulOSLogEntryLogLevelConverter.h | 6 +++++- RollbarPLCrashReporter.podspec | 2 +- RollbarSDK.experimental_podspec | 2 +- 9 files changed, 26 insertions(+), 9 deletions(-) diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index 1f4f5424..dd5ba1f1 100644 --- 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 index 0886f176..e9f7bbda 100644 --- 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 index 2bed53ad..f4d5393b 100644 --- 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 index 9a6dbc1a..b4de2e2e 100644 --- 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 index 088d9566..232e09d0 100644 --- 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 index f2a2d013..36cbed5c 100644 --- 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() + #include +#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 index fc37831d..2564bbcb 100644 --- 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() + #include +#endif #import "RollbarLevel.h" diff --git a/RollbarPLCrashReporter.podspec b/RollbarPLCrashReporter.podspec index 0a1f5b74..9d7ec066 100644 --- 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 index 301786c4..e1b8a496 100644 --- 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