Deprecated: Function get_magic_quotes_gpc() is deprecated in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 99

Deprecated: The each() function is deprecated. This message will be suppressed on further calls in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 619

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 832

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839

Warning: Cannot modify header information - headers already sent by (output started at /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php:99) in /hermes/walnacweb04/walnacweb04ab/b2791/pow.jasaeld/htdocs/De1337/nothing/index.php on line 839
From 1fa07017dfab26cc225d2437f703ec4bd8a6bdeb Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 11:06:28 -0300 Subject: [PATCH 01/13] Dropped os version requirements on packages --- Package.resolved | 4 ++-- Package.swift | 8 ++++---- RollbarAUL/Package.swift | 8 ++++---- RollbarCocoaLumberjack/Package.swift | 8 ++++---- RollbarCommon/Package.swift | 8 ++++---- RollbarDeploys/Package.swift | 8 ++++---- RollbarNotifier/Package.swift | 8 ++++---- UnitTesting/Package.swift | 8 ++++---- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Package.resolved b/Package.resolved index a61fce38..21d76983 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-log.git", "state" : { - "revision" : "32e8d724467f8fe623624570367e3d50c5638e46", - "version" : "1.5.2" + "revision" : "6fe203dc33195667ce1759bf0182975e4653ba1c", + "version" : "1.4.4" } } ], diff --git a/Package.swift b/Package.swift index 62bb6835..96886569 100644 --- a/Package.swift +++ b/Package.swift @@ -5,10 +5,10 @@ import PackageDescription let package = Package( name: "RollbarSDK", platforms: [ - .macOS(.v12), - .iOS(.v14), - .tvOS(.v14), - .watchOS(.v8), + .macOS(.v10_13), + .iOS(.v11), + .tvOS(.v11), + .watchOS(.v4), ], products: [ .library(name: "RollbarCommon", targets: ["RollbarCommon"]), diff --git a/RollbarAUL/Package.swift b/RollbarAUL/Package.swift index 69f63cb2..e58246c6 100644 --- a/RollbarAUL/Package.swift +++ b/RollbarAUL/Package.swift @@ -5,10 +5,10 @@ import PackageDescription let package = Package( name: "RollbarAUL", platforms: [ - .macOS(.v12), - .iOS(.v14), - .tvOS(.v14), - .watchOS(.v8), + .macOS(.v10_13), + .iOS(.v11), + .tvOS(.v11), + .watchOS(.v4), ], products: [ .library( diff --git a/RollbarCocoaLumberjack/Package.swift b/RollbarCocoaLumberjack/Package.swift index 8a410a6c..f0f64a49 100644 --- a/RollbarCocoaLumberjack/Package.swift +++ b/RollbarCocoaLumberjack/Package.swift @@ -5,10 +5,10 @@ import PackageDescription let package = Package( name: "RollbarCocoaLumberjack", platforms: [ - .macOS(.v12), - .iOS(.v14), - .tvOS(.v14), - .watchOS(.v8), + .macOS(.v10_13), + .iOS(.v11), + .tvOS(.v11), + .watchOS(.v4), ], products: [ .library( diff --git a/RollbarCommon/Package.swift b/RollbarCommon/Package.swift index f8d75b25..3309be2d 100644 --- a/RollbarCommon/Package.swift +++ b/RollbarCommon/Package.swift @@ -5,10 +5,10 @@ import PackageDescription let package = Package( name: "RollbarCommon", platforms: [ - .macOS(.v12), - .iOS(.v14), - .tvOS(.v14), - .watchOS(.v8), + .macOS(.v10_13), + .iOS(.v11), + .tvOS(.v11), + .watchOS(.v4), ], products: [ .library(name: "RollbarCommon", targets: ["RollbarCommon"]), diff --git a/RollbarDeploys/Package.swift b/RollbarDeploys/Package.swift index 011b16e3..0696911a 100644 --- a/RollbarDeploys/Package.swift +++ b/RollbarDeploys/Package.swift @@ -5,10 +5,10 @@ import PackageDescription let package = Package( name: "RollbarDeploys", platforms: [ - .macOS(.v12), - .iOS(.v14), - .tvOS(.v14), - .watchOS(.v8), + .macOS(.v10_13), + .iOS(.v11), + .tvOS(.v11), + .watchOS(.v4), ], products: [ .library( diff --git a/RollbarNotifier/Package.swift b/RollbarNotifier/Package.swift index d5c8ab53..52b9eb43 100644 --- a/RollbarNotifier/Package.swift +++ b/RollbarNotifier/Package.swift @@ -5,10 +5,10 @@ import PackageDescription let package = Package( name: "RollbarNotifier", platforms: [ - .macOS(.v12), - .iOS(.v14), - .tvOS(.v14), - .watchOS(.v8), + .macOS(.v10_13), + .iOS(.v11), + .tvOS(.v11), + .watchOS(.v4), ], products: [ .library( diff --git a/UnitTesting/Package.swift b/UnitTesting/Package.swift index 72381e95..91c32eb7 100644 --- a/UnitTesting/Package.swift +++ b/UnitTesting/Package.swift @@ -5,10 +5,10 @@ import PackageDescription let package = Package( name: "UnitTesting", platforms: [ - .macOS(.v12), - .iOS(.v14), - .tvOS(.v14), - .watchOS(.v8), + .macOS(.v10_13), + .iOS(.v11), + .tvOS(.v11), + .watchOS(.v4), ], products: [ .library( From 1d45c50ff447089459b2deace4a738b2de1fdba7 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 13:17:28 -0300 Subject: [PATCH 02/13] Dropped os version requirements on podspecs dsa --- Package.resolved | 4 ++-- Rollbar.podspec | 8 ++++---- RollbarAUL.podspec | 2 +- RollbarCocoaLumberjack.podspec | 8 ++++---- RollbarCommon.podspec | 8 ++++---- RollbarCrash.podspec | 8 ++++---- RollbarDeploys.podspec | 6 +++--- RollbarNotifier.podspec | 8 ++++---- RollbarReport.podspec | 8 ++++---- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Package.resolved b/Package.resolved index 21d76983..a61fce38 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-log.git", "state" : { - "revision" : "6fe203dc33195667ce1759bf0182975e4653ba1c", - "version" : "1.4.4" + "revision" : "32e8d724467f8fe623624570367e3d50c5638e46", + "version" : "1.5.2" } } ], diff --git a/Rollbar.podspec b/Rollbar.podspec index 302c2a9d..7908f0e9 100644 --- a/Rollbar.podspec +++ b/Rollbar.podspec @@ -19,10 +19,10 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "https://twitter.com/rollbar" - s.osx.deployment_target = "12.0" - s.ios.deployment_target = "14.0" - s.tvos.deployment_target = "14.0" - s.watchos.deployment_target = "8.0" + s.osx.deployment_target = "10.13" + s.ios.deployment_target = "11.0" + s.tvos.deployment_target = "11.0" + s.watchos.deployment_target = "4.0" s.module_name = "Rollbar" s.requires_arc = true diff --git a/RollbarAUL.podspec b/RollbarAUL.podspec index 6e4ae63f..2b9ae9cf 100644 --- a/RollbarAUL.podspec +++ b/RollbarAUL.podspec @@ -17,7 +17,7 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "https://twitter.com/rollbar" - s.osx.deployment_target = "12.0" + s.osx.deployment_target = "10.13" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" diff --git a/RollbarCocoaLumberjack.podspec b/RollbarCocoaLumberjack.podspec index 1f4e3036..e2dca9ed 100644 --- a/RollbarCocoaLumberjack.podspec +++ b/RollbarCocoaLumberjack.podspec @@ -17,10 +17,10 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "https://twitter.com/rollbar" - s.osx.deployment_target = "12.0" - s.ios.deployment_target = "14.0" - s.tvos.deployment_target = "14.0" - s.watchos.deployment_target = "8.0" + s.osx.deployment_target = "10.13" + s.ios.deployment_target = "11.0" + s.tvos.deployment_target = "11.0" + s.watchos.deployment_target = "4.0" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index 8ffba305..3421f127 100644 --- a/RollbarCommon.podspec +++ b/RollbarCommon.podspec @@ -17,10 +17,10 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "https://twitter.com/rollbar" - s.osx.deployment_target = "12.0" - s.ios.deployment_target = "14.0" - s.tvos.deployment_target = "14.0" - s.watchos.deployment_target = "8.0" + s.osx.deployment_target = "10.13" + s.ios.deployment_target = "11.0" + s.tvos.deployment_target = "11.0" + s.watchos.deployment_target = "4.0" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" diff --git a/RollbarCrash.podspec b/RollbarCrash.podspec index b2339f3b..466ead46 100644 --- a/RollbarCrash.podspec +++ b/RollbarCrash.podspec @@ -17,10 +17,10 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "https://twitter.com/rollbar" - s.osx.deployment_target = "12.0" - s.ios.deployment_target = "14.0" - s.tvos.deployment_target = "14.0" - s.watchos.deployment_target = "8.0" + s.osx.deployment_target = "10.13" + s.ios.deployment_target = "11.0" + s.tvos.deployment_target = "11.0" + s.watchos.deployment_target = "4.0" s.module_name = "RollbarCrash" s.source_files = "RollbarNotifier/Sources/#{s.name}/**/*.{h,c,cpp,m}" diff --git a/RollbarDeploys.podspec b/RollbarDeploys.podspec index 351369e2..d32a0bd0 100644 --- a/RollbarDeploys.podspec +++ b/RollbarDeploys.podspec @@ -17,9 +17,9 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "https://twitter.com/rollbar" - s.osx.deployment_target = "12.0" - s.ios.deployment_target = "14.0" - s.tvos.deployment_target = "14.0" + s.osx.deployment_target = "10.13" + s.ios.deployment_target = "11.0" + s.tvos.deployment_target = "11.0" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" diff --git a/RollbarNotifier.podspec b/RollbarNotifier.podspec index 209522ad..fadcc7e7 100644 --- a/RollbarNotifier.podspec +++ b/RollbarNotifier.podspec @@ -17,10 +17,10 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "https://twitter.com/rollbar" - s.osx.deployment_target = "12.0" - s.ios.deployment_target = "14.0" - s.tvos.deployment_target = "14.0" - s.watchos.deployment_target = "8.0" + s.osx.deployment_target = "10.13" + s.ios.deployment_target = "11.0" + s.tvos.deployment_target = "11.0" + s.watchos.deployment_target = "4.0" s.module_name = "RollbarNotifier" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" diff --git a/RollbarReport.podspec b/RollbarReport.podspec index fc2cc51d..e40193c8 100644 --- a/RollbarReport.podspec +++ b/RollbarReport.podspec @@ -17,10 +17,10 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "https://twitter.com/rollbar" - s.osx.deployment_target = "12.0" - s.ios.deployment_target = "14.0" - s.tvos.deployment_target = "14.0" - s.watchos.deployment_target = "8.0" + s.osx.deployment_target = "10.13" + s.ios.deployment_target = "11.0" + s.tvos.deployment_target = "11.0" + s.watchos.deployment_target = "4.0" s.module_name = "RollbarReport" s.source_files = "RollbarNotifier/Sources/RollbarReport/**/*.swift" From 2e1009217e0e30ca1129986dd0c76be4441067d7 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 11:33:14 -0300 Subject: [PATCH 03/13] Drop usage of features from newer os versions dsa --- .../Sources/RollbarCommon/RollbarFileWriter.m | 38 +++++-------------- .../NSDate+RollbarTests.m | 4 +- .../RollbarNotifier/RollbarPayloadPostReply.m | 7 ++-- .../Sources/RollbarReport/Prelude.swift | 2 +- 4 files changed, 16 insertions(+), 35 deletions(-) diff --git a/RollbarCommon/Sources/RollbarCommon/RollbarFileWriter.m b/RollbarCommon/Sources/RollbarCommon/RollbarFileWriter.m index b7379a29..8c1c3628 100644 --- a/RollbarCommon/Sources/RollbarCommon/RollbarFileWriter.m +++ b/RollbarCommon/Sources/RollbarCommon/RollbarFileWriter.m @@ -28,45 +28,25 @@ + (BOOL)ensureFileExists: (nullable NSString *)fileFullPath { + (void)appendData:(nullable NSData *)data toFile:(nullable NSString *)fileFullPath { if (!(data && fileFullPath && (fileFullPath.length > 0))) { - RBCErr(@"Can't append data: %@ to file: %@!", data, fileFullPath); return; } // append-save the data into the file (assuming it exists): - NSError *error; - NSFileHandle *fileHandle = [NSFileHandle fileHandleForWritingAtPath:fileFullPath]; if (!fileHandle) { - - RBCErr(@" Error while acquiring file handle for: %@", fileFullPath); - return; - } - - unsigned long long offset; - if (![fileHandle seekToEndReturningOffset:&offset error:&error]) { - - RBCErr(@" Error while seeking to file end of %@: %@", fileFullPath, [error localizedDescription]); - return; - } - - if (![fileHandle writeData:data error:&error]) { - - RBCErr(@" Error while writing data to %@: %@", fileFullPath, [error localizedDescription]); - return; - } - - if (![fileHandle writeData:[@"\n" dataUsingEncoding:NSUTF8StringEncoding] error:&error]) { - - RBCErr(@" Error while writing data to %@: %@", fileFullPath, [error localizedDescription]); + RBCErr(@"Error while acquiring file handle for: %@", fileFullPath); return; } - - if (![fileHandle closeAndReturnError:&error]) { - - RBCErr(@" Error while closing %@: %@", fileFullPath, [error localizedDescription]); - return; + + @try { + [fileHandle seekToEndOfFile]; + [fileHandle writeData:data]; + [fileHandle writeData:[@"\n" dataUsingEncoding:NSUTF8StringEncoding]]; + [fileHandle closeFile]; + } @catch (NSException *e) { + RBCErr(@"Error while appendingData to %@: %@", fileFullPath, [error localizedDescription]); } } diff --git a/RollbarCommon/Tests/RollbarCommonTests-ObjC/NSDate+RollbarTests.m b/RollbarCommon/Tests/RollbarCommonTests-ObjC/NSDate+RollbarTests.m index 257f5d87..98e74a03 100644 --- a/RollbarCommon/Tests/RollbarCommonTests-ObjC/NSDate+RollbarTests.m +++ b/RollbarCommon/Tests/RollbarCommonTests-ObjC/NSDate+RollbarTests.m @@ -19,7 +19,7 @@ - (void)tearDown { - (void)testDateToString { if (@available(tvOS 13.0, *)) { - NSString *dateString = [[NSDate now] rollbar_toString]; + NSString *dateString = [[NSDate date] rollbar_toString]; XCTAssertNotNil(dateString); XCTAssertTrue(dateString.length > 0); } else { @@ -38,7 +38,7 @@ - (void)testPerformanceDateToString { [self measureBlock:^{ if (@available(tvOS 13.0, *)) { - NSString *dateString = [[NSDate now] rollbar_toString]; + NSString *dateString = [[NSDate date] rollbar_toString]; } else { // Fallback on earlier versions } diff --git a/RollbarNotifier/Sources/RollbarNotifier/RollbarPayloadPostReply.m b/RollbarNotifier/Sources/RollbarNotifier/RollbarPayloadPostReply.m index 8663d81e..ab3ebc6f 100644 --- a/RollbarNotifier/Sources/RollbarNotifier/RollbarPayloadPostReply.m +++ b/RollbarNotifier/Sources/RollbarNotifier/RollbarPayloadPostReply.m @@ -8,9 +8,10 @@ @implementation RollbarPayloadPostReply + (nullable RollbarPayloadPostReply *)replyFromHttpResponse:(nonnull NSHTTPURLResponse *)httpResponse { - NSInteger rateLimit = [[httpResponse valueForHTTPHeaderField:RESPONSE_HEADER_RATE_LIMIT] integerValue]; - NSInteger remainingCount = [[httpResponse valueForHTTPHeaderField:RESPONSE_HEADER_REMAINING_COUNT] integerValue]; - NSInteger remainingSeconds = [[httpResponse valueForHTTPHeaderField:RESPONSE_HEADER_REMAINING_SECONDS] integerValue]; + NSDictionary *headers = [httpResponse allHeaderFields]; + NSInteger rateLimit = [headers[RESPONSE_HEADER_RATE_LIMIT] integerValue]; + NSInteger remainingCount = [headers[RESPONSE_HEADER_REMAINING_COUNT] integerValue]; + NSInteger remainingSeconds = [headers[RESPONSE_HEADER_REMAINING_SECONDS] integerValue]; return [[RollbarPayloadPostReply alloc] initWithStatusCode:httpResponse.statusCode rateLimit:rateLimit diff --git a/RollbarNotifier/Sources/RollbarReport/Prelude.swift b/RollbarNotifier/Sources/RollbarReport/Prelude.swift index 681d9695..57442a31 100644 --- a/RollbarNotifier/Sources/RollbarReport/Prelude.swift +++ b/RollbarNotifier/Sources/RollbarReport/Prelude.swift @@ -156,7 +156,7 @@ extension Sequence { extension Collection where Self.SubSequence == ArraySlice { /// Returns this collection split into slices of the given length. - func chunks(of len: Self.Index) -> some Collection> { + func chunks(of len: Self.Index) -> [ArraySlice] { stride(from: self.startIndex, to: self.endIndex, by: len).map { self[$0 ..< Swift.min($0 + len, self.endIndex)] } From 08558ab85378164afe81fad9f87661d9c0974bbc Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 11:11:19 -0300 Subject: [PATCH 04/13] Dropped ObjC demo minimum req to iOS 11 --- .../RollbarObjCDemo.xcodeproj/project.pbxproj | 12 +-- .../RollbarObjCDemo/AppDelegate.h | 2 + .../RollbarObjCDemo/AppDelegate.m | 11 --- .../Base.lproj/Main.storyboard | 76 +++++++++---------- .../RollbarObjCDemo/Info.plist | 25 ------ .../RollbarObjCDemo/SceneDelegate.h | 8 -- .../RollbarObjCDemo/SceneDelegate.m | 5 -- 7 files changed, 42 insertions(+), 97 deletions(-) delete mode 100644 Examples/RollbarObjCDemo/RollbarObjCDemo/Info.plist delete mode 100644 Examples/RollbarObjCDemo/RollbarObjCDemo/SceneDelegate.h delete mode 100644 Examples/RollbarObjCDemo/RollbarObjCDemo/SceneDelegate.m diff --git a/Examples/RollbarObjCDemo/RollbarObjCDemo.xcodeproj/project.pbxproj b/Examples/RollbarObjCDemo/RollbarObjCDemo.xcodeproj/project.pbxproj index e356c10e..141be418 100644 --- a/Examples/RollbarObjCDemo/RollbarObjCDemo.xcodeproj/project.pbxproj +++ b/Examples/RollbarObjCDemo/RollbarObjCDemo.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 3BDB825A292D67900093AC9D /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BDB8258292D67900093AC9D /* SceneDelegate.m */; }; 55684F702553B4C400F82F34 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 55684F6F2553B4C400F82F34 /* AppDelegate.m */; }; 55684F762553B4C400F82F34 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55684F752553B4C400F82F34 /* ViewController.m */; }; 55684F792553B4C400F82F34 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 55684F772553B4C400F82F34 /* Main.storyboard */; }; @@ -19,9 +18,6 @@ /* Begin PBXFileReference section */ 3B1DED342A6846A0003936E7 /* RollbarObjCDemo.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = RollbarObjCDemo.entitlements; sourceTree = ""; }; - 3BDB8258292D67900093AC9D /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = ""; }; - 3BDB8259292D67900093AC9D /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = ""; }; - 3BDB825B292E34990093AC9D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 55684F6B2553B4C400F82F34 /* RollbarObjCDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RollbarObjCDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 55684F6E2553B4C400F82F34 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 55684F6F2553B4C400F82F34 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; @@ -69,15 +65,12 @@ 55684F6E2553B4C400F82F34 /* AppDelegate.h */, 55684F6F2553B4C400F82F34 /* AppDelegate.m */, 55684F802553B4C700F82F34 /* main.m */, - 3BDB8259292D67900093AC9D /* SceneDelegate.h */, - 3BDB8258292D67900093AC9D /* SceneDelegate.m */, 55684F742553B4C400F82F34 /* ViewController.h */, 55684F752553B4C400F82F34 /* ViewController.m */, 55684F7C2553B4C700F82F34 /* LaunchScreen.storyboard */, 55684F772553B4C400F82F34 /* Main.storyboard */, 3B1DED342A6846A0003936E7 /* RollbarObjCDemo.entitlements */, 55684F7A2553B4C700F82F34 /* Assets.xcassets */, - 3BDB825B292E34990093AC9D /* Info.plist */, ); path = RollbarObjCDemo; sourceTree = ""; @@ -166,7 +159,6 @@ 55684F762553B4C400F82F34 /* ViewController.m in Sources */, 55684F702553B4C400F82F34 /* AppDelegate.m in Sources */, 55684F812553B4C700F82F34 /* main.m in Sources */, - 3BDB825A292D67900093AC9D /* SceneDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -318,7 +310,6 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 9P5JVC2F34; - INFOPLIST_FILE = RollbarObjCDemo/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Rollbar ObjC Demo"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; @@ -327,6 +318,7 @@ INFOPLIST_KEY_UIRequiredDeviceCapabilities = armv7; INFOPLIST_KEY_UIRequiresFullScreen = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -349,7 +341,6 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 9P5JVC2F34; - INFOPLIST_FILE = RollbarObjCDemo/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Rollbar ObjC Demo"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; @@ -358,6 +349,7 @@ INFOPLIST_KEY_UIRequiredDeviceCapabilities = armv7; INFOPLIST_KEY_UIRequiresFullScreen = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/Examples/RollbarObjCDemo/RollbarObjCDemo/AppDelegate.h b/Examples/RollbarObjCDemo/RollbarObjCDemo/AppDelegate.h index 3254d7a6..230a761d 100644 --- a/Examples/RollbarObjCDemo/RollbarObjCDemo/AppDelegate.h +++ b/Examples/RollbarObjCDemo/RollbarObjCDemo/AppDelegate.h @@ -2,5 +2,7 @@ @interface AppDelegate : UIResponder +@property (nullable, nonatomic, strong) UIWindow *window; + @end diff --git a/Examples/RollbarObjCDemo/RollbarObjCDemo/AppDelegate.m b/Examples/RollbarObjCDemo/RollbarObjCDemo/AppDelegate.m index e1397e17..64545fa0 100644 --- a/Examples/RollbarObjCDemo/RollbarObjCDemo/AppDelegate.m +++ b/Examples/RollbarObjCDemo/RollbarObjCDemo/AppDelegate.m @@ -23,15 +23,4 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( return YES; } -#pragma mark - UISceneSession lifecycle - -- (UISceneConfiguration *) application:(UIApplication *)application -configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession - options:(UISceneConnectionOptions *)options { - // Called when a new scene session is being created. - // Use this method to select a configuration to create the new scene with. - return [[UISceneConfiguration alloc] initWithName:@"Default Configuration" - sessionRole:connectingSceneSession.role]; -} - @end diff --git a/Examples/RollbarObjCDemo/RollbarObjCDemo/Base.lproj/Main.storyboard b/Examples/RollbarObjCDemo/RollbarObjCDemo/Base.lproj/Main.storyboard index e780711c..e734a17e 100644 --- a/Examples/RollbarObjCDemo/RollbarObjCDemo/Base.lproj/Main.storyboard +++ b/Examples/RollbarObjCDemo/RollbarObjCDemo/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -27,97 +27,97 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/Examples/RollbarObjCDemo/RollbarObjCDemo/Info.plist b/Examples/RollbarObjCDemo/RollbarObjCDemo/Info.plist deleted file mode 100644 index 81ed29b7..00000000 --- a/Examples/RollbarObjCDemo/RollbarObjCDemo/Info.plist +++ /dev/null @@ -1,25 +0,0 @@ - - - - - UIApplicationSceneManifest - - UIApplicationSupportsMultipleScenes - - UISceneConfigurations - - UIWindowSceneSessionRoleApplication - - - UISceneConfigurationName - Default Configuration - UISceneDelegateClassName - SceneDelegate - UISceneStoryboardFile - Main - - - - - - diff --git a/Examples/RollbarObjCDemo/RollbarObjCDemo/SceneDelegate.h b/Examples/RollbarObjCDemo/RollbarObjCDemo/SceneDelegate.h deleted file mode 100644 index b18ed508..00000000 --- a/Examples/RollbarObjCDemo/RollbarObjCDemo/SceneDelegate.h +++ /dev/null @@ -1,8 +0,0 @@ -@import UIKit; - -@interface SceneDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end - diff --git a/Examples/RollbarObjCDemo/RollbarObjCDemo/SceneDelegate.m b/Examples/RollbarObjCDemo/RollbarObjCDemo/SceneDelegate.m deleted file mode 100644 index 3ac0ce3d..00000000 --- a/Examples/RollbarObjCDemo/RollbarObjCDemo/SceneDelegate.m +++ /dev/null @@ -1,5 +0,0 @@ -#import "SceneDelegate.h" - -@implementation SceneDelegate - -@end From 4a4a9bbee2658f63762f123e28e78d05dc77fbbb Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 11:49:10 -0300 Subject: [PATCH 05/13] Dropped minimum os req of Demo to iOS 14 --- .../RollbarDemo.xcodeproj/project.pbxproj | 20 ++++- .../xcschemes/RollbarDemo.xcscheme | 77 +++++++++++++++++++ .../RollbarDemo/RollbarDemo/ContentView.swift | 3 +- .../RollbarDemo/LaunchScreen.storyboard | 40 ++++++++++ .../RollbarDemo/RollbarDemoApp.swift | 21 ++--- 5 files changed, 141 insertions(+), 20 deletions(-) create mode 100644 Examples/RollbarDemo/RollbarDemo.xcodeproj/xcshareddata/xcschemes/RollbarDemo.xcscheme create mode 100644 Examples/RollbarDemo/RollbarDemo/LaunchScreen.storyboard diff --git a/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj b/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj index c4eec9c7..aac6f5af 100644 --- a/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj +++ b/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 3B810F452A7B2D10001A3D29 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3B810F442A7B2D10001A3D29 /* LaunchScreen.storyboard */; }; 3BAD89E12A699BD300713F26 /* RollbarDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BAD89E02A699BD300713F26 /* RollbarDemoApp.swift */; }; 3BAD89E32A699BD300713F26 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BAD89E22A699BD300713F26 /* ContentView.swift */; }; 3BAD89E52A699BD400713F26 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3BAD89E42A699BD400713F26 /* Assets.xcassets */; }; @@ -16,6 +17,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 3B810F442A7B2D10001A3D29 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; 3BAD89DD2A699BD300713F26 /* RollbarDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RollbarDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3BAD89E02A699BD300713F26 /* RollbarDemoApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RollbarDemoApp.swift; sourceTree = ""; }; 3BAD89E22A699BD300713F26 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; @@ -57,10 +59,11 @@ 3BAD89DF2A699BD300713F26 /* RollbarDemo */ = { isa = PBXGroup; children = ( - 3BAD89E62A699BD400713F26 /* RollbarDemo.entitlements */, 3BAD89E02A699BD300713F26 /* RollbarDemoApp.swift */, 3BAD89E22A699BD300713F26 /* ContentView.swift */, 3BAD89EF2A699F9E00713F26 /* Prelude.swift */, + 3B810F442A7B2D10001A3D29 /* LaunchScreen.storyboard */, + 3BAD89E62A699BD400713F26 /* RollbarDemo.entitlements */, 3BAD89E42A699BD400713F26 /* Assets.xcassets */, 3BAD89E72A699BD400713F26 /* Preview Content */, ); @@ -143,6 +146,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3B810F452A7B2D10001A3D29 /* LaunchScreen.storyboard in Resources */, 3BAD89E92A699BD400713F26 /* Preview Assets.xcassets in Resources */, 3BAD89E52A699BD400713F26 /* Assets.xcassets in Resources */, ); @@ -197,6 +201,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -255,6 +260,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -281,14 +287,18 @@ CODE_SIGN_ENTITLEMENTS = RollbarDemo/RollbarDemo.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 70; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"RollbarDemo/Preview Content\""; DEVELOPMENT_TEAM = 9P5JVC2F34; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = "Rollbar Demo"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard; INFOPLIST_KEY_UIRequiresFullScreen = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; MARKETING_VERSION = 1.2; PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.apple.demo; @@ -311,14 +321,18 @@ CODE_SIGN_ENTITLEMENTS = RollbarDemo/RollbarDemo.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 70; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"RollbarDemo/Preview Content\""; DEVELOPMENT_TEAM = 9P5JVC2F34; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = "Rollbar Demo"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard; INFOPLIST_KEY_UIRequiresFullScreen = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; MARKETING_VERSION = 1.2; PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.apple.demo; diff --git a/Examples/RollbarDemo/RollbarDemo.xcodeproj/xcshareddata/xcschemes/RollbarDemo.xcscheme b/Examples/RollbarDemo/RollbarDemo.xcodeproj/xcshareddata/xcschemes/RollbarDemo.xcscheme new file mode 100644 index 00000000..03f18e93 --- /dev/null +++ b/Examples/RollbarDemo/RollbarDemo.xcodeproj/xcshareddata/xcschemes/RollbarDemo.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Examples/RollbarDemo/RollbarDemo/ContentView.swift b/Examples/RollbarDemo/RollbarDemo/ContentView.swift index 0f676b90..45c29f6a 100644 --- a/Examples/RollbarDemo/RollbarDemo/ContentView.swift +++ b/Examples/RollbarDemo/RollbarDemo/ContentView.swift @@ -17,8 +17,7 @@ struct ContentView: View { func button(_ title: String, action: @escaping () -> ()) -> some View { Button(title, action: action) - .buttonStyle(.bordered) - .tint(.blue) + .frame(height: 24.0) } func accessTokenIsValid(_ accessToken: String) -> Bool { diff --git a/Examples/RollbarDemo/RollbarDemo/LaunchScreen.storyboard b/Examples/RollbarDemo/RollbarDemo/LaunchScreen.storyboard new file mode 100644 index 00000000..c85e73fd --- /dev/null +++ b/Examples/RollbarDemo/RollbarDemo/LaunchScreen.storyboard @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Examples/RollbarDemo/RollbarDemo/RollbarDemoApp.swift b/Examples/RollbarDemo/RollbarDemo/RollbarDemoApp.swift index 959d3c96..4fccc60f 100644 --- a/Examples/RollbarDemo/RollbarDemo/RollbarDemoApp.swift +++ b/Examples/RollbarDemo/RollbarDemo/RollbarDemoApp.swift @@ -3,23 +3,10 @@ import RollbarNotifier @main struct RollbarDemoApp: App { - @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate - - var body: some Scene { - WindowGroup { - ContentView() - } - } -} - -class AppDelegate: NSObject, UIApplicationDelegate { @AppStorage("rollbar_endpoint") var endpoint = "https://api.rollbar.com/api/1/item/" @AppStorage("rollbar_post_client_item_access_token") var accessToken = "" - func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil - ) -> Bool { + init() { // Dynamically read these settings from your config settings on application startup. let accessToken = self.accessToken // Rollbar post_client_item access token let environment = "staging" @@ -68,8 +55,12 @@ class AppDelegate: NSObject, UIApplicationDelegate { // Initialize a Rollbar shared instance with a crash collector Rollbar.initWithConfiguration(config) + } - return true + var body: some Scene { + WindowGroup { + ContentView() + } } } From 4a7d99e12baf4bd35cae22a13e7ce606be807bf7 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 11:53:35 -0300 Subject: [PATCH 06/13] Xcode workspace shared stuff --- .../xcode/xcshareddata/xcschemes/RollbarAUL.xcscheme | 2 +- .../xcshareddata/xcschemes/RollbarCocoaLumberjack.xcscheme | 2 +- .../xcode/xcshareddata/xcschemes/RollbarCommon.xcscheme | 2 +- .../xcode/xcshareddata/xcschemes/RollbarDeploys.xcscheme | 2 +- .../xcode/xcshareddata/xcschemes/RollbarNotifier.xcscheme | 2 +- RollbarSDK.xcworkspace/contents.xcworkspacedata | 6 ++++++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/RollbarAUL/.swiftpm/xcode/xcshareddata/xcschemes/RollbarAUL.xcscheme b/RollbarAUL/.swiftpm/xcode/xcshareddata/xcschemes/RollbarAUL.xcscheme index 136ebda4..0ce0a167 100644 --- a/RollbarAUL/.swiftpm/xcode/xcshareddata/xcschemes/RollbarAUL.xcscheme +++ b/RollbarAUL/.swiftpm/xcode/xcshareddata/xcschemes/RollbarAUL.xcscheme @@ -1,6 +1,6 @@ + + + + From 3ee562234065405f798e81e6e0d6ec851e95d960 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 11:53:49 -0300 Subject: [PATCH 07/13] Changelog for dropping minimum os versions --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 673b7123..3bfdc93b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Release Notes +### Unreleased + +- Dropped minimum deployable OS requirements to iOS 11, macOS 10.13, tvOS 11, and watchOS 4. + ### 3.1.1 - Fixed archiving issue when integrating the SDK using Cocoapods. From 4680d80fc441051982e07f4c24d32cd9b5469040 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 15:28:16 -0300 Subject: [PATCH 08/13] Increase buffer size for crash report json allocation --- .../Sources/RollbarCrash/Recording/RollbarCrashReportFixer.c | 2 +- .../Sources/RollbarCrash/Util/RollbarCrashJSONCodec.h | 2 ++ .../Sources/RollbarCrash/Util/RollbarCrashJSONCodecObjC.m | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashReportFixer.c b/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashReportFixer.c index d5eae02d..ca5720df 100644 --- a/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashReportFixer.c +++ b/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashReportFixer.c @@ -291,7 +291,7 @@ char* rccrf_fixupCrashReport(const char* crashReport) .onNullElement = onNullElement, .onStringElement = onStringElement, }; - int stringBufferLength = 10000; + int stringBufferLength = RCMAX_STRINGBUFFERSIZE; char* stringBuffer = malloc((unsigned)stringBufferLength); int crashReportLength = (int)strlen(crashReport); int fixedReportLength = (int)(crashReportLength * 1.5); diff --git a/RollbarNotifier/Sources/RollbarCrash/Util/RollbarCrashJSONCodec.h b/RollbarNotifier/Sources/RollbarCrash/Util/RollbarCrashJSONCodec.h index de3c4e59..71280f9f 100644 --- a/RollbarNotifier/Sources/RollbarCrash/Util/RollbarCrashJSONCodec.h +++ b/RollbarNotifier/Sources/RollbarCrash/Util/RollbarCrashJSONCodec.h @@ -45,6 +45,8 @@ extern "C" { */ #define RollbarCrashJSON_SIZE_AUTOMATIC -1 +#define RCMAX_STRINGBUFFERSIZE 150000 + enum { /** Encoding or decoding: Everything completed without error */ diff --git a/RollbarNotifier/Sources/RollbarCrash/Util/RollbarCrashJSONCodecObjC.m b/RollbarNotifier/Sources/RollbarCrash/Util/RollbarCrashJSONCodecObjC.m index 9c478f0a..6bea879d 100644 --- a/RollbarNotifier/Sources/RollbarCrash/Util/RollbarCrashJSONCodecObjC.m +++ b/RollbarNotifier/Sources/RollbarCrash/Util/RollbarCrashJSONCodecObjC.m @@ -435,7 +435,7 @@ + (id) decode:(NSData*) JSONData { RollbarCrashJSONCodec* codec = [self codecWithEncodeOptions:0 decodeOptions:decodeOptions]; - NSMutableData* stringData = [NSMutableData dataWithLength:10001]; + NSMutableData* stringData = [NSMutableData dataWithLength:RCMAX_STRINGBUFFERSIZE+1]; int errorOffset; int result = rcjson_decode(JSONData.bytes, (int)JSONData.length, From d02009b203f1bbd6e14969d9715a5acb85e0bf83 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 19:30:25 -0300 Subject: [PATCH 09/13] Dedup first frame if necessary when subcode/address matches qaaa --- .../Recording/RollbarCrashHandler.m | 45 +++++++++++++++---- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashHandler.m b/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashHandler.m index 8a864a5f..899224fd 100644 --- a/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashHandler.m +++ b/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashHandler.m @@ -457,20 +457,49 @@ - (NSData*) loadCrashReportJSONWithID:(int64_t) reportID return nil; } -- (void) doctorReport:(NSMutableDictionary*) report +- (void) finalizeReport:(NSMutableDictionary*) report { - NSMutableDictionary* crashReport = report[@RollbarCrashField_Crash]; - if(crashReport != nil) - { + NSMutableDictionary* crashReport; + + if ((crashReport = report[@RollbarCrashField_Crash]) != NULL) { + [self cleanupReport:crashReport]; crashReport[@RollbarCrashField_Diagnosis] = [[RollbarCrashDoctor doctor] diagnoseCrash:report]; } - crashReport = report[@RollbarCrashField_RecrashReport][@RollbarCrashField_Crash]; - if(crashReport != nil) - { + + if ((crashReport = report[@RollbarCrashField_RecrashReport][@RollbarCrashField_Crash]) != NULL) { + [self cleanupReport:crashReport]; crashReport[@RollbarCrashField_Diagnosis] = [[RollbarCrashDoctor doctor] diagnoseCrash:report]; } } +- (void) cleanupReport:(NSMutableDictionary*) crashReport +{ + NSNumber *address = crashReport[@RollbarCrashField_Error][@RollbarCrashField_Address]; + NSNumber *subcode = crashReport[@RollbarCrashField_Error][@RollbarCrashField_Mach][@RollbarCrashField_Subcode]; + if (![address isEqualToNumber:subcode]) { + return; + } + + [self dedupLinkRegisterFrames:crashReport]; +} + +- (void) dedupFrames:(NSMutableDictionary*) crashReport forAddress:(NSNumber*) address +{ + NSArray *threads = crashReport[@RollbarCrashField_Threads]; + for (NSDictionary *thread in threads) { + NSMutableArray *frames = thread[@RollbarCrashField_Backtrace][@RollbarCrashField_Contents]; + NSIndexSet *indexes = [frames indexesOfObjectsPassingTest:^BOOL(NSDictionary * _Nonnull frame, NSUInteger idx, BOOL *_) { + return [frame[@RollbarCrashField_InstructionAddr] isEqualToNumber:address]; + }]; + + if (indexes.firstIndex == 0 && indexes.lastIndex == 1 + && [frames[indexes.firstIndex] isEqualToDictionary:frames[indexes.lastIndex]]) + { + [frames removeObjectAtIndex:indexes.firstIndex]; + } + } +} + - (NSArray*)reportIDs { int reportCount = rc_getReportCount(); @@ -512,7 +541,7 @@ - (NSDictionary*) reportWithIntID:(int64_t) reportID RCLOG_ERROR(@"Could not load crash report"); return nil; } - [self doctorReport:crashReport]; + [self finalizeReport:crashReport]; return crashReport; } From d2dccc9ca76079a769e6ad7657b3ddd894f9a1e5 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 19:30:30 -0300 Subject: [PATCH 10/13] Dedup last frame when before last symbol address matches link register das bbb --- .../Recording/RollbarCrashHandler.m | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashHandler.m b/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashHandler.m index 899224fd..95002c71 100644 --- a/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashHandler.m +++ b/RollbarNotifier/Sources/RollbarCrash/Recording/RollbarCrashHandler.m @@ -467,7 +467,6 @@ - (void) finalizeReport:(NSMutableDictionary*) report } if ((crashReport = report[@RollbarCrashField_RecrashReport][@RollbarCrashField_Crash]) != NULL) { - [self cleanupReport:crashReport]; crashReport[@RollbarCrashField_Diagnosis] = [[RollbarCrashDoctor doctor] diagnoseCrash:report]; } } @@ -476,8 +475,8 @@ - (void) cleanupReport:(NSMutableDictionary*) crashReport { NSNumber *address = crashReport[@RollbarCrashField_Error][@RollbarCrashField_Address]; NSNumber *subcode = crashReport[@RollbarCrashField_Error][@RollbarCrashField_Mach][@RollbarCrashField_Subcode]; - if (![address isEqualToNumber:subcode]) { - return; + if ([address isEqualToNumber:subcode]) { + [self dedupFrames:crashReport forAddress:address]; } [self dedupLinkRegisterFrames:crashReport]; @@ -500,6 +499,28 @@ - (void) dedupFrames:(NSMutableDictionary*) crashReport forAddress:(NSNumber*) a } } +- (void) dedupLinkRegisterFrames:(NSMutableDictionary*) crashReport +{ + NSArray *threads = crashReport[@RollbarCrashField_Threads]; + for (NSDictionary *thread in threads) { + // Link register, if available, is the second address in the trace. + NSMutableArray *frames = thread[@RollbarCrashField_Backtrace][@RollbarCrashField_Contents]; + NSDictionary *registers = thread[@RollbarCrashField_Registers][@RollbarCrashField_Basic]; + if (frames.count < 2 || !(registers && registers[@"lr"])) { + continue; + } + + NSDictionary *lastFrame = frames[frames.count - 1]; + NSDictionary *penultimateFrame = frames[frames.count - 2]; + + if ([lastFrame[@RollbarCrashField_SymbolAddr] isEqualToNumber:penultimateFrame[@RollbarCrashField_SymbolAddr]] + && [penultimateFrame[@RollbarCrashField_InstructionAddr] isEqualToNumber:registers[@"lr"]]) + { + [frames removeObjectAtIndex:frames.count - 2]; + } + } +} + - (NSArray*)reportIDs { int reportCount = rc_getReportCount(); From bb87adcb2268b8f25807360bc06ca87667eb4247 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 19:44:14 -0300 Subject: [PATCH 11/13] Bumped version of Rollbar Demo --- .../RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj b/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj index aac6f5af..8d97803b 100644 --- a/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj +++ b/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj @@ -286,7 +286,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = RollbarDemo/RollbarDemo.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 70; + CURRENT_PROJECT_VERSION = 75; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"RollbarDemo/Preview Content\""; DEVELOPMENT_TEAM = 9P5JVC2F34; @@ -300,7 +300,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - MARKETING_VERSION = 1.2; + MARKETING_VERSION = 1.3; PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.apple.demo; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; @@ -320,7 +320,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = RollbarDemo/RollbarDemo.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 70; + CURRENT_PROJECT_VERSION = 75; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"RollbarDemo/Preview Content\""; DEVELOPMENT_TEAM = 9P5JVC2F34; @@ -334,7 +334,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - MARKETING_VERSION = 1.2; + MARKETING_VERSION = 1.3; PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.apple.demo; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; From eee97df81835be1188cd518e0b0b638b9939898b Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Wed, 16 Aug 2023 20:23:51 +0200 Subject: [PATCH 12/13] Bump version to 3.2.0 (#334) --- Rollbar.podspec | 4 ++-- RollbarAUL.podspec | 2 +- RollbarCocoaLumberjack.podspec | 2 +- RollbarCommon.podspec | 2 +- RollbarCrash.podspec | 2 +- RollbarDeploys.podspec | 2 +- RollbarNotifier.podspec | 2 +- RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m | 2 +- RollbarReport.podspec | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Rollbar.podspec b/Rollbar.podspec index 7908f0e9..1f9e65e3 100644 --- a/Rollbar.podspec +++ b/Rollbar.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Rollbar" - s.version = "3.1.1" + s.version = "3.2.0" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. @@ -64,7 +64,7 @@ Pod::Spec.new do |s| s.subspec 'CocoaLumberjack' do |sp| sp.source_files = "RollbarCocoaLumberjack/Sources/RollbarCocoaLumberjack/**/*.{h,m}" sp.public_header_files = "RollbarCocoaLumberjack/Sources/RollbarCocoaLumberjack/include/*.h" - sp.dependency "CocoaLumberjack", "~> 3.7.4" + sp.dependency "CocoaLumberjack", "~> 3.8.0" end s.subspec 'Deploys' do |sp| diff --git a/RollbarAUL.podspec b/RollbarAUL.podspec index 2b9ae9cf..bc5a7681 100644 --- a/RollbarAUL.podspec +++ b/RollbarAUL.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarAUL" - s.version = "3.1.1" + s.version = "3.2.0" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarCocoaLumberjack.podspec b/RollbarCocoaLumberjack.podspec index e2dca9ed..7063510d 100644 --- a/RollbarCocoaLumberjack.podspec +++ b/RollbarCocoaLumberjack.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarCocoaLumberjack" - s.version = "3.1.1" + s.version = "3.2.0" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index 3421f127..51f4c5a9 100644 --- a/RollbarCommon.podspec +++ b/RollbarCommon.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarCommon" - s.version = "3.1.1" + s.version = "3.2.0" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarCrash.podspec b/RollbarCrash.podspec index 466ead46..20368a1a 100644 --- a/RollbarCrash.podspec +++ b/RollbarCrash.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarCrash" - s.version = "3.1.1" + s.version = "3.2.0" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarDeploys.podspec b/RollbarDeploys.podspec index d32a0bd0..4380e376 100644 --- a/RollbarDeploys.podspec +++ b/RollbarDeploys.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarDeploys" - s.version = "3.1.1" + s.version = "3.2.0" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarNotifier.podspec b/RollbarNotifier.podspec index fadcc7e7..fc6a7ed5 100644 --- a/RollbarNotifier.podspec +++ b/RollbarNotifier.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarNotifier" - s.version = "3.1.1" + s.version = "3.2.0" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. diff --git a/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m b/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m index d768613a..65dbc812 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 = @"3.1.1"; +static NSString * const NOTIFIER_VERSION = @"3.2.0"; static NSString * const NOTIFIER_NAME = @"rollbar-apple"; diff --git a/RollbarReport.podspec b/RollbarReport.podspec index e40193c8..ba13b727 100644 --- a/RollbarReport.podspec +++ b/RollbarReport.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RollbarReport" - s.version = "3.1.1" + s.version = "3.2.0" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC Find, fix, and resolve errors with Rollbar. From c2b6a51b90694953734882146e0d566bbca25c09 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Wed, 23 Aug 2023 19:27:10 +0200 Subject: [PATCH 13/13] Fixed incorrect bundle id on Rollbar Demo (#336) --- Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj b/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj index 8d97803b..082fa168 100644 --- a/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj +++ b/Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj @@ -301,7 +301,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; MARKETING_VERSION = 1.3; - PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.apple.demo; + PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.apple.demo.swift; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -335,7 +335,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; MARKETING_VERSION = 1.3; - PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.apple.demo; + PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.apple.demo.swift; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";