From c222ce3afa8d5dab9fa898bfdf5d15d7cb49bd7f Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Fri, 12 Feb 2021 17:36:30 -0800 Subject: [PATCH] fixing Cocoapods podspeecs --- RollbarCommon.podspec | 8 ++- RollbarDeploys.podspec | 8 ++- RollbarKSCrash.podspec | 8 ++- RollbarNotifier.podspec | 8 ++- .../RollbarNotifier/DTOs/RollbarConfig.m | 2 +- RollbarPLCrashReporter.podspec | 8 ++- RollbarSDK.podspec | 57 ++++++++++++++++++- 7 files changed, 92 insertions(+), 7 deletions(-) diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index 1fc5e52e..895fa549 100644 --- a/RollbarCommon.podspec +++ b/RollbarCommon.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-alpha30" + s.version = "2.0.0-alpha31" s.name = "RollbarCommon" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -59,4 +59,10 @@ Pod::Spec.new do |s| # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**" # } + s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + + s.tvos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + s.tvos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + end diff --git a/RollbarDeploys.podspec b/RollbarDeploys.podspec index d142f5b3..d01fe527 100644 --- a/RollbarDeploys.podspec +++ b/RollbarDeploys.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-alpha30" + s.version = "2.0.0-alpha31" s.name = "RollbarDeploys" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -60,4 +60,10 @@ Pod::Spec.new do |s| # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**" # } + s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + + s.tvos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + s.tvos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + end diff --git a/RollbarKSCrash.podspec b/RollbarKSCrash.podspec index 53b7cbd9..bf24fef6 100644 --- a/RollbarKSCrash.podspec +++ b/RollbarKSCrash.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-alpha30" + s.version = "2.0.0-alpha31" s.name = "RollbarKSCrash" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -61,4 +61,10 @@ Pod::Spec.new do |s| # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**" # } + s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + + s.tvos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + s.tvos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + end diff --git a/RollbarNotifier.podspec b/RollbarNotifier.podspec index dfba2ff5..b8a5515f 100644 --- a/RollbarNotifier.podspec +++ b/RollbarNotifier.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-alpha30" + s.version = "2.0.0-alpha31" s.name = "RollbarNotifier" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -60,4 +60,10 @@ Pod::Spec.new do |s| # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**" # } + s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + + s.tvos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + s.tvos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + end diff --git a/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m b/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m index 6091af84..99b032f6 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-alpha30"; +static NSString * const NOTIFIER_VERSION = @"2.0.0-alpha31"; static NSString * const NOTIFIER_NAME = @"rollbar-apple"; diff --git a/RollbarPLCrashReporter.podspec b/RollbarPLCrashReporter.podspec index cc4be222..2c333821 100644 --- a/RollbarPLCrashReporter.podspec +++ b/RollbarPLCrashReporter.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-alpha30" + s.version = "2.0.0-alpha31" s.name = "RollbarPLCrashReporter" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -61,4 +61,10 @@ Pod::Spec.new do |s| # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**" # } + s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + + s.tvos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + s.tvos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + end diff --git a/RollbarSDK.podspec b/RollbarSDK.podspec index 7a15d5fa..79ae73a4 100644 --- a/RollbarSDK.podspec +++ b/RollbarSDK.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |sdk| # Rollbar SDK: # ============ - sdk.version = "2.0.0-alpha30" + sdk.version = "2.0.0-alpha31" sdk.name = "RollbarSDK" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." sdk.description = <<-DESC @@ -70,6 +70,10 @@ Pod::Spec.new do |sdk| # "USE_HEADERMAP" => "NO", # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/RollbarCommon/**" # } + common.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + common.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + common.tvos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + common.tvos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } end # RollbarDeploys module: @@ -106,6 +110,10 @@ Pod::Spec.new do |sdk| # "USE_HEADERMAP" => "NO", # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/RollbarDeploys/**" # } + deploys.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + deploys.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + deploys.tvos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + deploys.tvos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } end # RollbarNotifier module: @@ -142,6 +150,10 @@ Pod::Spec.new do |sdk| # "USE_HEADERMAP" => "NO", # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/RollbarNotifier/**" # } + notifier.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + notifier.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + notifier.tvos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + notifier.tvos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } end # RollbarKSCrash module: @@ -177,6 +189,49 @@ Pod::Spec.new do |sdk| # "USE_HEADERMAP" => "NO", # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{kscrash.name}/**" # } + kscrash.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + kscrash.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + kscrash.tvos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + kscrash.tvos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + end + + # RollbarPLCrashReporter module: + # ============================== + sdk.subspec "RollbarPLCrashReporter" do |plcrash| + plcrash.name = "RollbarPLCrashReporter" + + # Any platform, if omitted: + # plcrash.platform = :ios + # plcrash.platform = :ios, "5.0" + + # When using multiple platforms: + # plcrash.ios.deployment_target = "9.0" + # plcrash.osx.deployment_target = "10.10" + # plcrash.tvos.deployment_target = "11.0" + # plcrash.watchos.deployment_target = "4.0" + + plcrash.source_files = "#{plcrash.name}/Sources/#{plcrash.name}/**/*.{h,m}" + # plcrash.exclude_files = "Classes/Exclude" + plcrash.public_header_files = "#{plcrash.name}/Sources/#{plcrash.name}/include/*.h" + # plcrash.module_map = "#{plcrash.name}/Sources/#{plcrash.name}/include/module.modulemap" + # plcrash.resource = "../rollbar-logo.png" + # plcrash.resources = "Resources/*.png" + # plcrash.preserve_paths = "FilesToSave", "MoreFilesToSave" + + plcrash.dependency "RollbarSDK/RollbarCommon" + plcrash.framework = "Foundation" + # plcrash.frameworks = "SomeFramework", "AnotherFramework" + # plcrash.library = "iconv" + # plcrash.dependency "JSONKit", "~> 1.4" + plcrash.requires_arc = true + # plcrash.xcconfig = { + # "USE_HEADERMAP" => "NO", + # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{plcrash.name}/**" + # } + plcrash.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + plcrash.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + plcrash.tvos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } + plcrash.tvos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=appletvsimulator*]' => 'arm64' } end end