Merge remote-tracking branch 'origin/main' into philprime/updated-for…

…matting-tools

.github/last-release-runid

@@ -1 +1 @@
-13055337413
+13310146035

.github/workflows/build.yml

@@ -213,7 +213,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Debug
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \
@@ -231,7 +231,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Release
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \
@@ -249,7 +249,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Debug
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \
@@ -267,7 +267,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build for Release
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform iOS \
             --os latest \
             --ref ${{ github.ref }} \

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release ${{ github.event.inputs.version }}
 on:
   workflow_dispatch:
     inputs:

.github/workflows/test.yml

@@ -15,7 +15,7 @@ on:
       - "fastlane/**"
       - "scripts/tests-with-thread-sanitizer.sh"
       - "scripts/ci-select-xcode.sh"
-      - "scripts/xcode-test.sh"
+      - "scripts/sentry-xcodebuild.sh"
       - ".codecov.yml"
       - Sentry.xcodeproj
 
@@ -186,7 +186,7 @@ jobs:
       - name: Build tests
         id: build_tests
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform ${{matrix.platform}} \
             --os ${{matrix.test-destination-os}} \
             --ref ${{ github.ref_name }} \
@@ -201,7 +201,7 @@ jobs:
         # because GitHub Actions don't provide an easy way of
         # manipulating string in expressions.
         run: |
-          ./scripts/xcode-test.sh \
+          ./scripts/sentry-xcodebuild.sh \
             --platform ${{matrix.platform}} \
             --os ${{matrix.test-destination-os}} \
             --ref ${{ github.ref_name }} \

.github/workflows/ui-tests-critical.yml

@@ -67,10 +67,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Create ${{matrix.device}} (${{matrix.os-version}}) Simulator using Xcode ${{matrix.xcode}}
         run: ./scripts/create-simulator.sh "${{matrix.xcode}}" "${{matrix.os-version}}" "${{matrix.device}}" "${{matrix.force-sim-runtime}}"
-      - name: Install Maestro
-        run: brew tap mobile-dev-inc/tap && brew install mobile-dev-inc/tap/maestro@1.38
-      - name: Install iDB Companion
-        run: brew tap facebook/fb && brew install facebook/fb/idb-companion
+      - name: Install tooling
+        run: make init-ci-test
 
       - uses: actions/download-artifact@v4
         with:

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.0

Brewfile

@@ -3,3 +3,4 @@ brew 'swiftlint'
 brew 'pre-commit'
 brew 'python3'
 brew 'xcbeautify'
+brew 'rbenv'

Brewfile-ci-deploy

@@ -0,0 +1 @@
+brew 'carthage'

Brewfile-ci → Brewfile-ci-test

@@ -2,5 +2,3 @@ tap 'facebook/fb'
 brew 'facebook/fb/idb-companion'
 tap 'mobile-dev-inc/tap'
 brew 'mobile-dev-inc/tap/maestro'
-brew 'carthage'
-brew 'rbenv'

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 8.45.0
 
 ### Features
 

Makefile

@@ -9,10 +9,21 @@ init:
 
 # installs the tools needed to test various CI tasks locally
 init-ci: init
-	brew bundle --file Brewfile-ci
 	rbenv install --skip-existing
 	rbenv exec gem update bundler
 	rbenv exec bundle install
+	clang-format --version | awk '{print $$3}' > scripts/.clang-format-version
+	swiftlint version > scripts/.swiftlint-version
+
+# installs the tools needed to run CI test tasks locally
+.PHONY: init-ci-test
+init-ci-test:
+	brew bundle --file Brewfile-ci-test
+
+# installs the tools needed to run CI deploy tasks locally (note that carthage is preinstalled in github actions)
+.PHONY: init-ci-deploy
+init-ci-deploy:
+	brew bundle --file Brewfile-ci-deploy
 
 .PHONY: check-versions
 check-versions:
@@ -50,7 +61,7 @@ GIT-REF := $(shell git rev-parse --abbrev-ref HEAD)
 
 test:
 	@echo "--> Running all tests"
-	./scripts/xcode-test.sh --platform iOS --os latest --ref $(GIT-REF) --command test --configuration Test
+	./scripts/sentry-xcodebuild.sh --platform iOS --os latest --ref $(GIT-REF) --command test --configuration Test
 	./scripts/xcode-slowest-tests.sh
 .PHONY: test
 

Package.swift

