From 76c1fd8939ca5ff15a6b85e320a6dbc5837ce514 Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Wed, 14 Apr 2021 20:34:57 -0700 Subject: [PATCH 1/7] chore: updated macosAppSwiftCocoapods to use Rollbar-Apple SDK --- Demos/macosAppSwiftCocoapods/Podfile | 5 +-- Demos/macosAppSwiftCocoapods/Podfile.lock | 33 ++++++++++++------- .../project.pbxproj | 18 ++++++++++ .../macosAppSwiftCocoapods/AppDelegate.swift | 23 ++++++++----- .../RollbarDeploysDemoClient.swift | 22 ++++++------- 5 files changed, 67 insertions(+), 34 deletions(-) diff --git a/Demos/macosAppSwiftCocoapods/Podfile b/Demos/macosAppSwiftCocoapods/Podfile index b65fd4eb..6835cfbf 100644 --- a/Demos/macosAppSwiftCocoapods/Podfile +++ b/Demos/macosAppSwiftCocoapods/Podfile @@ -2,7 +2,8 @@ platform :osx, '10.12' use_frameworks! target 'macosAppSwiftCocoapods' do - pod 'RollbarNotifier', '~> 2.0.0-alpha10' - pod 'RollbarDeploys', '~> 2.0.0-alpha10' + pod 'RollbarNotifier', '~> 2.0.0-beta9' + pod 'RollbarPLCrashReporter', '~> 2.0.0-beta9' + pod 'RollbarDeploys', '~> 2.0.0-beta9' pod 'SwiftTryCatch2', '~> 2.0.2' end diff --git a/Demos/macosAppSwiftCocoapods/Podfile.lock b/Demos/macosAppSwiftCocoapods/Podfile.lock index ee1b94d0..79f51f44 100644 --- a/Demos/macosAppSwiftCocoapods/Podfile.lock +++ b/Demos/macosAppSwiftCocoapods/Podfile.lock @@ -1,29 +1,38 @@ PODS: - - RollbarCommon (2.0.0-alpha10) - - RollbarDeploys (2.0.0-alpha10): - - RollbarCommon (~> 2.0.0-alpha10) - - RollbarNotifier (2.0.0-alpha10): - - RollbarCommon (~> 2.0.0-alpha10) + - PLCrashReporter (1.8.1) + - RollbarCommon (2.0.0-beta9) + - RollbarDeploys (2.0.0-beta9): + - RollbarCommon (~> 2.0.0-beta9) + - RollbarNotifier (2.0.0-beta9): + - RollbarCommon (~> 2.0.0-beta9) + - RollbarPLCrashReporter (2.0.0-beta9): + - PLCrashReporter (~> 1.8.1) + - RollbarCommon (~> 2.0.0-beta9) - SwiftTryCatch2 (2.0.2) DEPENDENCIES: - - RollbarDeploys (~> 2.0.0-alpha10) - - RollbarNotifier (~> 2.0.0-alpha10) + - RollbarDeploys (~> 2.0.0-beta9) + - RollbarNotifier (~> 2.0.0-beta9) + - RollbarPLCrashReporter (~> 2.0.0-beta9) - SwiftTryCatch2 (~> 2.0.2) SPEC REPOS: trunk: + - PLCrashReporter - RollbarCommon - RollbarDeploys - RollbarNotifier + - RollbarPLCrashReporter - SwiftTryCatch2 SPEC CHECKSUMS: - RollbarCommon: 52e3c363f086892067f0a5441e41bd9085d3e5ea - RollbarDeploys: b5c2bd3e81051e6c43c27c002ea96770b0c3ad33 - RollbarNotifier: 6718ee9289226025e1c21e480681d2f253b46bf7 + PLCrashReporter: ea2d252e930f538a9f70f0b81bc9cce656651fbf + RollbarCommon: 0afe35e303d8ddb05bd0d5e24761fc3affee7000 + RollbarDeploys: 5eb0141692dc8b26f85c23594fdb4cb5eefd5592 + RollbarNotifier: d77402ae53edca08e6dcc272147965b2dfc99788 + RollbarPLCrashReporter: 21f3104db1322d8b712aa16f282d9d79c0db9bb0 SwiftTryCatch2: a1b6e301b0b1cc1c1af9849f13969979c706ff5e -PODFILE CHECKSUM: 67529d6dedcfb826f7616a719a8416f3036c8986 +PODFILE CHECKSUM: d66c1189dc3566db72d76263a3cf457dfe83e099 -COCOAPODS: 1.9.3 +COCOAPODS: 1.10.1 diff --git a/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods.xcodeproj/project.pbxproj b/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods.xcodeproj/project.pbxproj index 8bbc5a87..f553ffa7 100644 --- a/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods.xcodeproj/project.pbxproj +++ b/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods.xcodeproj/project.pbxproj @@ -104,6 +104,7 @@ 55897B5A249AF55800C0DB50 /* Frameworks */, 55897B5B249AF55800C0DB50 /* Resources */, 3026AAC828926FEC1AD7A7F2 /* [CP] Embed Pods Frameworks */, + 8E785FC25997F97402972ACD /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -199,6 +200,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 8E785FC25997F97402972ACD /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-macosAppSwiftCocoapods/Pods-macosAppSwiftCocoapods-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-macosAppSwiftCocoapods/Pods-macosAppSwiftCocoapods-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-macosAppSwiftCocoapods/Pods-macosAppSwiftCocoapods-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/AppDelegate.swift b/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/AppDelegate.swift index aced1f7e..8aee520c 100644 --- a/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/AppDelegate.swift +++ b/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/AppDelegate.swift @@ -8,6 +8,7 @@ import Cocoa import RollbarNotifier +import RollbarPLCrashReporter import SwiftTryCatch2 @NSApplicationMain @@ -22,29 +23,33 @@ class AppDelegate: NSObject, NSApplicationDelegate { self.callTroublemaker(); }, catchRun: { (exception) in - Rollbar.error("Got an exception!", exception: exception) + Rollbar.log(RollbarLevel.error, exception: exception!) }, finallyRun: { - Rollbar.info("Post-trouble notification!"); + Rollbar.log(RollbarLevel.info, message:"Post-trouble notification!"); }) } func applicationWillTerminate(_ aNotification: Notification) { // Insert code here to tear down your application - Rollbar.info("The hosting application is terminating..."); + Rollbar.log(RollbarLevel.info, message:"The hosting application is terminating..."); } func initRollbar() { // configure Rollbar: - let config = RollbarConfiguration.init(); - + let config = RollbarConfig(); //config.crashLevel = @"critical"; - config.environment = "samples"; - config.asRollbarConfig().customData = [ "someKey": "someValue", ]; + config.destination.accessToken = "2ffc7997ed864dda94f63e7b7daae0f3"; + config.destination.environment = "samples"; + config.customData = [ "someKey": "someValue", ]; + + let crashCollector = RollbarPLCrashCollector(); + // init Rollbar shared instance: - Rollbar.initWithAccessToken("2ffc7997ed864dda94f63e7b7daae0f3", configuration: config); - Rollbar.info("Rollbar is up and running! Enjoy your remote error and log monitoring..."); + Rollbar.initWithConfiguration(config, crashCollector: nil);//crashCollector); + Rollbar.log(RollbarLevel.info, + message:"Rollbar is up and running! Enjoy your remote error and log monitoring..."); } func demonstrateDeployApiUasege() { diff --git a/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/RollbarDeploysDemoClient.swift b/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/RollbarDeploysDemoClient.swift index 007fa65d..de22e885 100644 --- a/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/RollbarDeploysDemoClient.swift +++ b/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/RollbarDeploysDemoClient.swift @@ -45,18 +45,18 @@ class RollbarDeploysObserver } class RollbarDeploysDemoClient { - + func demoDeploymentRegistration() { - + let dateFormatter = DateFormatter(); dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"; - + let environment = "unit-tests123"; let comment = "a new deploy at \(dateFormatter.string(from: Date()))"; let revision = "a_revision"; let localUsername = "UnitTestRunner"; let rollbarUsername = "rollbar"; - + let observer = RollbarDeploysObserver() let deployment = RollbarDeployment( environment: environment, @@ -70,11 +70,11 @@ class RollbarDeploysDemoClient { deploymentRegistrationObserver: (observer as! NSObjectProtocol & RollbarDeploymentRegistrationObserver), deploymentDetailsObserver: (observer as! NSObjectProtocol & RollbarDeploymentDetailsObserver), deploymentDetailsPageObserver: (observer as! NSObjectProtocol & RollbarDeploymentDetailsPageObserver)); - deploysManager!.register(deployment!) + deploysManager.register(deployment!) } - + func demoGetDeploymentDetailsById() { - + let testDeploymentId = "9961771"; let observer = RollbarDeploysObserver(); let deploysManager = RollbarDeploysManager( @@ -83,11 +83,11 @@ class RollbarDeploysDemoClient { deploymentRegistrationObserver: (observer as! NSObjectProtocol & RollbarDeploymentRegistrationObserver), deploymentDetailsObserver: (observer as! NSObjectProtocol & RollbarDeploymentDetailsObserver), deploymentDetailsPageObserver: (observer as! NSObjectProtocol & RollbarDeploymentDetailsPageObserver)); - deploysManager!.getDeploymentWithDeployId(testDeploymentId); + deploysManager.getDeploymentWithDeployId(testDeploymentId); } - + func demoGetDeploymentsPage() { - + let observer = RollbarDeploysObserver(); let deploysManager = RollbarDeploysManager( writeAccessToken: "0d7ef175a2e14bc9b48732af2b2652f9", @@ -95,7 +95,7 @@ class RollbarDeploysDemoClient { deploymentRegistrationObserver: (observer as! NSObjectProtocol & RollbarDeploymentRegistrationObserver), deploymentDetailsObserver: (observer as! NSObjectProtocol & RollbarDeploymentDetailsObserver), deploymentDetailsPageObserver: (observer as! NSObjectProtocol & RollbarDeploymentDetailsPageObserver)); - deploysManager!.getDeploymentsPageNumber(1); + deploysManager.getDeploymentsPageNumber(1); } } From 55e1ab56c68ea52aaa756d673722a193dddc04a3 Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Wed, 14 Apr 2021 20:46:00 -0700 Subject: [PATCH 2/7] chore: updated macosAppSwiftCocoapods project settings --- .../macosAppSwiftCocoapods.xcodeproj/project.pbxproj | 4 +++- .../macosAppSwiftCocoapods/AppDelegate.swift | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods.xcodeproj/project.pbxproj b/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods.xcodeproj/project.pbxproj index f553ffa7..997b5b03 100644 --- a/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods.xcodeproj/project.pbxproj +++ b/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods.xcodeproj/project.pbxproj @@ -122,7 +122,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1150; - LastUpgradeCheck = 1150; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = "Andrey Kornich (Wide Spectrum Computing LLC)"; TargetAttributes = { 55897B5C249AF55800C0DB50 = { @@ -270,6 +270,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -330,6 +331,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/AppDelegate.swift b/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/AppDelegate.swift index 8aee520c..1666945d 100644 --- a/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/AppDelegate.swift +++ b/Demos/macosAppSwiftCocoapods/macosAppSwiftCocoapods/AppDelegate.swift @@ -44,7 +44,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { config.destination.environment = "samples"; config.customData = [ "someKey": "someValue", ]; - let crashCollector = RollbarPLCrashCollector(); + //let crashCollector = RollbarPLCrashCollector(); // init Rollbar shared instance: Rollbar.initWithConfiguration(config, crashCollector: nil);//crashCollector); From d12e5488d6c83366f2a332b7c97a48e878e196d2 Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Wed, 14 Apr 2021 22:18:47 -0700 Subject: [PATCH 3/7] fix: ref #66 App terminated due to signal 5 instantiating RollbarPLCrashCollector --- .../iosAppObjC.xcodeproj/project.pbxproj | 11 +++++++++-- Demos/iosAppObjC/iosAppObjC/AppDelegate.m | 14 +++++++------- .../iosAppObjC/iosAppObjC/iosAppObjC.entitlements | 6 +----- Demos/macosAppObjC/macosAppObjC/AppDelegate.m | 4 ++-- .../RollbarPLCrashCollector.m | 9 +++++---- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Demos/iosAppObjC/iosAppObjC.xcodeproj/project.pbxproj b/Demos/iosAppObjC/iosAppObjC.xcodeproj/project.pbxproj index afeab606..d9f7b84e 100644 --- a/Demos/iosAppObjC/iosAppObjC.xcodeproj/project.pbxproj +++ b/Demos/iosAppObjC/iosAppObjC.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 5533980A2627F4670031D02C /* RollbarPLCrashReporter in Frameworks */ = {isa = PBXBuildFile; productRef = 553398092627F4670031D02C /* RollbarPLCrashReporter */; }; 55684F702553B4C400F82F34 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 55684F6F2553B4C400F82F34 /* AppDelegate.m */; }; 55684F732553B4C400F82F34 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 55684F722553B4C400F82F34 /* SceneDelegate.m */; }; 55684F762553B4C400F82F34 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55684F752553B4C400F82F34 /* ViewController.m */; }; @@ -44,6 +45,7 @@ files = ( 55684F912553B7EE00F82F34 /* RollbarNotifier in Frameworks */, 55684F9D2553BD1C00F82F34 /* NetworkExtension.framework in Frameworks */, + 5533980A2627F4670031D02C /* RollbarPLCrashReporter in Frameworks */, 55684F8D2553B7E100F82F34 /* RollbarDeploys in Frameworks */, 55684F8F2553B7E800F82F34 /* RollbarKSCrash in Frameworks */, ); @@ -116,6 +118,7 @@ 55684F8C2553B7E100F82F34 /* RollbarDeploys */, 55684F8E2553B7E800F82F34 /* RollbarKSCrash */, 55684F902553B7EE00F82F34 /* RollbarNotifier */, + 553398092627F4670031D02C /* RollbarPLCrashReporter */, ); productName = iosAppObjC; productReference = 55684F6B2553B4C400F82F34 /* iosAppObjC.app */; @@ -319,7 +322,7 @@ CODE_SIGN_ENTITLEMENTS = iosAppObjC/iosAppObjC.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = LDX6L68VZJ; INFOPLIST_FILE = iosAppObjC/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -340,7 +343,7 @@ CODE_SIGN_ENTITLEMENTS = iosAppObjC/iosAppObjC.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = LDX6L68VZJ; INFOPLIST_FILE = iosAppObjC/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -377,6 +380,10 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ + 553398092627F4670031D02C /* RollbarPLCrashReporter */ = { + isa = XCSwiftPackageProductDependency; + productName = RollbarPLCrashReporter; + }; 55684F8C2553B7E100F82F34 /* RollbarDeploys */ = { isa = XCSwiftPackageProductDependency; productName = RollbarDeploys; diff --git a/Demos/iosAppObjC/iosAppObjC/AppDelegate.m b/Demos/iosAppObjC/iosAppObjC/AppDelegate.m index 61ec7b27..3ec5d112 100644 --- a/Demos/iosAppObjC/iosAppObjC/AppDelegate.m +++ b/Demos/iosAppObjC/iosAppObjC/AppDelegate.m @@ -9,10 +9,7 @@ @import RollbarNotifier; @import RollbarKSCrash; - -@interface AppDelegate () - -@end +@import RollbarPLCrashReporter; @implementation AppDelegate @@ -73,14 +70,17 @@ - (void)application:(UIApplication *)application didDiscardSceneSessions:(NSSet< - (void)initRollbar { - // configure Rollbar: + // configure Rollbar: RollbarConfig *config = [RollbarConfig new]; config.destination.accessToken = @"2ffc7997ed864dda94f63e7b7daae0f3"; config.destination.environment = @"samples"; config.customData = @{ @"someKey": @"someValue", }; - // init Rollbar shared instance: - id crashCollector = [[RollbarKSCrashCollector alloc] init]; + + // init Rollbar shared instance: + //id crashCollector = [[RollbarKSCrashCollector alloc] init]; + id crashCollector = [[RollbarPLCrashCollector alloc] init]; + [Rollbar initWithConfiguration:config crashCollector:crashCollector]; [Rollbar infoMessage:@"Rollbar is up and running! Enjoy your remote error and log monitoring..."]; diff --git a/Demos/iosAppObjC/iosAppObjC/iosAppObjC.entitlements b/Demos/iosAppObjC/iosAppObjC/iosAppObjC.entitlements index d05c0ec3..729dd6a1 100644 --- a/Demos/iosAppObjC/iosAppObjC/iosAppObjC.entitlements +++ b/Demos/iosAppObjC/iosAppObjC/iosAppObjC.entitlements @@ -3,10 +3,6 @@ com.apple.developer.networking.networkextension - - app-proxy-provider - content-filter-provider - packet-tunnel-provider - + diff --git a/Demos/macosAppObjC/macosAppObjC/AppDelegate.m b/Demos/macosAppObjC/macosAppObjC/AppDelegate.m index e39a9273..3dbcdac9 100644 --- a/Demos/macosAppObjC/macosAppObjC/AppDelegate.m +++ b/Demos/macosAppObjC/macosAppObjC/AppDelegate.m @@ -84,9 +84,9 @@ - (void)initRollbar { // optional crash reporter: id crashCollector = - nil; + //nil; //[[RollbarKSCrashCollector alloc] init]; - //[[RollbarPLCrashCollector alloc] init]; + [[RollbarPLCrashCollector alloc] init]; // init Rollbar shared instance: [Rollbar initWithConfiguration:config crashCollector:crashCollector]; diff --git a/RollbarPLCrashReporter/Sources/RollbarPLCrashReporter/RollbarPLCrashCollector.m b/RollbarPLCrashReporter/Sources/RollbarPLCrashReporter/RollbarPLCrashCollector.m index b4b42b12..0fb145f4 100644 --- a/RollbarPLCrashReporter/Sources/RollbarPLCrashReporter/RollbarPLCrashCollector.m +++ b/RollbarPLCrashReporter/Sources/RollbarPLCrashReporter/RollbarPLCrashCollector.m @@ -20,11 +20,12 @@ +(void)initialize { // Configure our reporter: PLCrashReporterSignalHandlerType signalHandlerType = -#if !TARGET_OS_TV - PLCrashReporterSignalHandlerTypeMach; -#else +//#if !TARGET_OS_TV +//#if !TARGET_OS_SIMULATOR +// PLCrashReporterSignalHandlerTypeMach; +//#else PLCrashReporterSignalHandlerTypeBSD; -#endif +//#endif PLCrashReporterConfig *config = [[PLCrashReporterConfig alloc] initWithSignalHandlerType: signalHandlerType symbolicationStrategy: PLCrashReporterSymbolicationStrategyAll From 56970e7497fa379399b4336e9701774ab0984bad Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Wed, 14 Apr 2021 22:24:56 -0700 Subject: [PATCH 4/7] chore: version increment, resolve #66 --- CHANGELOG.md | 3 +++ RollbarCommon.podspec | 2 +- RollbarDeploys.podspec | 2 +- RollbarKSCrash.podspec | 2 +- RollbarNotifier.podspec | 2 +- RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m | 2 +- RollbarPLCrashReporter.podspec | 2 +- RollbarSDK.experimental_podspec | 2 +- RollbarSwift.podspec | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cb09e86..087e8aab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,9 @@ The change log has moved to this repo's [GitHub Releases Page](https://github.co ## Release Notes +**2.0.0-beta10** +- fix: resolve #66 - App terminated due to signal 5 instantiating RollbarPLCrashCollector + **2.0.0-beta8** - fix: point all the Cocoapods podspecs to proper documentation site. diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index 4a872972..55a94626 100644 --- a/RollbarCommon.podspec +++ b/RollbarCommon.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta9" + s.version = "2.0.0-beta10" 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 58e28d6c..1b14a483 100644 --- a/RollbarDeploys.podspec +++ b/RollbarDeploys.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta9" + s.version = "2.0.0-beta10" 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 87fab9f2..2afd1097 100644 --- a/RollbarKSCrash.podspec +++ b/RollbarKSCrash.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta9" + s.version = "2.0.0-beta10" 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 7a86f26b..6122db66 100644 --- a/RollbarNotifier.podspec +++ b/RollbarNotifier.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta9" + s.version = "2.0.0-beta10" 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 bbcb27d7..118bbcdd 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-beta9"; +static NSString * const NOTIFIER_VERSION = @"2.0.0-beta10"; static NSString * const NOTIFIER_NAME = @"rollbar-apple"; diff --git a/RollbarPLCrashReporter.podspec b/RollbarPLCrashReporter.podspec index 027b2d6f..666a9f64 100644 --- a/RollbarPLCrashReporter.podspec +++ b/RollbarPLCrashReporter.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta9" + s.version = "2.0.0-beta10" 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 5652d1a1..4e384401 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-beta9" + sdk.version = "2.0.0-beta10" sdk.name = "RollbarSDK" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." sdk.description = <<-DESC diff --git a/RollbarSwift.podspec b/RollbarSwift.podspec index 782617f3..1619c573 100644 --- a/RollbarSwift.podspec +++ b/RollbarSwift.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta9" + s.version = "2.0.0-beta10" s.name = "RollbarSwift" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC From 5cae2634b1d2ca6431e0b6dbe7355054634f1d37 Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Thu, 15 Apr 2021 12:31:10 -0700 Subject: [PATCH 5/7] fix: resolve #66 --- Demos/macosAppObjC/macosAppObjC/AppDelegate.m | 18 +++++++++--------- .../RollbarPLCrashCollector.m | 13 +++++++++---- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Demos/macosAppObjC/macosAppObjC/AppDelegate.m b/Demos/macosAppObjC/macosAppObjC/AppDelegate.m index 3dbcdac9..5ad66bc4 100644 --- a/Demos/macosAppObjC/macosAppObjC/AppDelegate.m +++ b/Demos/macosAppObjC/macosAppObjC/AppDelegate.m @@ -12,7 +12,7 @@ @import RollbarNotifier; -//@import RollbarKSCrash; +@import RollbarKSCrash; @import RollbarPLCrashReporter; __attribute__((noinline)) static void crashIt (void) { @@ -55,14 +55,14 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { // now, cause a crash: - //[self callTroublemaker]; - //@throw NSInternalInconsistencyException; - //[self performSelector:@selector(die_die)]; - //[self performSelector:NSSelectorFromString(@"crashme:") withObject:nil afterDelay:10]; - //assert(NO); - //exit(0); - //crashIt(); - + [self callTroublemaker]; + @throw NSInternalInconsistencyException; + [self performSelector:@selector(die_die)]; + [self performSelector:NSSelectorFromString(@"crashme:") withObject:nil afterDelay:10]; + assert(NO); + exit(0); + crashIt(); + } diff --git a/RollbarPLCrashReporter/Sources/RollbarPLCrashReporter/RollbarPLCrashCollector.m b/RollbarPLCrashReporter/Sources/RollbarPLCrashReporter/RollbarPLCrashCollector.m index 0fb145f4..e6e85d22 100644 --- a/RollbarPLCrashReporter/Sources/RollbarPLCrashReporter/RollbarPLCrashCollector.m +++ b/RollbarPLCrashReporter/Sources/RollbarPLCrashReporter/RollbarPLCrashCollector.m @@ -20,12 +20,17 @@ +(void)initialize { // Configure our reporter: PLCrashReporterSignalHandlerType signalHandlerType = -//#if !TARGET_OS_TV -//#if !TARGET_OS_SIMULATOR -// PLCrashReporterSignalHandlerTypeMach; + // NOTE: looking at comments around the PLCRASH_FEATURE_MACH_EXCEPTIONS + // definition in PLCrashReporter and matching it with actual experiences + // on the current Apple OSs releases we should only use + // the PLCrashReporterSignalHandlerTypeBSD option for now. + // Leaving the alternative commented out for the reference in the future. +//#if PLCRASH_FEATURE_MACH_EXCEPTIONS +// PLCrashReporterSignalHandlerTypeMach; //#else - PLCrashReporterSignalHandlerTypeBSD; + PLCrashReporterSignalHandlerTypeBSD; //#endif + PLCrashReporterConfig *config = [[PLCrashReporterConfig alloc] initWithSignalHandlerType: signalHandlerType symbolicationStrategy: PLCrashReporterSymbolicationStrategyAll From e1d78bfeecd033922f4a425c70d642ca8a7fccef Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Thu, 15 Apr 2021 17:13:56 -0700 Subject: [PATCH 6/7] chore: updating version format for beta releases to comply with the SemanticVersion2.0 --- CHANGELOG.md | 2 +- RollbarCommon.podspec | 2 +- RollbarDeploys.podspec | 2 +- RollbarKSCrash.podspec | 2 +- RollbarNotifier.podspec | 2 +- RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m | 2 +- RollbarPLCrashReporter.podspec | 2 +- RollbarSDK.experimental_podspec | 2 +- RollbarSwift.podspec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 087e8aab..2c2aa05b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ The change log has moved to this repo's [GitHub Releases Page](https://github.co ## Release Notes -**2.0.0-beta10** +**2.0.0-beta.10** - fix: resolve #66 - App terminated due to signal 5 instantiating RollbarPLCrashCollector **2.0.0-beta8** diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index 55a94626..b053527f 100644 --- a/RollbarCommon.podspec +++ b/RollbarCommon.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta10" + s.version = "2.0.0-beta.10" 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 1b14a483..5e379f9a 100644 --- a/RollbarDeploys.podspec +++ b/RollbarDeploys.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta10" + s.version = "2.0.0-beta.10" 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 2afd1097..dc338ff1 100644 --- a/RollbarKSCrash.podspec +++ b/RollbarKSCrash.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta10" + s.version = "2.0.0-beta.10" 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 6122db66..48dada04 100644 --- a/RollbarNotifier.podspec +++ b/RollbarNotifier.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta10" + s.version = "2.0.0-beta.10" 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 118bbcdd..088d9566 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-beta10"; +static NSString * const NOTIFIER_VERSION = @"2.0.0-beta.10"; static NSString * const NOTIFIER_NAME = @"rollbar-apple"; diff --git a/RollbarPLCrashReporter.podspec b/RollbarPLCrashReporter.podspec index 666a9f64..b3fdf5bb 100644 --- a/RollbarPLCrashReporter.podspec +++ b/RollbarPLCrashReporter.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta10" + s.version = "2.0.0-beta.10" 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 4e384401..71e9cacd 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-beta10" + sdk.version = "2.0.0-beta.10" sdk.name = "RollbarSDK" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." sdk.description = <<-DESC diff --git a/RollbarSwift.podspec b/RollbarSwift.podspec index 1619c573..826ecb23 100644 --- a/RollbarSwift.podspec +++ b/RollbarSwift.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-beta10" + s.version = "2.0.0-beta.10" s.name = "RollbarSwift" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC From 970c00983aecbd9dd4cbe05930763b78246b615d Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Thu, 15 Apr 2021 18:40:30 -0700 Subject: [PATCH 7/7] chore: adopting the podspecs to the versioning schema changes --- RollbarCommon.podspec | 2 +- RollbarDeploys.podspec | 2 +- RollbarKSCrash.podspec | 2 +- RollbarNotifier.podspec | 2 +- RollbarPLCrashReporter.podspec | 2 +- RollbarSDK.experimental_podspec | 2 +- RollbarSwift.podspec | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index b053527f..1f4f5424 100644 --- a/RollbarCommon.podspec +++ b/RollbarCommon.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| # 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 => "v#{s.version}" + :tag => "#{s.version}" } s.resource = "rollbar-logo.png" # s.resources = "Resources/*.png" diff --git a/RollbarDeploys.podspec b/RollbarDeploys.podspec index 5e379f9a..0886f176 100644 --- a/RollbarDeploys.podspec +++ b/RollbarDeploys.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| # 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 => "v#{s.version}" + :tag => "#{s.version}" } s.resource = "rollbar-logo.png" # s.resources = "Resources/*.png" diff --git a/RollbarKSCrash.podspec b/RollbarKSCrash.podspec index dc338ff1..2bed53ad 100644 --- a/RollbarKSCrash.podspec +++ b/RollbarKSCrash.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| # 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 => "v#{s.version}" + :tag => "#{s.version}" } s.resource = "rollbar-logo.png" # s.resources = "Resources/*.png" diff --git a/RollbarNotifier.podspec b/RollbarNotifier.podspec index 48dada04..9a6dbc1a 100644 --- a/RollbarNotifier.podspec +++ b/RollbarNotifier.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| # 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 => "v#{s.version}" + :tag => "#{s.version}" } s.resource = "rollbar-logo.png" # s.resources = "Resources/*.png" diff --git a/RollbarPLCrashReporter.podspec b/RollbarPLCrashReporter.podspec index b3fdf5bb..0a1f5b74 100644 --- a/RollbarPLCrashReporter.podspec +++ b/RollbarPLCrashReporter.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| # 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 => "v#{s.version}" + :tag => "#{s.version}" } s.resource = "rollbar-logo.png" # s.resources = "Resources/*.png" diff --git a/RollbarSDK.experimental_podspec b/RollbarSDK.experimental_podspec index 71e9cacd..301786c4 100644 --- a/RollbarSDK.experimental_podspec +++ b/RollbarSDK.experimental_podspec @@ -29,7 +29,7 @@ Pod::Spec.new do |sdk| # Or just: sdk.author = "Andrey Kornich" sdk.social_media_url = "http://twitter.com/rollbar" sdk.source = { :git => "https://github.com/rollbar/rollbar-apple.git", - :tag => "v#{sdk.version}" + :tag => "#{sdk.version}" } sdk.resource = "rollbar-logo.png" sdk.ios.deployment_target = "9.0" diff --git a/RollbarSwift.podspec b/RollbarSwift.podspec index 826ecb23..d9364e44 100644 --- a/RollbarSwift.podspec +++ b/RollbarSwift.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| # 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 => "v#{s.version}" + :tag => "#{s.version}" } s.resource = "rollbar-logo.png" # s.resources = "Resources/*.png"