Merge branch 'main' of github.com:getsentry/sentry-cocoa into itay/cocoa-533-convert-sentryreachability-to-swift

Author: itaybre

.github/workflows/api-stability.yml

@@ -46,9 +46,8 @@ jobs:
 
       - name: Generate HEAD SDK
         run: |
-          mv sdk_api_V9.json sdk_api_base.json
-          ./scripts/update-api.sh V9
-          mv sdk_api_V9.json sdk_api.json
+          mv sdk_api.json sdk_api_base.json
+          ./scripts/update-api.sh
 
       - name: Diagnose breaking changes
         run: |

.github/workflows/build.yml

@@ -76,8 +76,6 @@ jobs:
         include:
           - scheme: macOS-Swift
             config: Debug
-          - scheme: iOS13-Swift
-            config: Debug
           - scheme: watchOS-Swift WatchKit App
             config: Debug
           - scheme: macOS-SwiftUI

.github/workflows/release.yml

@@ -275,7 +275,7 @@ jobs:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
       - name: Collect app metrics
-        uses: getsentry/action-app-sdk-overhead-metrics@c9eca50e02d180ee07a02952c062b2f3f545f735
+        uses: getsentry/action-app-sdk-overhead-metrics@4ccd0f993ff482b1ea5da556134ccace418190fb
         with:
           config: Tests/Perf/metrics-test.yml
           sauce-user: ${{ secrets.SAUCE_USERNAME }}

.github/workflows/test-cross-platform.yml

@@ -55,6 +55,7 @@ jobs:
         with:
           repository: getsentry/sentry-react-native
           path: sentry-react-native
+          ref: updateVersion
 
       - name: Enable Corepack
         working-directory: sentry-react-native

.gitignore

@@ -86,7 +86,6 @@ Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.xcodeproj
 Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj
 Samples/iOS-Swift/iOS-Swift.xcodeproj
 Samples/iOS-Swift6/iOS-Swift6.xcodeproj
-Samples/iOS13-Swift/iOS13-Swift.xcodeproj
 Samples/iOS-SwiftUI/iOS-SwiftUI.xcodeproj
 Samples/iOS15-SwiftUI/iOS15-SwiftUI.xcodeproj
 Samples/macOS-Swift/macOS-Swift.xcodeproj

CHANGELOG-v9.md

@@ -17,9 +17,3 @@ Removes `integrations` property from `SentryOptions` (#5749)
 Makes `SentryEventDecodable` internal (#5808)
 The `span` property on `SentryScope` is now readonly (#5866)
 Removes `enablePerformanceV2` option and makes this the default (#6008)
-
-### Fixes
-
-Fixes warnings about minimum OS version being lower than Xcode supported version (#5591)
-
-### Improvements

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - Add SentryDistribution as Swift Package Manager target (#6149)
 
+### Fixes
+
+Fixes warnings about minimum OS version being lower than Xcode supported version (#5591)
+
 ## 8.56.2
 
 ### Fixes

Makefile

@@ -189,7 +189,6 @@ xcode-ci:
 	xcodegen --spec Samples/iOS-ObjectiveC/iOS-ObjectiveC.yml
 	xcodegen --spec Samples/iOS-Swift/iOS-Swift.yml
 	xcodegen --spec Samples/iOS-Swift6/iOS-Swift6.yml
-	xcodegen --spec Samples/iOS13-Swift/iOS13-Swift.yml
 	xcodegen --spec Samples/iOS-SwiftUI/iOS-SwiftUI.yml
 	xcodegen --spec Samples/iOS15-SwiftUI/iOS15-SwiftUI.yml
 	xcodegen --spec Samples/macOS-SwiftUI/macOS-SwiftUI.yml

Package.swift

@@ -1,5 +1,5 @@
-// swift-tools-version:5.3
-#if canImport(Darwin)   
+// swift-tools-version:5.5
+#if canImport(Darwin)
 import Darwin.C
 #elseif canImport(Glibc)
 import Glibc
@@ -120,7 +120,7 @@ if let env = env, String(cString: env, encoding: .utf8) == "1" {
 
 let package = Package(
     name: "Sentry",
-    platforms: [.iOS(.v11), .macOS(.v10_13), .tvOS(.v11), .watchOS(.v4)],
+    platforms: [.iOS(.v15), .macOS(.v12), .tvOS(.v15), .watchOS(.v8)],
     products: products,
     targets: targets,
     cxxLanguageStandard: .cxx14

Samples/SPM-Dynamic/Package.swift

@@ -1,11 +1,11 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.5
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "SPM-Dynamic",
-    platforms: [.macOS(.v10_13)],
+    platforms: [.macOS(.v12)],
     products: [
         .executable(name: "SPM-Dynamic", targets: ["SPM-Dynamic"])
     ],