@@ -12,13 +12,13 @@ let package = Package(
     targets: [
         .binaryTarget(
                     name: "Sentry",
-                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.44.0/Sentry.xcframework.zip",
-                    checksum: "78388f70054b713bf251ab6df61f2b7b900c093cbfb23c91cc91b52f26016a8b" //Sentry-Static
+                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.45.0/Sentry.xcframework.zip",
+                    checksum: "03789c7a610c4d9aebb36804a8d5521084cc7459e0333ff7be2d3c380b3d405a" //Sentry-Static
                 ),
         .binaryTarget(
                     name: "Sentry-Dynamic",
-                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.44.0/Sentry-Dynamic.xcframework.zip",
-                    checksum: "28ece75e6a8e0e0f5ed00ff4b7ef3a7dcc379747239f9a1aded9838e6a0a0dc6" //Sentry-Dynamic
+                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.45.0/Sentry-Dynamic.xcframework.zip",
+                    checksum: "7bd0ec34705400853ceb99816a801b82251a18ea8f0ba5bce1366c7c2a61eacf" //Sentry-Dynamic
                 ),
         .target ( name: "SentrySwiftUI",
                   dependencies: ["Sentry", "SentryInternal"],

Samples/iOS-Swift/iOS-Swift/Sample.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 8.44.0
+MARKETING_VERSION = 8.45.0

Sentry.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Sentry"
-  s.version      = "8.44.0"
+  s.version      = "8.45.0"
   s.summary      = "Sentry client for cocoa"
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"

Sentry.xcodeproj/project.pbxproj

@@ -1823,6 +1823,7 @@
 		8459FCBF2BD73EB20038E9C9 /* SentryProfilerSerialization.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryProfilerSerialization.mm; sourceTree = "<group>"; };
 		8459FCC12BD73EEF0038E9C9 /* SentryProfilerSerialization+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SentryProfilerSerialization+Test.h"; sourceTree = "<group>"; };
 		845C16D42A622A5B00EC9519 /* SentryTracer+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryTracer+Private.h"; path = "include/SentryTracer+Private.h"; sourceTree = "<group>"; };
+		846F90332D56F59D009E86C1 /* Brewfile-ci-deploy */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = "Brewfile-ci-deploy"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		848A45172BBF8D33006AAAEC /* SentryContinuousProfiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryContinuousProfiler.h; path = ../include/SentryContinuousProfiler.h; sourceTree = "<group>"; };
 		848A45182BBF8D33006AAAEC /* SentryContinuousProfiler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryContinuousProfiler.mm; sourceTree = "<group>"; };
 		848A451B2BBF9504006AAAEC /* SentryProfilerTestHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryProfilerTestHelpers.h; path = ../include/SentryProfilerTestHelpers.h; sourceTree = "<group>"; };
@@ -1836,7 +1837,7 @@
 		849B8F962C6E906900148E1F /* SentryUserFeedbackIntegrationDriver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SentryUserFeedbackIntegrationDriver.swift; sourceTree = "<group>"; };
 		849B8F972C6E906900148E1F /* SentryUserFeedbackThemeConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SentryUserFeedbackThemeConfiguration.swift; path = Configuration/SentryUserFeedbackThemeConfiguration.swift; sourceTree = "<group>"; };
 		849B8F982C6E906900148E1F /* SentryUserFeedbackWidgetConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SentryUserFeedbackWidgetConfiguration.swift; path = Configuration/SentryUserFeedbackWidgetConfiguration.swift; sourceTree = "<group>"; };
-		849DF0522D00270A00A202DF /* Brewfile-ci */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = "Brewfile-ci"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		849DF0522D00270A00A202DF /* Brewfile-ci-test */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = "Brewfile-ci-test"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		84A305472BC72A0A00D84283 /* SentryAppLaunchProfilingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryAppLaunchProfilingTests.swift; sourceTree = "<group>"; };
 		84A305552BC9EF8C00D84283 /* SentryTraceProfiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryTraceProfiler.h; path = ../include/SentryTraceProfiler.h; sourceTree = "<group>"; };
 		84A305562BC9EF8C00D84283 /* SentryTraceProfiler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryTraceProfiler.mm; sourceTree = "<group>"; };
@@ -4040,7 +4041,8 @@
 				844DA80A28246D5000E6B62E /* .swiftlint.yml */,
 				843BD6282AD8752300B0098F /* .clang-format */,
 				844DA80B28246D5000E6B62E /* Brewfile */,
-				849DF0522D00270A00A202DF /* Brewfile-ci */,
+				849DF0522D00270A00A202DF /* Brewfile-ci-test */,
+				846F90332D56F59D009E86C1 /* Brewfile-ci-deploy */,
 			);
 			name = Aux;
 			sourceTree = "<group>";

SentryPrivate.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SentryPrivate"
-  s.version      = "8.44.0"
+  s.version      = "8.45.0"
   s.summary      = "Sentry Private Library."
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"

SentrySwiftUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SentrySwiftUI"
-  s.version      = "8.44.0"
+  s.version      = "8.45.0"
   s.summary      = "Sentry client for SwiftUI"
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
   s.watchos.framework = 'WatchKit'
 
   s.source_files = "Sources/SentrySwiftUI/**/*.{swift,h,m}"
-  s.dependency 'Sentry/HybridSDK', "8.44.0"
+  s.dependency 'Sentry/HybridSDK', "8.45.0"
 end

SentryTestUtils/SentryLogExtensions.swift

@@ -12,7 +12,7 @@ extension SentryLog {
 
     /// SentryLog uses NSLog internally, which can significantly slow down code because it requires
     /// synchronization. Tests that need code to run fast should can turn off logs to avoid flakiness.
-    public static func withOutLogs<T>(_ closure: () throws -> T) rethrows -> T {
+    public static func withoutLogs<T>(_ closure: () throws -> T) rethrows -> T {
         defer { setTestDefaultLogLevel() }
         disable()
         return try closure()

Sources/Configuration/SDK.xcconfig

@@ -10,7 +10,7 @@ DYLIB_INSTALL_NAME_BASE = @rpath
 MACH_O_TYPE = mh_dylib
 FRAMEWORK_VERSION = A
 
-CURRENT_PROJECT_VERSION = 8.44.0
+CURRENT_PROJECT_VERSION = 8.45.0
 
 ALWAYS_SEARCH_USER_PATHS = NO
 CLANG_ENABLE_OBJC_ARC = YES

Sources/Configuration/SentrySwiftUI.xcconfig

@@ -1,5 +1,5 @@
 PRODUCT_NAME = SentrySwiftUI
-CURRENT_PROJECT_VERSION = 8.44.0
+CURRENT_PROJECT_VERSION = 8.45.0
 
 MACOSX_DEPLOYMENT_TARGET = 10.15
 IPHONEOS_DEPLOYMENT_TARGET = 13.0

Sources/Sentry/SentryMeta.m

@@ -5,7 +5,7 @@ @implementation SentryMeta
 // Don't remove the static keyword. If you do the compiler adds the constant name to the global
 // symbol table and it might clash with other constants. When keeping the static keyword the
 // compiler replaces all occurrences with the value.
-static NSString *versionString = @"8.44.0";
+static NSString *versionString = @"8.45.0";
 static NSString *sdkName = @"sentry.cocoa";
 
 + (NSString *)versionString

Tests/HybridSDKTest/HybridPod.podspec

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.frameworks = 'Foundation'
   s.swift_versions = "5.5"
-  s.dependency "Sentry/HybridSDK", "8.44.0"
+  s.dependency "Sentry/HybridSDK", "8.45.0"
   s.source_files = "HybridTest.swift"
 end

Tests/SentryTests/Integrations/ANR/SentryANRTrackerV2Tests.swift

@@ -310,7 +310,7 @@ class SentryANRTrackerV2Tests: XCTestCase {
 
         // This would print thousands of logs so we execute it without
         // to avoid spamming the test logs.
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
             wait(for: [firstListener.anrDetectedExpectation, firstListener.anrStoppedExpectation, thirdListener.anrStoppedExpectation, thirdListener.anrDetectedExpectation], timeout: waitTimeout)
         }
 
@@ -366,7 +366,7 @@ class SentryANRTrackerV2Tests: XCTestCase {
 
         // This would print thousands of logs so we execute it without
         // to avoid spamming the test logs.
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
             wait(for: [listener.anrDetectedExpectation, listener.anrStoppedExpectation], timeout: waitTimeout)
         }
     }
@@ -391,7 +391,7 @@ class SentryANRTrackerV2Tests: XCTestCase {
 
         // This would print thousands of logs so we execute it without
         // to avoid spamming the test logs.
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
             wait(for: [listener.anrDetectedExpectation, listener.anrStoppedExpectation], timeout: waitTimeout)
         }
     }
@@ -515,7 +515,7 @@ class SentryANRTrackerV2Tests: XCTestCase {
 
         // This would print thousands of logs so we execute it without
         // to avoid spamming the test logs.
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
             wait(for: [listener.anrDetectedExpectation, listener.anrStoppedExpectation], timeout: waitTimeout)
         }
     }

Tests/SentryTests/Integrations/Feedback/SentryFeedbackTests.swift

@@ -145,7 +145,7 @@ class SentryFeedbackTests: XCTestCase {
             func testCaseDescription() -> String {
                 "(config: (requiresName: \(input.config.requiresName), requiresEmail: \(input.config.requiresEmail), nameInput: \(input.config.nameInput == nil ? "nil" : "\"\(input.config.nameInput!)\""), emailInput: \(input.config.emailInput == nil ? "nil" : "\"\(input.config.emailInput!)\""), messageInput: \(input.config.messageInput == nil ? "nil" : "\"\(input.config.messageInput!)\""), includeScreenshot: \(input.config.includeScreenshot)), expectedSubmitButtonAccessibilityHint: \(input.expectedSubmitButtonAccessibilityHint)"
             }
-            SentryLog.withOutLogs {
+            SentryLog.withoutLogs {
                 switch viewModel.validate() {
                 case .success(let hint):
                     XCTAssert(input.shouldValidate)

Tests/SentryTests/Networking/SentryHttpTransportTests.swift

@@ -799,7 +799,7 @@ class SentryHttpTransportTests: XCTestCase {
         givenCachedEvents(amount: 30)
         fixture.requestManager.responseDelay = fixture.flushTimeout + 0.2
 
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
             let beforeFlush = getAbsoluteTime()
             let result = sut.flush(fixture.flushTimeout)
             let blockingDuration = getDurationNs(beforeFlush, getAbsoluteTime()).toTimeInterval()
@@ -814,7 +814,7 @@ class SentryHttpTransportTests: XCTestCase {
     func testFlush_BlocksCallingThread_FinishesFlushingWhenSent() {
         givenCachedEvents(amount: 1)
 
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
 
             let beforeFlush = getAbsoluteTime()
             XCTAssertEqual(.success, sut.flush(fixture.flushTimeout), "Flush should not time out.")
@@ -827,7 +827,7 @@ class SentryHttpTransportTests: XCTestCase {
     func testFlush_CalledSequentially_BlocksTwice() {
         givenCachedEvents()
 
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
 
             let beforeFlush = getAbsoluteTime()
             XCTAssertEqual(.success, sut.flush(fixture.flushTimeout), "Flush should not time out.")
@@ -845,7 +845,7 @@ class SentryHttpTransportTests: XCTestCase {
         var blockingDurationSum: TimeInterval = 0.0
         let flushInvocations = 100
 
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
 
             for _ in  0..<flushInvocations {
                 let beforeFlush = getAbsoluteTime()
@@ -872,7 +872,7 @@ class SentryHttpTransportTests: XCTestCase {
         var blockingDurationSum: TimeInterval = 0.0
         let flushInvocations = 100
 
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
 
             for _ in  0..<flushInvocations {
                 let beforeFlush = getAbsoluteTime()
@@ -890,7 +890,7 @@ class SentryHttpTransportTests: XCTestCase {
     func testFlush_CallingFlushDirectlyAfterCapture_Flushes() {
         let sut = fixture.getSut(dispatchQueueWrapper: SentryDispatchQueueWrapper())
 
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
 
             for _ in 0..<10 {
                 sut.send(envelope: fixture.eventEnvelope)
@@ -903,7 +903,7 @@ class SentryHttpTransportTests: XCTestCase {
     }
 
     func testFlush_CalledMultipleTimes_ImmediatelyReturnsFalse() {
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
 
             givenCachedEvents(amount: 30)
 

Tests/SentryTests/SentrySDKTests.swift

@@ -991,7 +991,7 @@ class SentrySDKTests: XCTestCase {
 class SentrySDKWithSetupTests: XCTestCase {
 
     func testAccessingHubAndOptions_NoDeadlock() {
-        SentryLog.withOutLogs {
+        SentryLog.withoutLogs {
 
             let concurrentQueue = DispatchQueue(label: "concurrent", attributes: .concurrent)