Merge 617eea4 into 0b5fd21

Author: philprime

.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

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

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);
     }
 }
 

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

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) {

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) {

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];
     }

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 {

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];
         }
     }

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 =