From 35ef0c263995ba8157c702fd9e0567f4bcd748ab Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Tue, 19 Apr 2022 15:15:53 -0700 Subject: [PATCH] fix: ref #154 --- CHANGELOG.md | 4 ++ RollbarAUL.podspec | 2 +- RollbarCocoaLumberjack.podspec | 72 +++++++++++++++++++ RollbarCommon.podspec | 2 +- .../include/RollbarMemoryStatsDescriptors.h | 5 ++ .../RollbarCommon/include/RollbarMemoryUtil.h | 5 ++ RollbarDeploys.podspec | 2 +- RollbarKSCrash.podspec | 2 +- RollbarNotifier.podspec | 2 +- .../RollbarNotifier/DTOs/RollbarConfig.m | 2 +- RollbarPLCrashReporter.podspec | 2 +- RollbarSDK.experimental_podspec | 2 +- .../contents.xcworkspacedata | 3 + RollbarSwift.podspec | 2 +- 14 files changed, 98 insertions(+), 9 deletions(-) create mode 100644 RollbarCocoaLumberjack.podspec diff --git a/CHANGELOG.md b/CHANGELOG.md index a2f39954..720a92eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,10 @@ The change log has moved to this repo's [GitHub Releases Page](https://github.co ## Release Notes +### 2.2.1 + +- fix: resolve #154 - Fix Cocoapods builds. + ### 2.2.0 - feat: resolve #148 - MemTel: Implement the memory usage Telemetry auto-collection based on the config options. diff --git a/RollbarAUL.podspec b/RollbarAUL.podspec index fb41a9ab..0f8009f2 100644 --- a/RollbarAUL.podspec +++ b/RollbarAUL.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.2.0" + s.version = "2.2.1" s.name = "RollbarAUL" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC diff --git a/RollbarCocoaLumberjack.podspec b/RollbarCocoaLumberjack.podspec new file mode 100644 index 00000000..15728629 --- /dev/null +++ b/RollbarCocoaLumberjack.podspec @@ -0,0 +1,72 @@ +# +# Be sure to run `pod spec lint RollbarPLCrashReporter.podspec' to ensure this is a valid spec. +# +# To learn more about Podspec attributes see https://guides.cocoapods.org/syntax/podspec.html +# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ +# + +Pod::Spec.new do |s| + + s.version = "2.2.1" + s.name = "RollbarCocoaLumberjack" + s.summary = "Application or client side SDK for interacting with the Rollbar API Server." + s.description = <<-DESC + Find, fix, and resolve errors with Rollbar. + Easily send error data using Rollbar API. + Analyze, de-dupe, send alerts, and prepare the data for further analysis. + Search, sort, and prioritize via the Rollbar dashboard. + DESC + s.homepage = "https://rollbar.com" + # s.screenshots = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif" + s.license = { :type => "MIT", :file => "LICENSE" } + # s.license = "MIT (example)" + s.documentation_url = "https://docs.rollbar.com/docs/apple" + s.authors = { "Andrey Kornich (Wide Spectrum Computing LLC)" => "akornich@gmail.com", + "Rollbar" => "support@rollbar.com" } + # s.author = { "Andrey Kornich" => "akornich@gmail.com" } + # Or just: s.author = "Andrey Kornich" + s.social_media_url = "http://twitter.com/rollbar" + s.source = { :git => "https://github.com/rollbar/rollbar-apple.git", + :tag => "#{s.version}" + } + s.resource = "rollbar-logo.png" + # s.resources = "Resources/*.png" + + # When using multiple platforms: + s.ios.deployment_target = "9.0" + s.osx.deployment_target = "10.10" + s.tvos.deployment_target = "11.0" + s.watchos.deployment_target = "4.0" + # Any platform, if omitted: + # s.platform = :ios + # s.platform = :ios, "5.0" + + s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" + s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" + s.module_map = "#{s.name}/Sources/#{s.name}/include/module.modulemap" + # s.exclude_files = "Classes/Exclude" + # s.preserve_paths = "FilesToSave", "MoreFilesToSave" + + s.static_framework = true + s.framework = "Foundation" + s.dependency "RollbarCommon", "~> #{s.version}" + s.dependency "RollbarNotifier", "~> #{s.version}" + s.dependency "CocoaLumberjack", "~> 3.7.4" + # s.frameworks = "SomeFramework", "AnotherFramework" + # s.library = "iconv" + # s.libraries = "iconv", "xml2" + # s.dependency "JSONKit", "~> 1.4" + + s.requires_arc = true + # s.xcconfig = { + # "USE_HEADERMAP" => "NO", + # "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**" + # } + + # s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" } + # s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" } + + # s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" } + # s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" } + +end diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index 1e34c20b..51487faf 100644 --- a/RollbarCommon.podspec +++ b/RollbarCommon.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.2.0" + s.version = "2.2.1" s.name = "RollbarCommon" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC diff --git a/RollbarCommon/Sources/RollbarCommon/include/RollbarMemoryStatsDescriptors.h b/RollbarCommon/Sources/RollbarCommon/include/RollbarMemoryStatsDescriptors.h index 429b1918..1bbaeb21 100644 --- a/RollbarCommon/Sources/RollbarCommon/include/RollbarMemoryStatsDescriptors.h +++ b/RollbarCommon/Sources/RollbarCommon/include/RollbarMemoryStatsDescriptors.h @@ -5,6 +5,9 @@ // Created by Andrey Kornich on 2022-04-07. // +#ifndef RollbarMemoryStatsDescriptors_h +#define RollbarMemoryStatsDescriptors_h + @import Foundation; #pragma mark - RollbarMemoryStatsType enum @@ -63,3 +66,5 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + +#endif //RollbarMemoryStatsDescriptors_h diff --git a/RollbarCommon/Sources/RollbarCommon/include/RollbarMemoryUtil.h b/RollbarCommon/Sources/RollbarCommon/include/RollbarMemoryUtil.h index a3a6519d..554c645a 100644 --- a/RollbarCommon/Sources/RollbarCommon/include/RollbarMemoryUtil.h +++ b/RollbarCommon/Sources/RollbarCommon/include/RollbarMemoryUtil.h @@ -5,6 +5,9 @@ // Created by Andrey Kornich on 2022-04-07. // +#ifndef RollbarMemoryUtil_h +#define RollbarMemoryUtil_h + @import Foundation; NS_ASSUME_NONNULL_BEGIN @@ -42,3 +45,5 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + +#endif //RollbarMemoryUtil_h diff --git a/RollbarDeploys.podspec b/RollbarDeploys.podspec index 56df0257..96738c37 100644 --- a/RollbarDeploys.podspec +++ b/RollbarDeploys.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.2.0" + s.version = "2.2.1" 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 a4a52870..2c0f50e0 100644 --- a/RollbarKSCrash.podspec +++ b/RollbarKSCrash.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.2.0" + s.version = "2.2.1" 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 26ab0e65..91ef9946 100644 --- a/RollbarNotifier.podspec +++ b/RollbarNotifier.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.2.0" + s.version = "2.2.1" 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 d6797b75..ea165aa5 100644 --- a/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m +++ b/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m @@ -14,7 +14,7 @@ #pragma mark - constants -static NSString * const NOTIFIER_VERSION = @"2.2.0"; +static NSString * const NOTIFIER_VERSION = @"2.2.1"; static NSString * const NOTIFIER_NAME = @"rollbar-apple"; diff --git a/RollbarPLCrashReporter.podspec b/RollbarPLCrashReporter.podspec index dee1f8d8..09329f82 100644 --- a/RollbarPLCrashReporter.podspec +++ b/RollbarPLCrashReporter.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.2.0" + s.version = "2.2.1" 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 e859ecd6..2e3d6aca 100644 --- a/RollbarSDK.experimental_podspec +++ b/RollbarSDK.experimental_podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |sdk| # Rollbar SDK: # ============ - sdk.version = "2.2.0" + sdk.version = "2.2.1" sdk.name = "RollbarSDK" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." sdk.description = <<-DESC diff --git a/RollbarSDK.xcworkspace/contents.xcworkspacedata b/RollbarSDK.xcworkspace/contents.xcworkspacedata index 2ae6dedb..84120e30 100644 --- a/RollbarSDK.xcworkspace/contents.xcworkspacedata +++ b/RollbarSDK.xcworkspace/contents.xcworkspacedata @@ -52,6 +52,9 @@ + + diff --git a/RollbarSwift.podspec b/RollbarSwift.podspec index 6d764b81..2bfb9373 100644 --- a/RollbarSwift.podspec +++ b/RollbarSwift.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.2.0" + s.version = "2.2.1" s.name = "RollbarSwift" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC