Merge 2e9df51 into ad964ca

philprime · web-flow · commit f9e69b3b11f1 · 2025-08-01T15:16:13.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -112,11 +112,22 @@ jobs:
     if: startsWith(github.ref, 'refs/heads/release/') == false
     steps:
       - uses: actions/checkout@v4
-      - run: rm -r Sentry.xcodeproj && rm -r Sentry.xcworkspace && EXPERIMENTAL_SPM_BUILDS=1 xcodebuild build -scheme SentrySPM -sdk watchos -destination 'generic/platform=watchOS'
+
+      - run: rm -r Sentry.xcodeproj && rm -r Sentry.xcworkspace
+      - run: set -o pipefail && NSUnbufferedIO=YES EXPERIMENTAL_SPM_BUILDS=1 xcodebuild build -scheme SentrySPM -sdk watchos -destination 'generic/platform=watchOS' | tee raw-build-output-spm-watchos.log | xcbeautify
         shell: sh
-      - run: EXPERIMENTAL_SPM_BUILDS=1 xcodebuild build -scheme SentrySPM -sdk iphoneos -destination 'generic/platform=iphoneos'
+      - run: set -o pipefail && NSUnbufferedIO=YES EXPERIMENTAL_SPM_BUILDS=1 xcodebuild build -scheme SentrySPM -sdk iphoneos -destination 'generic/platform=iphoneos' | tee raw-build-output-spm-iphoneos.log | xcbeautify
         shell: sh
 
+      - name: Upload SPM Build Logs
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() || cancelled() }}
+        with:
+          name: raw-build-output-spm
+          path: |
+            raw-build-output-spm-watchos.log
+            raw-build-output-spm-iphoneos.log
+
   build-v9:
     name: Build SDK v9
     runs-on: macos-15
diff --git a/Package.swift b/Package.swift
@@ -47,13 +47,18 @@ let env = getenv("EXPERIMENTAL_SPM_BUILDS")
 if let env = env, String(cString: env, encoding: .utf8) == "1" {
     products.append(.library(name: "SentrySPM", type: .dynamic, targets: ["SentryObjc"]))
     targets.append(contentsOf: [
-        // At least one source file is required
-        .target(name: "SentryHeaders", path: "Sources/Sentry", sources: ["SentryDsn.m"], publicHeadersPath: "Public"),
+        // At least one source file is required, therefore we use a dummy class to satisfy the SPM build system
+        .target(
+            name: "SentryHeaders",
+            path: "Sources/Sentry", 
+            sources: ["SentryDummyPublicEmptyClass.m"],
+            publicHeadersPath: "Public"
+        ),
         .target(
             name: "_SentryPrivate",
             dependencies: ["SentryHeaders"],
             path: "Sources/Sentry",
-            sources: ["NSLocale+Sentry.m"],
+            sources: ["SentryDummyPrivateEmptyClass.m"],
             publicHeadersPath: "include",
             cSettings: [.headerSearchPath("include/HybridPublic")]),
         .target(
@@ -70,7 +75,7 @@ if let env = env, String(cString: env, encoding: .utf8) == "1" {
             name: "SentryObjc",
             dependencies: ["SentrySwift"],
             path: "Sources",
-            exclude: ["Sentry/SentryDsn.m", "Sentry/NSLocale+Sentry.m", "Swift", "SentrySwiftUI", "Resources", "Configuration"],
+            exclude: ["Sentry/SentryDummyPublicEmptyClass.m", "Sentry/SentryDummyPrivateEmptyClass.m", "Swift", "SentrySwiftUI", "Resources", "Configuration"],
             cSettings: [
                 .headerSearchPath("Sentry/include/HybridPublic"),
                 .headerSearchPath("Sentry"),
diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
@@ -883,6 +883,8 @@
 		D4CD2A812DE9F91900DA9F59 /* SentryRedactRegionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4CD2A7D2DE9F91900DA9F59 /* SentryRedactRegionType.swift */; };
 		D4E3F35D2D4A864600F79E2B /* SentryNSDictionarySanitizeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D42E48582D48FC8F00D251BC /* SentryNSDictionarySanitizeTests.swift */; };
 		D4E3F35E2D4A877300F79E2B /* SentryNSDictionarySanitize+Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = D41909942D490006002B83D0 /* SentryNSDictionarySanitize+Tests.m */; };
+		D4ECA4012E3CBEDE00C757EA /* SentryDummyPublicEmptyClass.m in Sources */ = {isa = PBXBuildFile; fileRef = D4ECA4002E3CBEDE00C757EA /* SentryDummyPublicEmptyClass.m */; };
+		D4ECA4022E3CBEDE00C757EA /* SentryDummyPrivateEmptyClass.m in Sources */ = {isa = PBXBuildFile; fileRef = D4ECA3FF2E3CBEDE00C757EA /* SentryDummyPrivateEmptyClass.m */; };
 		D4EDF9842D0B2A210071E7B3 /* Data+SentryTracing.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4EDF9832D0B2A1D0071E7B3 /* Data+SentryTracing.swift */; };
 		D4EE12D22DE9AC3800385BAF /* TestNSNotificationCenterWrapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4EE12D12DE9AC3300385BAF /* TestNSNotificationCenterWrapperTests.swift */; };
 		D4F2B5352D0C69D500649E42 /* SentryCrashCTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4F2B5342D0C69D100649E42 /* SentryCrashCTests.swift */; };
