From 1fa07017dfab26cc225d2437f703ec4bd8a6bdeb Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 10 Aug 2023 11:06:28 -0300 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 @@