Merge branch 'main' into feat/swift-errors

.codecov.yml

@@ -0,0 +1,24 @@
+codecov:
+  branch: main
+  require_ci_to_pass: yes
+  notify:
+    wait_for_ci: yes
+
+coverage:
+  range: 80...100
+  precision: 3
+  round: down
+
+ignore:
+  - "Tests/SentryTests" 
+
+comment:
+  layout: "reach,diff,flags,files,footer"
+  # Update, if comment exists. Otherwise post new.
+  behavior: default
+  # Comments will only post when coverage changes. Furthermore, if a comment
+  # already exists, and a newer commit results in no coverage change for the
+  # entire pull, the comment will be deleted.
+  require_changes: true
+  require_base: yes # must have a base report to post
+  require_head: yes # must have a head report to post

.github/workflows/test.yml

@@ -16,6 +16,7 @@ on:
       - 'scripts/tests-with-thread-sanitizer.sh'
       - 'scripts/ci-select-xcode.sh'
       - 'scripts/xcode-test.sh'
+      - '.codecov.yml'
 
       # run the workflow any time an Xcode scheme changes for any tested target
       - 'Sentry.xcodeproj/xcshareddata/xcschemes/Sentry.xcscheme'
@@ -104,9 +105,9 @@ jobs:
             timeout-minutes: 15
 
           # iOS 16
-          - runs-on: macos-12
+          - runs-on: macos-13
             platform: 'iOS'
-            xcode: '14.2'
+            xcode: '14.3'
             test-destination-os: 'latest'
             timeout-minutes: 15
 
@@ -125,9 +126,9 @@ jobs:
             timeout-minutes: 15
 
             # macOS 13
-          - runs-on: macos-12
+          - runs-on: macos-13
             platform: 'macOS'
-            xcode: '14.2'
+            xcode: '14.3'
             test-destination-os: 'latest'
             timeout-minutes: 15
 
@@ -157,9 +158,9 @@ jobs:
             timeout-minutes: 15
 
           # tvOS 16
-          - runs-on: macos-12
+          - runs-on: macos-13
             platform: 'tvOS'
-            xcode: '14.2'
+            xcode: '14.3'
             test-destination-os: 'latest'
             timeout-minutes: 15
 
@@ -168,6 +169,10 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: test-server
+
+      - name: Print hardware info
+        run: system_profiler SPHardwareDataType
+
       - name: Allow test-server to run
         run: chmod +x ./test-server-exec
       - run: ./test-server-exec &

.github/workflows/testflight.yml

@@ -9,14 +9,18 @@ on:
       - '.github/workflows/testflight.yml'
       - 'fastlane/**'
       - 'scripts/ci-select-xcode.sh'
+
+  pull_request:
+    paths:
+      - '.github/workflows/testflight.yml'
 
 jobs:
   upload_to_testflight:
     name: Build and Upload iOS-Swift to Testflight
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v3
-      - run: ./scripts/ci-select-xcode.sh 14.2
+      - run: ./scripts/ci-select-xcode.sh 14.3
       - run: bundle install
 
       # We upload a new version to TestFlight on every commit on main

Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj

@@ -1190,7 +1190,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.31.5;
+				MARKETING_VERSION = 8.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
@@ -1219,7 +1219,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.31.5;
+				MARKETING_VERSION = 8.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";
@@ -1864,7 +1864,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.31.5;
+				MARKETING_VERSION = 8.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
@@ -1899,7 +1899,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.31.5;
+				MARKETING_VERSION = 8.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip";

Tests/SentryTests/Helper/SentryDeviceTests.mm

@@ -134,11 +134,12 @@ - (void)testDeviceModel
     const auto modelName = sentry_getDeviceModel();
     XCTAssertNotEqual(modelName.length, 0U);
 #if TARGET_OS_OSX || TARGET_OS_MACCATALYST
-#    if defined(TESTCI) || defined(TEST)
-    SENTRY_ASSERT_CONTAINS(modelName, @"VMware");
-#    else
-    SENTRY_ASSERT_CONTAINS(modelName, @"Mac");
-#    endif // defined(TESTCI)
+    NSString *VMware = @"VMware";
+    NSString *mac = @"Mac";
+    BOOL containsExpectedDevice =
+        [modelName containsString:VMware] || [modelName containsString:mac];
+    XCTAssertTrue(
+        containsExpectedDevice, @"Expected %@ to contain either %@ or %@", modelName, VMware, mac);
 #elif TARGET_OS_IOS
     // We must test this branch in iOS-SwiftUITests since it must run on device, which SentryTests
     // cannot.

Tests/SentryTests/Networking/RateLimits/SentryConcurrentRateLimitsDictionaryTests.swift

@@ -87,9 +87,6 @@ class SentryConcurrentRateLimitsDictionaryTests: XCTestCase {
         }
     }
 
-    // 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, *)
     private func getCategory(rawValue: NSNumber) -> SentryDataCategory {
         func failedToCreateCategory() -> SentryDataCategory {
             XCTFail("Could not create category from \(rawValue)")

scripts/ci-select-xcode.sh

@@ -3,6 +3,7 @@
 # For available Xcode versions see:
 # - https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
 # - https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
+# - https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
 
 set -euo pipefail