diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cf9fb3..f57b792 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 +**1.12.14** +- fix: resolve #340: Cocoapods build failing under Xcode 12.0 +- fix: resolve #338: Deployment target for Rollbar changed to iOS 12.0 + **1.12.13** - fix: resolve #334: Error if archiving Mac OS app (Xcode 12.2, Mac OS Big Sur) diff --git a/Rollbar.podspec b/Rollbar.podspec index ba273f0..7dc5c81 100644 --- a/Rollbar.podspec +++ b/Rollbar.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| - s.version = "1.12.13" + s.version = "1.12.14" s.name = "Rollbar" s.summary = "Objective-C library for crash reporting and logging with Rollbar. It works on iOS and macOS." s.description = <<-DESC @@ -13,19 +13,13 @@ Pod::Spec.new do |s| s.license = { :type => "MIT", :file => "LICENSE" } s.author = { "Rollbar" => "support@rollbar.com" } s.social_media_url = "http://twitter.com/rollbar" - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '9.0' s.osx.deployment_target = '10.12' s.source = { :git => "https://github.com/rollbar/rollbar-ios.git", :tag => "v#{s.version}", :submodules => true } - s.pod_target_xcconfig = {'ONLY_ACTIVE_ARCH'=>"YES"} - s.user_target_xcconfig = {'ONLY_ACTIVE_ARCH'=>"YES"} - - s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } - s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } - s.source_files = 'KSCrash/Source/KSCrash/**/*.{m,h,mm,c,cpp}', 'RollbarFramework/*.{h,m}', @@ -142,6 +136,14 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Rollbar/**\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Rollbar/**\"", + "ONLY_ACTIVE_ARCH" => "YES", + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" } + + s.user_target_xcconfig = { + "ONLY_ACTIVE_ARCH" => "YES", + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" + } + end diff --git a/Rollbar.xcodeproj/project.pbxproj b/Rollbar.xcodeproj/project.pbxproj index e4a2d1d..712955e 100644 --- a/Rollbar.xcodeproj/project.pbxproj +++ b/Rollbar.xcodeproj/project.pbxproj @@ -4427,7 +4427,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.12.13; + CURRENT_PROJECT_VERSION = 1.12.14; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = LDX6L68VZJ; ENABLE_BITCODE = YES; @@ -4494,7 +4494,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 1.12.13; + CURRENT_PROJECT_VERSION = 1.12.14; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = LDX6L68VZJ; ENABLE_BITCODE = YES; diff --git a/Rollbar/Notifier_DTOs/RollbarConfig.m b/Rollbar/Notifier_DTOs/RollbarConfig.m index c138bd3..731a666 100644 --- a/Rollbar/Notifier_DTOs/RollbarConfig.m +++ b/Rollbar/Notifier_DTOs/RollbarConfig.m @@ -23,7 +23,7 @@ #pragma mark - constants -static NSString * const NOTIFIER_VERSION = @"1.12.13"; +static NSString * const NOTIFIER_VERSION = @"1.12.14"; #define NOTIFIER_NAME_PREFIX = @"rollbar-"; #if TARGET_OS_IPHONE