@@ -2205,6 +2207,8 @@
 		D4CBA2512DE06D1600581618 /* TestConstantTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestConstantTests.swift; sourceTree = "<group>"; };
 		D4CD2A7C2DE9F91900DA9F59 /* SentryRedactRegion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryRedactRegion.swift; sourceTree = "<group>"; };
 		D4CD2A7D2DE9F91900DA9F59 /* SentryRedactRegionType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryRedactRegionType.swift; sourceTree = "<group>"; };
+		D4ECA3FF2E3CBEDE00C757EA /* SentryDummyPrivateEmptyClass.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDummyPrivateEmptyClass.m; sourceTree = "<group>"; };
+		D4ECA4002E3CBEDE00C757EA /* SentryDummyPublicEmptyClass.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDummyPublicEmptyClass.m; sourceTree = "<group>"; };
 		D4EDF9832D0B2A1D0071E7B3 /* Data+SentryTracing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+SentryTracing.swift"; sourceTree = "<group>"; };
 		D4EE12D12DE9AC3300385BAF /* TestNSNotificationCenterWrapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestNSNotificationCenterWrapperTests.swift; sourceTree = "<group>"; };
 		D4F2B5342D0C69D100649E42 /* SentryCrashCTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCrashCTests.swift; sourceTree = "<group>"; };
@@ -3087,6 +3091,8 @@
 				7B2BB0012966F55900A1E102 /* SentryOptionsInternal.h */,
 				7D9B079F23D1E89800C5FC8E /* SentryMeta.h */,
 				7D082B8023C628780029866B /* SentryMeta.m */,
+				D4ECA3FF2E3CBEDE00C757EA /* SentryDummyPrivateEmptyClass.m */,
+				D4ECA4002E3CBEDE00C757EA /* SentryDummyPublicEmptyClass.m */,
 			);
 			path = Sentry;
 			sourceTree = "<group>";
@@ -5787,6 +5793,8 @@
 				A8F17B2E2901765900990B25 /* SentryRequest.m in Sources */,
 				FABE8E172E307A7F0040809A /* Dependencies.swift in Sources */,
 				7BE1E33424F7E3CB009D3AD0 /* SentryMigrateSessionInit.m in Sources */,
+				D4ECA4012E3CBEDE00C757EA /* SentryDummyPublicEmptyClass.m in Sources */,
+				D4ECA4022E3CBEDE00C757EA /* SentryDummyPrivateEmptyClass.m in Sources */,
 				D80299502BA83A88000F0081 /* SentryPixelBuffer.swift in Sources */,
 				15E0A8F22411A45A00F044E3 /* SentrySession.m in Sources */,
 				844EDCE62947DC3100C86F34 /* SentryNSTimerFactory.m in Sources */,
