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.

Sign up for GitHub

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

Jump to bottom

ref: bump supported OS versions #2414

Merged
merged 14 commits into from
Nov 22, 2022
Merged

ref: bump supported OS versions #2414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2ff0f6e
Increase supported OS versions
kevinrenskers Nov 21, 2022
073a6a4
Changelog
kevinrenskers Nov 21, 2022
5510f0a
Increase it in more places (tests and SentryPrivate)
kevinrenskers Nov 21, 2022
78bf96c
Clean up
kevinrenskers Nov 21, 2022
346379f
Increase versions in podspec
kevinrenskers Nov 21, 2022
004bd90
Update CoreDataViewController.swift
brustolin Nov 22, 2022
970ddc8
Merge branch '8.0.0' into ref/1916-bump-supported-os-versions
kevinrenskers Nov 22, 2022
f1e67bc
fix tests
brustolin Nov 22, 2022
a060740
Merge branch 'ref/1916-bump-supported-os-versions' of https://github.…
brustolin Nov 22, 2022
02d496d
Remove iOS-10 suite test (was getting errors `no suite named 'iOS-10'…
kevinrenskers Nov 22, 2022
0eb876f
Delete "recovered references"
kevinrenskers Nov 22, 2022
261fbee
Reverse VLC patch file changes
kevinrenskers Nov 22, 2022
33be17c
let's try this
kevinrenskers Nov 22, 2022
1f9ae9a
Let's try again
kevinrenskers Nov 22, 2022
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
5 changes: 0 additions & 5 deletions .github/workflows/saucelabs-UI-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 0 additions & 5 deletions .sauce/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ suites:
devices:
- name: "iPhone.*"
platformVersion: "11.4.1"

- name: "iOS-10"
devices:
- name: "iPhone.*"
platformVersion: "10.3.2"
Comment on lines -46 to -49
Copy link
Member

Choose a reason for hiding this comment

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

👏👏👏


artifacts:
download:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
1 change: 1 addition & 0 deletions Samples/SPM-Dynamic/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
],
Expand Down
31 changes: 23 additions & 8 deletions Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/project.pbxproj
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion Samples/iOS-Swift/iOS-Swift/ViewControllers/CoreDataViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 8 additions & 12 deletions Samples/iOS-Swift/iOS-Swift/ViewControllers/PermissionsViewController.swift
View file
Open in desktop
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
View file
Open in desktop
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