Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ref: bump supported OS versions #2414

Merged
merged 14 commits into from
Nov 22, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ This version introduces a dependency on Swift, which only impacts you if you don

- Properly demangle Swift class name (#2162)

### Breaking changes

- Bump minimum supported OS versions: macOS 10.13, iOS 11, tvOS 11, and watchOS 4 are now supported (#2414)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Bump minimum supported OS versions: macOS 10.13, iOS 11, tvOS 11, and watchOS 4 are now supported (#2414)
- Bump minimum supported OS versions to macOS 10.13, iOS 11, tvOS 11, and watchOS 4 (#2414)


## 7.31.2

### Fixes
Expand Down
31 changes: 23 additions & 8 deletions Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */;
Expand Down Expand Up @@ -110,6 +117,7 @@
children = (
6308533B2440C45500DDE4CE /* Sentry.framework */,
6308533D2440C45500DDE4CE /* SentryTests.xctest */,
0AE58867292B7C5E00494AF8 /* SentryPrivate.framework */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
24 changes: 12 additions & 12 deletions Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
12 changes: 0 additions & 12 deletions Samples/iOS-Swift/iOS-Swift/Extensions/UIViewExtension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Samples/iOS-Swift/iOS-Swift/View/AssertView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
6 changes: 2 additions & 4 deletions Samples/iOS-Swift/iOS-Swift/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())")
Expand All @@ -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)
}
}
}

Expand Down
8 changes: 4 additions & 4 deletions Sentry.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading