Merge 261fbee into 9be1db2

getsentry · Nov 22, 2022 · d011bd6 · d011bd6
2 parents 9be1db2 + 261fbee
commit d011bd6
Show file tree

Hide file tree

Showing 34 changed files with 118 additions and 192 deletions.
diff --git a/.github/workflows/saucelabs-UI-tests.yml b/.github/workflows/saucelabs-UI-tests.yml
@@ -103,11 +103,6 @@ jobs:
  - xcode: '13.4.1'
  suite: 'iOS-13'
 
- # iOS 12 has a failing test that we need to fix https://github.com/getsentry/sentry-cocoa/issues/1566
- # iOS 11 keeps timing out and we don't know how to fix it.
- - xcode: '12.5.1'
- suite: 'iOS-10'
-
  steps:
  - uses: actions/checkout@v3
 

diff --git a/.sauce/config.yml b/.sauce/config.yml
@@ -42,11 +42,6 @@ suites:
  devices:
  - name: "iPhone.*"
  platformVersion: "11.4.1"
-
- - name: "iOS-10"
- devices:
- - name: "iPhone.*"
- platformVersion: "10.3.2"
 
 artifacts:
  download:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ This version adds a dependency on Swift.
 - Rename `- [SentrySDK startWithOptionsObject:]` to `- [SentrySDK startWithOptions:]` (#2404)
 - Remove `- [SentryOptions sdkInfo]` (#2404)
 - Mark `- [SpanProtocol setExtraValue:forKey:]` as deprecated (#2413)
+- Bump minimum supported OS versions to macOS 10.13, iOS 11, tvOS 11, and watchOS 4 (#2414)
 
 ## 7.31.2
 

diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@ import PackageDescription
 
 let package = Package(
  name: "Sentry",
- platforms: [.iOS(.v9), .macOS(.v10_10), .tvOS(.v9), .watchOS(.v2)],
+ platforms: [.iOS(.v11), .macOS(.v10_13), .tvOS(.v11), .watchOS(.v4)],
  products: [
  .library(name: "Sentry", targets: ["Sentry"]),
  .library(name: "Sentry-Dynamic", type: .dynamic, targets: ["Sentry"])

diff --git a/Samples/SPM-Dynamic/Package.swift b/Samples/SPM-Dynamic/Package.swift
@@ -5,6 +5,7 @@ import PackageDescription
 
 let package = Package(
  name: "SPM-Dynamic",
+ platforms: [.macOS(.v10_13)],
  products: [
  .library(name: "SPM-Dynamic", type: .dynamic, targets: ["SPM-Dynamic"])
  ],

diff --git a/Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/project.pbxproj b/Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/project.pbxproj
@@ -21,6 +21,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+ 0AE58866292B7C5E00494AF8 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 630853352440C45500DDE4CE /* Sentry.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = D81A3488291D0AC0005A27A9;
+ remoteInfo = SentryPrivate;
+ };
  6308533A2440C45500DDE4CE /* PBXContainerItemProxy */ = {
  isa = PBXContainerItemProxy;
  containerPortal = 630853352440C45500DDE4CE /* Sentry.xcodeproj */;
@@ -110,6 +117,7 @@
  children = (
  6308533B2440C45500DDE4CE /* Sentry.framework */,
  6308533D2440C45500DDE4CE /* SentryTests.xctest */,
+ 0AE58867292B7C5E00494AF8 /* SentryPrivate.framework */,
  );
  name = Products;
  sourceTree = "<group>";
@@ -255,6 +263,13 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+ 0AE58867292B7C5E00494AF8 /* SentryPrivate.framework */ = {
+ isa = PBXReferenceProxy;
+ fileType = wrapper.framework;
+ path = SentryPrivate.framework;
+ remoteRef = 0AE58866292B7C5E00494AF8 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
  6308533B2440C45500DDE4CE /* Sentry.framework */ = {
  isa = PBXReferenceProxy;
  fileType = wrapper.framework;
@@ -468,7 +483,7 @@
  CODE_SIGN_STYLE = Automatic;
  DEVELOPMENT_TEAM = "";
  INFOPLIST_FILE = "iOS-ObjectiveC/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -490,7 +505,7 @@
  CODE_SIGN_STYLE = Automatic;
  DEVELOPMENT_TEAM = "";
  INFOPLIST_FILE = "iOS-ObjectiveC/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -509,7 +524,7 @@
  CODE_SIGN_STYLE = Automatic;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-ObjectiveCUITests/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -531,7 +546,7 @@
  CODE_SIGN_STYLE = Automatic;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-ObjectiveCUITests/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -611,7 +626,7 @@
  CODE_SIGN_STYLE = Automatic;
  DEVELOPMENT_TEAM = "";
  INFOPLIST_FILE = "iOS-ObjectiveC/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -630,7 +645,7 @@
  CODE_SIGN_STYLE = Automatic;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-ObjectiveCUITests/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -710,7 +725,7 @@
  CODE_SIGN_STYLE = Automatic;
  DEVELOPMENT_TEAM = "";
  INFOPLIST_FILE = "iOS-ObjectiveC/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -729,7 +744,7 @@
  CODE_SIGN_STYLE = Automatic;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-ObjectiveCUITests/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",

diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
@@ -1106,7 +1106,7 @@
  CURRENT_PROJECT_VERSION = 1;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-Swift/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1135,7 +1135,7 @@
  CURRENT_PROJECT_VERSION = 1;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-Swift/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1160,7 +1160,7 @@
  CODE_SIGN_STYLE = Manual;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-SwiftUITests/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1184,7 +1184,7 @@
  CODE_SIGN_STYLE = Manual;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-SwiftUITests/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1209,7 +1209,7 @@
  CODE_SIGN_STYLE = Manual;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "PerformanceBenchmarks/PerformanceBenchmarks-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1235,7 +1235,7 @@
  CODE_SIGN_STYLE = Manual;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "PerformanceBenchmarks/PerformanceBenchmarks-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1319,7 +1319,7 @@
  CURRENT_PROJECT_VERSION = 1;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-Swift/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1344,7 +1344,7 @@
  CODE_SIGN_STYLE = Manual;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-SwiftUITests/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1369,7 +1369,7 @@
  CODE_SIGN_STYLE = Manual;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "PerformanceBenchmarks/PerformanceBenchmarks-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1542,7 +1542,7 @@
  CURRENT_PROJECT_VERSION = 1;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-Swift/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1567,7 +1567,7 @@
  CODE_SIGN_STYLE = Manual;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "iOS-SwiftUITests/Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
@@ -1592,7 +1592,7 @@
  CODE_SIGN_STYLE = Manual;
  DEVELOPMENT_TEAM = 97JCY7859U;
  INFOPLIST_FILE = "PerformanceBenchmarks/PerformanceBenchmarks-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",

diff --git a/Samples/iOS-Swift/iOS-Swift/Extensions/UIViewExtension.swift b/Samples/iOS-Swift/iOS-Swift/Extensions/UIViewExtension.swift
@@ -2,18 +2,6 @@ import Foundation
 import UIKit
 
 extension UIView {
- var safeOrMarginGuide: UILayoutGuide {
- var guide: UILayoutGuide!
-
- if #available(iOS 11.0, *) {
- guide = self.safeAreaLayoutGuide
- } else {
- guide = self.layoutMarginsGuide
- }
-
- return guide
- }
-
  /// A shortcut to disable `translatesAutoresizingMaskIntoConstraints`
  /// - Returns: self
  func forAutoLayout() -> Self {

diff --git a/Samples/iOS-Swift/iOS-Swift/View/AssertView.swift b/Samples/iOS-Swift/iOS-Swift/View/AssertView.swift
@@ -58,7 +58,7 @@ class AssertView: UIView {
  errorLabel.numberOfLines = 0
  addSubview(errorLabel)
 
- let guide = self.safeOrMarginGuide
+ let guide = self.safeAreaLayoutGuide
 
  let constraints = [
  assertLabel.topAnchor.constraint(equalTo: guide.topAnchor, constant: 16),

diff --git a/Samples/iOS-Swift/iOS-Swift/ViewController.swift b/Samples/iOS-Swift/iOS-Swift/ViewController.swift
@@ -50,10 +50,8 @@ class ViewController: UIViewController {
  override func viewDidAppear(_ animated: Bool) {
  super.viewDidAppear(animated)
 
- if #available(iOS 10.0, *) {
- Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { _ in
- self.framesLabel?.text = "Frames Total:\(PrivateSentrySDKOnly.currentScreenFrames.total) Slow:\(PrivateSentrySDKOnly.currentScreenFrames.slow) Frozen:\(PrivateSentrySDKOnly.currentScreenFrames.frozen)"
- }
+ Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { _ in
+ self.framesLabel?.text = "Frames Total:\(PrivateSentrySDKOnly.currentScreenFrames.total) Slow:\(PrivateSentrySDKOnly.currentScreenFrames.slow) Frozen:\(PrivateSentrySDKOnly.currentScreenFrames.frozen)"
  }
 
  SentrySDK.configureScope { (scope) in

diff --git a/Samples/iOS-Swift/iOS-Swift/ViewControllers/CoreDataViewController.swift b/Samples/iOS-Swift/iOS-Swift/ViewControllers/CoreDataViewController.swift
@@ -115,7 +115,7 @@ class CoreDataViewController: UITableViewController {
  override func viewDidLoad() {
  super.viewDidLoad()
 
- let fetchRequest = Person.fetchRequest()
+ let fetchRequest = NSFetchRequest<Person>(entityName: "Person")
  fetchRequest.sortDescriptors = [NSSortDescriptor(key: "name", ascending: true)]
  do {
  people = try managedObjectContext.fetch(fetchRequest)

diff --git a/Samples/iOS-Swift/iOS-Swift/ViewControllers/PermissionsViewController.swift b/Samples/iOS-Swift/iOS-Swift/ViewControllers/PermissionsViewController.swift
@@ -33,10 +33,8 @@ class PermissionsViewController: UIViewController {
 
  locationManager.delegate = self
 
- if #available(iOS 10.0, *) {
- UNUserNotificationCenter.current().getNotificationSettings { settings in
- print("Initial push permission status: \(settings.authorizationStatus)")
- }
+ UNUserNotificationCenter.current().getNotificationSettings { settings in
+ print("Initial push permission status: \(settings.authorizationStatus)")
  }
 
  print("Initial location permission status: \(CLLocationManager.authorizationStatus())")
@@ -60,15 +58,13 @@ class PermissionsViewController: UIViewController {
  }
 
  @objc func requestPushPermission() {
- if #available(iOS 10.0, *) {
- UNUserNotificationCenter.current()
- .requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
- if let error = error {
- print(error)
- }
- print(granted)
+ UNUserNotificationCenter.current()
+ .requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
+ if let error = error {
+ print(error)
  }
- }
+ print(granted)
+ }
  }
 }
 

diff --git a/Sentry.podspec b/Sentry.podspec
@@ -8,10 +8,10 @@ Pod::Spec.new do |s|
  s.source = { :git => "https://github.com/getsentry/sentry-cocoa.git",
  :tag => s.version.to_s }
 
- s.ios.deployment_target = "9.0"
- s.osx.deployment_target = "10.10"
- s.tvos.deployment_target = "9.0"
- s.watchos.deployment_target = "2.0"
+ s.ios.deployment_target = "11.0"
+ s.osx.deployment_target = "10.13"
+ s.tvos.deployment_target = "11.0"
+ s.watchos.deployment_target = "4.0"
  s.module_name = "Sentry"
  s.requires_arc = true
  s.frameworks = 'Foundation'