diff --git a/Sources/Sentry/Processors/SentryWatchdogTerminationBreadcrumbProcessor.m b/Sources/Sentry/Processors/SentryWatchdogTerminationBreadcrumbProcessor.m
@@ -1,5 +1,6 @@
 #import "SentryWatchdogTerminationBreadcrumbProcessor.h"
 #import "SentryFileManager.h"
+#import "SentryInternalDefines.h"
 #import "SentryLogC.h"
 #import "SentrySerialization.h"
 
@@ -44,7 +45,7 @@ - (void)addSerializedBreadcrumb:(NSDictionary *)crumb
         SENTRY_LOG_ERROR(@"Error serializing breadcrumb to JSON");
         return;
     }
-    [self storeBreadcrumb:jsonData];
+    [self storeBreadcrumb:SENTRY_UNWRAP_NULLABLE(NSData, jsonData)];
 }
 
 - (void)clear
diff --git a/Sources/Sentry/SentryBinaryImageCache.m b/Sources/Sentry/SentryBinaryImageCache.m
@@ -4,6 +4,7 @@
 #import "SentryDefaultObjCRuntimeWrapper.h"
 #import "SentryDependencyContainer.h"
 #import "SentryInAppLogic.h"
+#import "SentryInternalDefines.h"
 #import "SentryLogC.h"
 #import "SentrySDK+Private.h"
 #import "SentrySwift.h"
@@ -176,7 +177,7 @@ - (NSInteger)indexOfImage:(uint64_t)address
 - (NSArray<SentryBinaryImageInfo *> *)getAllBinaryImages
 {
     @synchronized(self) {
-        return _cache.copy;
+        return SENTRY_UNWRAP_NULLABLE(NSArray<SentryBinaryImageInfo *>, _cache.copy);
     }
 }
 
diff --git a/Sources/Sentry/SentryBreadcrumb.m b/Sources/Sentry/SentryBreadcrumb.m
@@ -1,6 +1,7 @@
 #import "SentryBreadcrumb.h"
 #import "SentryBreadcrumb+Private.h"
 #import "SentryDateUtils.h"
+#import "SentryInternalDefines.h"
 #import "SentryLevelMapper.h"
 #import "SentryNSDictionarySanitize.h"
 #import "SentrySwift.h"
@@ -75,7 +76,7 @@ - (BOOL)isEqual:(id _Nullable)other
     if (!other || ![[other class] isEqual:[self class]])
         return NO;
 
-    return [self isEqualToBreadcrumb:other];
+    return [self isEqualToBreadcrumb:SENTRY_UNWRAP_NULLABLE(SentryBreadcrumb, other)];
 }
 
 - (BOOL)isEqualToBreadcrumb:(SentryBreadcrumb *)breadcrumb
diff --git a/Sources/Sentry/SentryBreadcrumbTracker.m b/Sources/Sentry/SentryBreadcrumbTracker.m
@@ -316,12 +316,14 @@ + (NSDictionary *)fetchInfoAboutViewController:(UIViewController *)controller
 
     if (controller.presentingViewController != nil) {
         info[@"presentingViewController"] =
-            [SwiftDescriptor getViewControllerClassName:controller.presentingViewController];
+            [SwiftDescriptor getViewControllerClassName:SENTRY_UNWRAP_NULLABLE(UIViewController,
+                                                            controller.presentingViewController)];
     }
 
     if (controller.parentViewController != nil) {
         info[@"parentViewController"] =
-            [SwiftDescriptor getViewControllerClassName:controller.parentViewController];
+            [SwiftDescriptor getViewControllerClassName:SENTRY_UNWRAP_NULLABLE(UIViewController,
+                                                            controller.parentViewController)];
     }
 
     if (controller.view.window != nil) {
diff --git a/Sources/Sentry/SentryCoreDataTracker.m b/Sources/Sentry/SentryCoreDataTracker.m
@@ -204,7 +204,8 @@ - (NSString *)descriptionFromRequest:(NSFetchRequest *)request
 
     if (request.predicate) {
         [result appendFormat:@" WHERE %@",
-            [predicateDescriptor predicateDescription:request.predicate]];
+            [predicateDescriptor
+                predicateDescription:SENTRY_UNWRAP_NULLABLE(NSPredicate, request.predicate)]];
     }
 
     if (request.sortDescriptors.count > 0) {
diff --git a/Sources/Sentry/SentryCrashIntegrationSessionHandler.m b/Sources/Sentry/SentryCrashIntegrationSessionHandler.m
@@ -4,6 +4,7 @@
 #import "SentryDependencyContainer.h"
 #import "SentryFileManager.h"
 #import "SentryHub.h"
+#import "SentryInternalDefines.h"
 #import "SentryLogC.h"
 #import "SentrySDK+Private.h"
 #import "SentrySession.h"
@@ -81,7 +82,8 @@ - (void)endCurrentSessionIfRequired
             return;
         }
 
