From 2ff0f6e820fbedbb2b5758d0cefda610a169777b Mon Sep 17 00:00:00 2001 From: Kevin Renskers Date: Mon, 21 Nov 2022 09:59:40 +0100 Subject: [PATCH 1/6] Increase supported OS versions --- Sentry.xcodeproj/project.pbxproj | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj index 13373ff7b36..73c542f572b 100644 --- a/Sentry.xcodeproj/project.pbxproj +++ b/Sentry.xcodeproj/project.pbxproj @@ -4061,17 +4061,19 @@ GCC_WARN_SHADOW = YES; INFOPLIST_FILE = Sources/Sentry/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry; PRODUCT_NAME = Sentry; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; USE_HEADERMAP = YES; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -4099,16 +4101,18 @@ GCC_WARN_SHADOW = YES; INFOPLIST_FILE = Sources/Sentry/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry; PRODUCT_NAME = Sentry; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; USE_HEADERMAP = YES; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -4268,17 +4272,19 @@ GCC_WARN_SHADOW = YES; INFOPLIST_FILE = Sources/Sentry/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry; PRODUCT_NAME = Sentry; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; USE_HEADERMAP = YES; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = TestCI; }; @@ -4403,17 +4409,19 @@ GCC_WARN_SHADOW = YES; INFOPLIST_FILE = Sources/Sentry/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry; PRODUCT_NAME = Sentry; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; USE_HEADERMAP = YES; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Test; }; From 073a6a494b301a4068df260e1c9b884e8e055c04 Mon Sep 17 00:00:00 2001 From: Kevin Renskers Date: Mon, 21 Nov 2022 10:04:06 +0100 Subject: [PATCH 2/6] Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30d3a60bef7..c3eb26ae4d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) + ## 7.31.2 ### Fixes From 5510f0aef83ab8f5abe830fb2136f13b5c61a9cb Mon Sep 17 00:00:00 2001 From: Kevin Renskers Date: Mon, 21 Nov 2022 10:06:38 +0100 Subject: [PATCH 3/6] Increase it in more places (tests and SentryPrivate) --- Sentry.xcodeproj/project.pbxproj | 40 +++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj index 73c542f572b..f61802427a3 100644 --- a/Sentry.xcodeproj/project.pbxproj +++ b/Sentry.xcodeproj/project.pbxproj @@ -4131,9 +4131,9 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Tests/SentryTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry.tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -4142,6 +4142,8 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -4160,9 +4162,9 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Tests/SentryTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry.tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -4170,6 +4172,8 @@ SWIFT_OBJC_BRIDGING_HEADER = "Tests/SentryTests/SentryTests-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -4303,9 +4307,9 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Tests/SentryTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry.tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -4314,6 +4318,8 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = TestCI; }; @@ -4440,9 +4446,9 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Tests/SentryTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry.tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -4451,6 +4457,8 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Test; }; @@ -4475,8 +4483,10 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Sentry. All rights reserved."; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentryPrivate; @@ -4485,6 +4495,8 @@ SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -4509,13 +4521,17 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Sentry. All rights reserved."; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentryPrivate; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Test; }; @@ -4540,13 +4556,17 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Sentry. All rights reserved."; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentryPrivate; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = TestCI; }; @@ -4571,13 +4591,17 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Sentry. All rights reserved."; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentryPrivate; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; From 78bf96c0a47957632b6b7cdf83af3e425b140cca Mon Sep 17 00:00:00 2001 From: Kevin Renskers Date: Mon, 21 Nov 2022 10:31:54 +0100 Subject: [PATCH 4/6] Clean up --- .../iOS-ObjectiveC.xcodeproj/project.pbxproj | 31 ++++++++++++++----- .../iOS-Swift.xcodeproj/project.pbxproj | 24 +++++++------- .../Extensions/UIViewExtension.swift | 12 ------- .../iOS-Swift/iOS-Swift/View/AssertView.swift | 2 +- .../iOS-Swift/iOS-Swift/ViewController.swift | 6 ++-- .../PermissionsViewController.swift | 20 +++++------- Sources/Sentry/SentryFramesTracker.m | 13 +++----- Sources/Sentry/SentryPermissionsObserver.m | 17 ++++------ .../Helper/SentryFileManagerTests.swift | 5 --- .../Network/SentryNetworkTrackerTests.swift | 6 ---- .../SentryPerformanceTrackerTests.swift | 6 ---- ...yConcurrentRateLimitsDictionaryTests.swift | 6 +--- .../SentryHttpDateParserTests.swift | 5 --- .../Networking/SentryHttpTransportTests.swift | 5 --- .../Networking/TestRequestManager.swift | 3 -- .../Performance/SentryTracerTests.swift | 6 ---- .../Protocol/SentryUserTests.swift | 3 -- Tests/SentryTests/SentryClientTests.swift | 1 - .../SentryThreadInspectorTests.swift | 3 -- Tests/SentryTests/SentryHubTests.swift | 13 -------- Tests/SentryTests/SentrySDKTests.swift | 5 --- Tests/SentryTests/SentryScopeSwiftTests.swift | 5 --- Tests/SentryTests/TestUtils/Async.swift | 1 - .../Transaction/SentrySpanContextTests.swift | 3 -- .../Transaction/SentrySpanTests.swift | 3 -- 25 files changed, 58 insertions(+), 146 deletions(-) diff --git a/Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/project.pbxproj b/Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/project.pbxproj index 7a23119d6b7..35c133cde3c 100644 --- 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 = ""; @@ -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 index 6884db909b6..1e717cffe92 100644 --- 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 index 0649a08766f..7ab5d5377b5 100644 --- 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 index f6bcc9d9e9b..bdd0fbf0b28 100644 --- 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 index 4f60c4dec14..edb8da172c3 100644 --- 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/PermissionsViewController.swift b/Samples/iOS-Swift/iOS-Swift/ViewControllers/PermissionsViewController.swift index 272fddba082..9dc33f1d101 100644 --- 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/Sources/Sentry/SentryFramesTracker.m b/Sources/Sentry/SentryFramesTracker.m index 827b6574ac0..4fae7a71600 100644 --- a/Sources/Sentry/SentryFramesTracker.m +++ b/Sources/Sentry/SentryFramesTracker.m @@ -119,14 +119,11 @@ - (void)displayLinkCallback // targetTimestamp is only available on iOS 10.0 and tvOS 10.0 and above. We use a fallback of // 60 fps. double actualFramesPerSecond = 60.0; - if (@available(iOS 10.0, tvOS 10.0, *)) { - if (UNLIKELY( - (self.displayLinkWrapper.targetTimestamp == self.displayLinkWrapper.timestamp))) { - actualFramesPerSecond = 60.0; - } else { - actualFramesPerSecond - = 1 / (self.displayLinkWrapper.targetTimestamp - self.displayLinkWrapper.timestamp); - } + if (UNLIKELY((self.displayLinkWrapper.targetTimestamp == self.displayLinkWrapper.timestamp))) { + actualFramesPerSecond = 60.0; + } else { + actualFramesPerSecond + = 1 / (self.displayLinkWrapper.targetTimestamp - self.displayLinkWrapper.timestamp); } # if SENTRY_TARGET_PROFILING_SUPPORTED diff --git a/Sources/Sentry/SentryPermissionsObserver.m b/Sources/Sentry/SentryPermissionsObserver.m index 2d41fd73648..017bbaedc8d 100644 --- a/Sources/Sentry/SentryPermissionsObserver.m +++ b/Sources/Sentry/SentryPermissionsObserver.m @@ -52,22 +52,17 @@ - (void)startObserving - (void)refreshPermissions { #if SENTRY_HAS_UIKIT - if (@available(iOS 9, tvOS 10, *)) { - [self setPhotoLibraryPermissionFromStatus:PHPhotoLibrary.authorizationStatus]; - } + [self setPhotoLibraryPermissionFromStatus:PHPhotoLibrary.authorizationStatus]; - if (@available(iOS 10, tvOS 10, *)) { - [[UNUserNotificationCenter currentNotificationCenter] - getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *settings) { - [self setPushPermissionFromStatus:settings.authorizationStatus]; - }]; - } + [[UNUserNotificationCenter currentNotificationCenter] + getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *settings) { + [self setPushPermissionFromStatus:settings.authorizationStatus]; + }]; #endif } #if SENTRY_HAS_UIKIT - (void)setPhotoLibraryPermissionFromStatus:(PHAuthorizationStatus)status - API_AVAILABLE(ios(9), tvos(10)) { switch (status) { case PHAuthorizationStatusNotDetermined: @@ -89,7 +84,7 @@ - (void)setPhotoLibraryPermissionFromStatus:(PHAuthorizationStatus)status } } -- (void)setPushPermissionFromStatus:(UNAuthorizationStatus)status API_AVAILABLE(ios(10), tvos(10)) +- (void)setPushPermissionFromStatus:(UNAuthorizationStatus)status { switch (status) { case UNAuthorizationStatusNotDetermined: diff --git a/Tests/SentryTests/Helper/SentryFileManagerTests.swift b/Tests/SentryTests/Helper/SentryFileManagerTests.swift index 083333a284b..08db75156b8 100644 --- a/Tests/SentryTests/Helper/SentryFileManagerTests.swift +++ b/Tests/SentryTests/Helper/SentryFileManagerTests.swift @@ -1,11 +1,6 @@ import Sentry import XCTest -// Even if we don't run this test below OSX 10.12 we expect the actual -// implementation to be thread safe. -@available(OSX 10.12, *) -@available(iOS 10.0, *) -@available(tvOS 10.0, *) class SentryFileManagerTests: XCTestCase { private class Fixture { diff --git a/Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerTests.swift b/Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerTests.swift index 55ec9272697..53b1a7d1f2f 100644 --- a/Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerTests.swift +++ b/Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerTests.swift @@ -456,9 +456,6 @@ class SentryNetworkTrackerTests: XCTestCase { // Although we only run this test above the below specified versions, we expect the // implementation to be thread safe - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testResumeCalledMultipleTimesConcurrent_OneSpanCreated() { let task = createDataTask() let sut = fixture.getSut() @@ -484,9 +481,6 @@ class SentryNetworkTrackerTests: XCTestCase { // Although we only run this test above the below specified versions, we expect the // implementation to be thread safe - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testChangeStateMultipleTimesConcurrent_OneSpanFinished() { let task = createDataTask() let sut = fixture.getSut() diff --git a/Tests/SentryTests/Integrations/Performance/SentryPerformanceTrackerTests.swift b/Tests/SentryTests/Integrations/Performance/SentryPerformanceTrackerTests.swift index dbd2e6a4ace..1362b7a32a2 100644 --- a/Tests/SentryTests/Integrations/Performance/SentryPerformanceTrackerTests.swift +++ b/Tests/SentryTests/Integrations/Performance/SentryPerformanceTrackerTests.swift @@ -277,9 +277,6 @@ class SentryPerformanceTrackerTests: XCTestCase { XCTAssertEqual(spanId, SpanId.empty) } - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testStartSpanAsync() { let sut = fixture.getSut() let spanId = startSpan(tracker: sut) @@ -303,9 +300,6 @@ class SentryPerformanceTrackerTests: XCTestCase { XCTAssertEqual(spans.count, 5_001) } - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testStackAsync() { let sut = fixture.getSut() let spanId = startSpan(tracker: sut) diff --git a/Tests/SentryTests/Networking/RateLimits/SentryConcurrentRateLimitsDictionaryTests.swift b/Tests/SentryTests/Networking/RateLimits/SentryConcurrentRateLimitsDictionaryTests.swift index b531544798e..c9b7f6aa167 100644 --- a/Tests/SentryTests/Networking/RateLimits/SentryConcurrentRateLimitsDictionaryTests.swift +++ b/Tests/SentryTests/Networking/RateLimits/SentryConcurrentRateLimitsDictionaryTests.swift @@ -30,11 +30,7 @@ class SentryConcurrentRateLimitsDictionaryTests: XCTestCase { sut.addRateLimit(SentryDataCategory.attachment, validUntil: dateB) XCTAssertEqual(dateB, self.sut.getRateLimit(for: SentryDataCategory.attachment)) } - // Although we only run this test above the below specified versions, we expect the - // implementation to be thread safe - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) + func testConcurrentReadWrite() { let queue1 = DispatchQueue(label: "SentryConcurrentRateLimitsStorageTests1", qos: .background, attributes: [.concurrent, .initiallyInactive]) let queue2 = DispatchQueue(label: "SentryConcurrentRateLimitsStorageTests2", qos: .utility, attributes: [.concurrent, .initiallyInactive]) diff --git a/Tests/SentryTests/Networking/SentryHttpDateParserTests.swift b/Tests/SentryTests/Networking/SentryHttpDateParserTests.swift index f559ba65036..312ceb256b0 100644 --- a/Tests/SentryTests/Networking/SentryHttpDateParserTests.swift +++ b/Tests/SentryTests/Networking/SentryHttpDateParserTests.swift @@ -20,11 +20,6 @@ class SentryHttpDateParserTests: XCTestCase { XCTAssertEqual(expected, actual) } - // Although we only run this test above the below specified versions, we expect the - // implementation to be thread safe - @available(iOS 10.0, *) - @available(tvOS 10.0, *) - @available(OSX 10.12, *) func testWithMultipleWorkItemsInParallel() { let queue1 = DispatchQueue(label: "SentryHttpDateParserTests1", qos: .utility, attributes: [.concurrent, .initiallyInactive]) let queue2 = DispatchQueue(label: "SentryHttpDateParserTests2", qos: .utility, attributes: [.concurrent, .initiallyInactive]) diff --git a/Tests/SentryTests/Networking/SentryHttpTransportTests.swift b/Tests/SentryTests/Networking/SentryHttpTransportTests.swift index 9f6f59799bc..63b440b52e7 100644 --- a/Tests/SentryTests/Networking/SentryHttpTransportTests.swift +++ b/Tests/SentryTests/Networking/SentryHttpTransportTests.swift @@ -1,11 +1,6 @@ import Sentry import XCTest -// Although we only run this test above the below specified versions, we expect the -// implementation to be thread safe -@available(tvOS 10.0, *) -@available(OSX 10.12, *) -@available(iOS 10.0, *) class SentryHttpTransportTests: XCTestCase { private static let dsnAsString = TestConstants.dsnAsString(username: "SentryHttpTransportTests") diff --git a/Tests/SentryTests/Networking/TestRequestManager.swift b/Tests/SentryTests/Networking/TestRequestManager.swift index 7962ee89ee3..7a2972914fc 100644 --- a/Tests/SentryTests/Networking/TestRequestManager.swift +++ b/Tests/SentryTests/Networking/TestRequestManager.swift @@ -1,8 +1,5 @@ import Foundation -// Even if we don't run this test below OSX 10.12 we expect the actual -// implementation to be thread safe. -@available(OSX 10.12, *) public class TestRequestManager: NSObject, RequestManager { private var nextResponse: () -> HTTPURLResponse? = { return nil } diff --git a/Tests/SentryTests/Performance/SentryTracerTests.swift b/Tests/SentryTests/Performance/SentryTracerTests.swift index 53be5bcfe32..5ca92d775b7 100644 --- a/Tests/SentryTests/Performance/SentryTracerTests.swift +++ b/Tests/SentryTests/Performance/SentryTracerTests.swift @@ -687,9 +687,6 @@ class SentryTracerTests: XCTestCase { // Although we only run this test above the below specified versions, we expect the // implementation to be thread safe - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testFinishAsync() { let sut = fixture.getSut() let child = sut.startChild(operation: fixture.transactionOperation) @@ -726,9 +723,6 @@ class SentryTracerTests: XCTestCase { // Although we only run this test above the below specified versions, we expect the // implementation to be thread safe - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testConcurrentTransactions_OnlyOneGetsMeasurement() { SentrySDK.setAppStartMeasurement(fixture.getAppStartMeasurement(type: .warm)) diff --git a/Tests/SentryTests/Protocol/SentryUserTests.swift b/Tests/SentryTests/Protocol/SentryUserTests.swift index 2b219e50422..ccc1afd857e 100644 --- a/Tests/SentryTests/Protocol/SentryUserTests.swift +++ b/Tests/SentryTests/Protocol/SentryUserTests.swift @@ -91,9 +91,6 @@ class SentryUserTests: XCTestCase { // Although we only run this test above the below specified versions, we expect the // implementation to be thread safe // With this test we test if modifications from multiple threads don't lead to a crash. - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testModifyingFromMultipleThreads() { let queue = DispatchQueue(label: "SentryScopeTests", qos: .userInteractive, attributes: [.concurrent, .initiallyInactive]) let group = DispatchGroup() diff --git a/Tests/SentryTests/SentryClientTests.swift b/Tests/SentryTests/SentryClientTests.swift index 188bdd0fb50..b2dd829ad26 100644 --- a/Tests/SentryTests/SentryClientTests.swift +++ b/Tests/SentryTests/SentryClientTests.swift @@ -1292,7 +1292,6 @@ class SentryClientTest: XCTestCase { XCTAssertEqual(item, fixture.transportAdapter.sendEventWithTraceStateInvocations.first?.additionalEnvelopeItems.first) } - @available(iOS 10.0, tvOS 10.0, OSX 10.12, *) func testConcurrentlyAddingInstalledIntegrations_WhileSendingEvents() { let sut = fixture.getSut() diff --git a/Tests/SentryTests/SentryCrash/SentryThreadInspectorTests.swift b/Tests/SentryTests/SentryCrash/SentryThreadInspectorTests.swift index fcf32564fc6..7594ee56e40 100644 --- a/Tests/SentryTests/SentryCrash/SentryThreadInspectorTests.swift +++ b/Tests/SentryTests/SentryCrash/SentryThreadInspectorTests.swift @@ -38,18 +38,15 @@ import XCTest XCTAssertTrue(30 < stacktrace?.frames.count ?? 0, "Not enough stacktrace frames.") } - @available(macOS 10.12, iOS 10.0, tvOS 10.0, *) func testStacktraceHasFrames_forEveryThread_withStitchAsyncOn() { SentrySDK.start { $0.stitchAsyncCode = true } assertStackForEveryThread() } - @available(macOS 10.12, iOS 10.0, tvOS 10.0, *) func testStacktraceHasFrames_forEveryThread() { assertStackForEveryThread() } - @available(macOS 10.12, iOS 10.0, tvOS 10.0, *) func assertStackForEveryThread() { let queue = DispatchQueue(label: "defaultphil", attributes: [.concurrent, .initiallyInactive]) diff --git a/Tests/SentryTests/SentryHubTests.swift b/Tests/SentryTests/SentryHubTests.swift index 0b3ce695d95..e0d5565a3eb 100644 --- a/Tests/SentryTests/SentryHubTests.swift +++ b/Tests/SentryTests/SentryHubTests.swift @@ -477,9 +477,6 @@ class SentryHubTests: XCTestCase { XCTAssertEqual(1, fixture.client.captureSessionInvocations.count) } - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testCaptureMultipleExceptionWithSessionInParallel() { let captureCount = 100 captureConcurrentWithSession(count: captureCount) { sut in @@ -497,9 +494,6 @@ class SentryHubTests: XCTestCase { } } - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testCaptureMultipleErrorsWithSessionInParallel() { let captureCount = 100 captureConcurrentWithSession(count: captureCount) { sut in @@ -665,11 +659,6 @@ class SentryHubTests: XCTestCase { }) } - // Although we only run this test above the below specified versions, we expect the - // implementation to be thread safe - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) private func captureConcurrentWithSession(count: Int, _ capture: @escaping (SentryHub) -> Void) { let sut = fixture.getSut() sut.startSession() @@ -687,7 +676,6 @@ class SentryHubTests: XCTestCase { group.waitWithTimeout() } - @available(iOS 10.0, tvOS 10.0, OSX 10.12, *) func testModifyIntegrationsConcurrently() { let sut = fixture.getSut() @@ -720,7 +708,6 @@ class SentryHubTests: XCTestCase { /** * This test only ensures concurrent modifications don't crash. */ - @available(iOS 10.0, tvOS 10.0, OSX 10.12, *) func testModifyIntegrationsConcurrently_NoCrash() { let sut = fixture.getSut() diff --git a/Tests/SentryTests/SentrySDKTests.swift b/Tests/SentryTests/SentrySDKTests.swift index 559e0244ed3..71b96b58ff9 100644 --- a/Tests/SentryTests/SentrySDKTests.swift +++ b/Tests/SentryTests/SentrySDKTests.swift @@ -509,11 +509,6 @@ class SentrySDKTests: XCTestCase { XCTAssertEqual(flushTimeout, transport.flushInvocations.first) } - // Although we only run this test above the below specified versions, we expect the - // implementation to be thread safe - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testSetpAppStartMeasurementConcurrently_() { func setAppStartMeasurement(_ queue: DispatchQueue, _ i: Int) { group.enter() diff --git a/Tests/SentryTests/SentryScopeSwiftTests.swift b/Tests/SentryTests/SentryScopeSwiftTests.swift index 263e1615693..0a0238c5bcb 100644 --- a/Tests/SentryTests/SentryScopeSwiftTests.swift +++ b/Tests/SentryTests/SentryScopeSwiftTests.swift @@ -315,12 +315,7 @@ class SentryScopeSwiftTests: XCTestCase { } } - // Although we only run this test above the below specified versions, we expect the - // implementation to be thread safe // With this test we test if modifications from multiple threads don't lead to a crash. - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testModifyingFromMultipleThreads() { let queue = DispatchQueue(label: "SentryScopeTests", qos: .userInteractive, attributes: [.concurrent, .initiallyInactive]) let group = DispatchGroup() diff --git a/Tests/SentryTests/TestUtils/Async.swift b/Tests/SentryTests/TestUtils/Async.swift index 1e8cbab828c..ec522c76a7b 100644 --- a/Tests/SentryTests/TestUtils/Async.swift +++ b/Tests/SentryTests/TestUtils/Async.swift @@ -1,7 +1,6 @@ import Foundation import XCTest -@available(OSX 10.10, *) func delayNonBlocking(timeout: Double = 0.2) { let group = DispatchGroup() group.enter() diff --git a/Tests/SentryTests/Transaction/SentrySpanContextTests.swift b/Tests/SentryTests/Transaction/SentrySpanContextTests.swift index ec46077adef..28e9aa49ec8 100644 --- a/Tests/SentryTests/Transaction/SentrySpanContextTests.swift +++ b/Tests/SentryTests/Transaction/SentrySpanContextTests.swift @@ -132,9 +132,6 @@ class SentrySpanContextTests: XCTestCase { XCTAssertNil(spanContext.tags[tagKey]) } - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testModifyingTagsFromMultipleThreads() { let queue = DispatchQueue(label: "SentrySpanTests", qos: .userInteractive, attributes: [.concurrent, .initiallyInactive]) let group = DispatchGroup() diff --git a/Tests/SentryTests/Transaction/SentrySpanTests.swift b/Tests/SentryTests/Transaction/SentrySpanTests.swift index c853504c520..8c8f74a511f 100644 --- a/Tests/SentryTests/Transaction/SentrySpanTests.swift +++ b/Tests/SentryTests/Transaction/SentrySpanTests.swift @@ -329,9 +329,6 @@ class SentrySpanTests: XCTestCase { XCTAssertTrue(SentryNoOpSpan.shared() === actualWithDescription) } - @available(tvOS 10.0, *) - @available(OSX 10.12, *) - @available(iOS 10.0, *) func testModifyingExtraFromMultipleThreads() { let queue = DispatchQueue(label: "SentrySpanTests", qos: .userInteractive, attributes: [.concurrent, .initiallyInactive]) let group = DispatchGroup() From 346379f997899a6bc93b90f8afdb20d2d9e1c659 Mon Sep 17 00:00:00 2001 From: Kevin Renskers Date: Mon, 21 Nov 2022 10:50:05 +0100 Subject: [PATCH 5/6] Increase versions in podspec --- Sentry.podspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sentry.podspec b/Sentry.podspec index 0f26d3d0ac2..3c541534486 100644 --- 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' From 004bd90ae4ba54258e246ecb3342430498ae74b8 Mon Sep 17 00:00:00 2001 From: Dhiogo Ramos Brustolin Date: Tue, 22 Nov 2022 09:44:04 +0100 Subject: [PATCH 6/6] Update CoreDataViewController.swift --- .../iOS-Swift/ViewControllers/CoreDataViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/iOS-Swift/iOS-Swift/ViewControllers/CoreDataViewController.swift b/Samples/iOS-Swift/iOS-Swift/ViewControllers/CoreDataViewController.swift index f82b00c9ba5..9cc568fbee2 100644 --- 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(entityName: "Person") fetchRequest.sortDescriptors = [NSSortDescriptor(key: "name", ascending: true)] do { people = try managedObjectContext.fetch(fetchRequest)