-        [session endSessionAbnormalWithTimestamp:appHangEvent.timestamp];
+        [session
+            endSessionAbnormalWithTimestamp:SENTRY_UNWRAP_NULLABLE(NSDate, appHangEvent).timestamp];
         [fileManager storeAbnormalSession:session];
         [fileManager deleteCurrentSession];
     }
diff --git a/Sources/Sentry/SentryDateUtil.m b/Sources/Sentry/SentryDateUtil.m
@@ -1,4 +1,5 @@
 #import "SentryDateUtil.h"
+#import "SentryInternalDefines.h"
 #import "SentrySwift.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -24,7 +25,8 @@ - (BOOL)isInFuture:(NSDate *_Nullable)date
     if (date == nil)
         return NO;
 
-    NSComparisonResult result = [[self.currentDateProvider date] compare:date];
+    NSComparisonResult result =
+        [[self.currentDateProvider date] compare:SENTRY_UNWRAP_NULLABLE(NSDate, date)];
     return result == NSOrderedAscending;
 }
 
@@ -37,7 +39,8 @@ + (NSDate *_Nullable)getMaximumDate:(NSDate *_Nullable)first andOther:(NSDate *_
     if (second == nil)
         return first;
 
-    NSComparisonResult result = [first compare:second];
+    NSComparisonResult result =
+        [SENTRY_UNWRAP_NULLABLE(NSDate, first) compare:SENTRY_UNWRAP_NULLABLE(NSDate, second)];
     if (result == NSOrderedDescending) {
         return first;
     } else {
diff --git a/Sources/Sentry/SentryDebugImageProvider.m b/Sources/Sentry/SentryDebugImageProvider.m
@@ -67,7 +67,7 @@ - (void)extractDebugImageAddressFromFrames:(NSArray<SentryFrame *> *)frames
 {
     for (SentryFrame *frame in frames) {
         if (frame.imageAddress) {
-            [set addObject:frame.imageAddress];
+            [set addObject:SENTRY_UNWRAP_NULLABLE(NSString, frame.imageAddress)];
         }
     }
 }
@@ -85,7 +85,8 @@ - (void)extractDebugImageAddressFromFrames:(NSArray<SentryFrame *> *)frames
 #    pragma clang diagnostic pop
 
     for (SentryDebugMeta *sourceImage in binaryImages) {
-        if ([addresses containsObject:sourceImage.imageAddress]) {
+        if (sourceImage.imageAddress &&
+            [addresses containsObject:SENTRY_UNWRAP_NULLABLE(NSString, sourceImage.imageAddress)]) {
             [result addObject:sourceImage];
         }
     }
diff --git a/Sources/Sentry/SentryDefaultRateLimits.m b/Sources/Sentry/SentryDefaultRateLimits.m
@@ -2,6 +2,7 @@
 #import "SentryConcurrentRateLimitsDictionary.h"
 #import "SentryDataCategoryMapper.h"
 #import "SentryDateUtil.h"
+#import "SentryInternalDefines.h"
 #import "SentryLogC.h"
 #import "SentryRateLimitParser.h"
 #import "SentryRetryAfterHeaderParser.h"
@@ -61,7 +62,8 @@ - (void)update:(NSHTTPURLResponse *)response
             SentryDataCategory category
                 = sentryDataCategoryForNSUInteger(categoryAsNumber.unsignedIntegerValue);
 
-            [self updateRateLimit:category withDate:limits[categoryAsNumber]];
+            [self updateRateLimit:category
+                         withDate:SENTRY_UNWRAP_NULLABLE(NSDate, limits[categoryAsNumber])];
         }
     } else if (response.statusCode == 429) {
         NSDate *retryAfterHeaderDate =
diff --git a/Sources/Sentry/SentryDependencyContainer.m b/Sources/Sentry/SentryDependencyContainer.m
@@ -9,6 +9,7 @@
 #import "SentryFileIOTracker.h"
 #import "SentryFileManager.h"
 #import "SentryInternalCDefines.h"
+#import "SentryInternalDefines.h"
 #import "SentryLogC.h"
 #import "SentryNSProcessInfoWrapper.h"
 #import "SentryNSTimerFactory.h"
@@ -28,7 +29,6 @@
 #import <SentryDependencyContainer.h>
 #import <SentryGlobalEventProcessor.h>
 #import <SentryHttpDateParser.h>
-#import <SentryInternalDefines.h>
 #import <SentryPerformanceTracker.h>
 #import <SentryRateLimitParser.h>
 #import <SentryRetryAfterHeaderParser.h>
diff --git a/Sources/Sentry/SentryDsn.m b/Sources/Sentry/SentryDsn.m
@@ -2,6 +2,7 @@
 
 #import "SentryDsn.h"
 #import "SentryError.h"
+#import "SentryInternalDefines.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -19,10 +20,11 @@ - (_Nullable instancetype)initWithString:(NSString *)dsnString
 {
     self = [super init];
     if (self) {
-        _url = [self convertDsnString:dsnString didFailWithError:error];
-        if (_url == nil) {
+        NSURL *_Nullable nullableUrl = [self convertDsnString:dsnString didFailWithError:error];
+        if (nullableUrl == nil) {
             return nil;
         }
+        _url = SENTRY_UNWRAP_NULLABLE(NSURL, nullableUrl);
     }
     return self;
 }
@@ -102,7 +104,7 @@ - (NSURL *_Nullable)convertDsnString:(NSString *)dsnString
         errorMessage = @"URL scheme of DSN is missing";
         url = nil;
     }
-    if (url != nil && ![allowedSchemes containsObject:url.scheme]) {
+    if (url != nil && ![allowedSchemes containsObject:SENTRY_UNWRAP_NULLABLE(NSURL, url).scheme]) {
         errorMessage = @"Unrecognized URL scheme in DSN";
         url = nil;
     }
diff --git a/Sources/Sentry/SentryDummyPrivateEmptyClass.m b/Sources/Sentry/SentryDummyPrivateEmptyClass.m
@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+// This class is required because SPM doesn't support header only targets
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SentryPrivateDummyEmptyClass : NSObject
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Sources/Sentry/SentryDummyPublicEmptyClass.m b/Sources/Sentry/SentryDummyPublicEmptyClass.m
@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+// This class is required because SPM doesn't support header only targets
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SentryPublicDummyEmptyClass : NSObject
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Sources/Sentry/SentryEvent.m b/Sources/Sentry/SentryEvent.m
@@ -203,7 +203,8 @@ - (BOOL)isMetricKitEvent
 
     SentryException *exception = self.exceptions[0];
     if (exception.mechanism != nil &&
-        [metricKitMechanisms containsObject:exception.mechanism.type]) {
+        [metricKitMechanisms
+            containsObject:SENTRY_UNWRAP_NULLABLE(NSString, exception.mechanism).type]) {
         return YES;
     } else {
         return NO;
@@ -216,7 +217,9 @@ - (BOOL)isAppHangEvent
 {
     return self.exceptions.count == 1 &&
         [SentryAppHangTypeMapper
-            isExceptionTypeAppHangWithExceptionType:self.exceptions.firstObject.type];
+            isExceptionTypeAppHangWithExceptionType:SENTRY_UNWRAP_NULLABLE(
+                                                        NSString, self.exceptions.firstObject)
+                                                        .type];
 }
 
 @end
diff --git a/Sources/Sentry/SentryGeo.m b/Sources/Sentry/SentryGeo.m
@@ -1,4 +1,5 @@
 #import "SentryGeo.h"
+#import "SentryInternalDefines.h"
 #import "SentrySwift.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -46,7 +47,7 @@ - (BOOL)isEqual:(id _Nullable)other
         return NO;
     }
 
-    return [self isEqualToGeo:other];
+    return [self isEqualToGeo:SENTRY_UNWRAP_NULLABLE(SentryGeo, other)];
 }
 
 - (BOOL)isEqualToGeo:(SentryGeo *)geo
diff --git a/Sources/Sentry/SentryHttpTransport.m b/Sources/Sentry/SentryHttpTransport.m
@@ -13,6 +13,7 @@
 #import "SentryEnvelopeRateLimit.h"
 #import "SentryEvent.h"
 #import "SentryFileManager.h"
+#import "SentryInternalDefines.h"
 #import "SentryLogC.h"
 #import "SentryNSURLRequestBuilder.h"
 #import "SentryOptions.h"
@@ -377,7 +378,7 @@ - (void)deleteEnvelopeAndSendNext:(nullable NSString *)envelopePath
 {
     SENTRY_LOG_DEBUG(@"Deleting envelope and sending next.");
     if (envelopePath != nil) {
-        [self.fileManager removeFileAtPath:envelopePath];
+        [self.fileManager removeFileAtPath:SENTRY_UNWRAP_NULLABLE(NSString, envelopePath)];
     }
     @synchronized(self) {
         self.isSending = NO;
@@ -417,7 +418,7 @@ - (void)sendEnvelope:(SentryEnvelope *)envelope
                 return;
             }
 
-            [weakSelf.rateLimits update:response];
+            [weakSelf.rateLimits update:SENTRY_UNWRAP_NULLABLE(NSHTTPURLResponse, response)];
 
             if (response.statusCode == 200) {
                 SENTRY_LOG_DEBUG(@"Envelope sent successfully!");
diff --git a/Sources/Sentry/SentryHub.m b/Sources/Sentry/SentryHub.m
@@ -9,6 +9,7 @@
 #import "SentryHub+Private.h"
 #import "SentryInstallation.h"
 #import "SentryIntegrationProtocol.h"
+#import "SentryInternalDefines.h"
 #import "SentryLevelMapper.h"
 #import "SentryLogC.h"
 #import "SentryNSTimerFactory.h"
@@ -194,7 +195,7 @@ - (void)closeCachedSessionWithTimestamp:(nullable NSDate *)timestamp
             [session endSessionAbnormalWithTimestamp:timestamp];
         } else {
             SENTRY_LOG_DEBUG(@"Closing cached session as exited.");
-            [session endSessionExitedWithTimestamp:timestamp];
+            [session endSessionExitedWithTimestamp:SENTRY_UNWRAP_NULLABLE(NSDate, timestamp)];
         }
         [self deleteCurrentSession];
         [client captureSession:session];
diff --git a/Sources/Sentry/SentryRetryAfterHeaderParser.m b/Sources/Sentry/SentryRetryAfterHeaderParser.m
diff --git a/Sources/Sentry/SentryScope.m b/Sources/Sentry/SentryScope.m
diff --git a/Sources/Sentry/SentrySpotlightTransport.m b/Sources/Sentry/SentrySpotlightTransport.m
diff --git a/Sources/Sentry/SentryTracer.m b/Sources/Sentry/SentryTracer.m
diff --git a/Sources/Sentry/SentryTransaction.m b/Sources/Sentry/SentryTransaction.m
diff --git a/Sources/Sentry/SentryUIEventTracker.m b/Sources/Sentry/SentryUIEventTracker.m
diff --git a/Sources/Sentry/SentryUIViewControllerPerformanceTracker.m b/Sources/Sentry/SentryUIViewControllerPerformanceTracker.m
diff --git a/Sources/Sentry/SentryUser.m b/Sources/Sentry/SentryUser.m
diff --git a/Sources/Sentry/SentryWatchdogTerminationLogic.m b/Sources/Sentry/SentryWatchdogTerminationLogic.m
diff --git a/Sources/Sentry/include/SentryInternalDefines.h b/Sources/Sentry/include/SentryInternalDefines.h

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#import "SentryWatchdogTerminationBreadcrumbProcessor.h"`
`2`	`2`	`#import "SentryFileManager.h"`
	`3`	`+#import "SentryInternalDefines.h"`
`3`	`4`	`#import "SentryLogC.h"`
`4`	`5`	`#import "SentrySerialization.h"`
`5`	`6`
`@@ -44,7 +45,7 @@ - (void)addSerializedBreadcrumb:(NSDictionary *)crumb`
`44`	`45`	`SENTRY_LOG_ERROR(@"Error serializing breadcrumb to JSON");`
`45`	`46`	`return;`
`46`	`47`	`}`
`47`		`- [self storeBreadcrumb:jsonData];`
	`48`	`+ [self storeBreadcrumb:SENTRY_UNWRAP_NULLABLE(NSData, jsonData)];`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`- (void)clear`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#import "SentryDefaultObjCRuntimeWrapper.h"`
`5`	`5`	`#import "SentryDependencyContainer.h"`
`6`	`6`	`#import "SentryInAppLogic.h"`
	`7`	`+#import "SentryInternalDefines.h"`
`7`	`8`	`#import "SentryLogC.h"`
`8`	`9`	`#import "SentrySDK+Private.h"`
`9`	`10`	`#import "SentrySwift.h"`
`@@ -176,7 +177,7 @@ - (NSInteger)indexOfImage:(uint64_t)address`
`176`	`177`	`- (NSArray<SentryBinaryImageInfo > )getAllBinaryImages`
`177`	`178`	`{`
`178`	`179`	`@synchronized(self) {`
`179`		`- return _cache.copy;`
	`180`	`+ return SENTRY_UNWRAP_NULLABLE(NSArray<SentryBinaryImageInfo *>, _cache.copy);`
`180`	`181`	`}`
`181`	`182`	`}`
`182`	`183`
Original file line number	Diff line number	Diff line change
`@@ -316,12 +316,14 @@ + (NSDictionary )fetchInfoAboutViewController:(UIViewController )controller`
`316`	`316`
`317`	`317`	`if (controller.presentingViewController != nil) {`
`318`	`318`	`info[@"presentingViewController"] =`
`319`		`- [SwiftDescriptor getViewControllerClassName:controller.presentingViewController];`
	`319`	`+ [SwiftDescriptor getViewControllerClassName:SENTRY_UNWRAP_NULLABLE(UIViewController,`
	`320`	`+ controller.presentingViewController)];`
`320`	`321`	`}`
`321`	`322`
`322`	`323`	`if (controller.parentViewController != nil) {`
`323`	`324`	`info[@"parentViewController"] =`
`324`		`- [SwiftDescriptor getViewControllerClassName:controller.parentViewController];`
	`325`	`+ [SwiftDescriptor getViewControllerClassName:SENTRY_UNWRAP_NULLABLE(UIViewController,`
	`326`	`+ controller.parentViewController)];`
`325`	`327`	`}`
`326`	`328`
`327`	`329`	`if (controller.view.window != nil) {`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,8 @@ - (NSString )descriptionFromRequest:(NSFetchRequest )request`
`204`	`204`
`205`	`205`	`if (request.predicate) {`
`206`	`206`	`[result appendFormat:@" WHERE %@",`
`207`		`- [predicateDescriptor predicateDescription:request.predicate]];`
	`207`	`+ [predicateDescriptor`
	`208`	`+ predicateDescription:SENTRY_UNWRAP_NULLABLE(NSPredicate, request.predicate)]];`
`208`	`209`	`}`
`209`	`210`
`210`	`211`	`if (request.sortDescriptors.count > 0) {`