fix conflict

Sources/Sentry/Public/SentryOptions.h

@@ -414,7 +414,6 @@ NS_SWIFT_NAME(Options)
  */
 @property (nonatomic, retain) NSArray *tracePropagationTargets;
 
-
 /**
  * When enabled, the SDK captures HTTP Client errors. Default value is NO.
  */

Sources/Sentry/SentryEvent.m

@@ -2,7 +2,6 @@
 #import "NSDate+SentryExtras.h"
 #import "NSDictionary+SentrySanitize.h"
 #import "SentryBreadcrumb.h"
-#import "SentryRequest.h"
 #import "SentryClient.h"
 #import "SentryCurrentDate.h"
 #import "SentryDebugMeta.h"
@@ -11,6 +10,7 @@
 #import "SentryLevelMapper.h"
 #import "SentryMessage.h"
 #import "SentryMeta.h"
+#import "SentryRequest.h"
 #import "SentryStacktrace.h"
 #import "SentryThread.h"
 #import "SentryUser.h"
@@ -158,7 +158,7 @@ - (void)addSimpleProperties:(NSMutableDictionary *)serializedData
                               forKey:@"start_timestamp"];
         }
     }
-    
+
     if (nil != self.request) {
         [serializedData setValue:[self.request serialize] forKey:@"request"];
     }

Sources/Sentry/SentryNetworkTracker.m

@@ -1,19 +1,19 @@
 #import "SentryNetworkTracker.h"
 #import "SentryBaggage.h"
 #import "SentryBreadcrumb.h"
+#import "SentryClient+Private.h"
 #import "SentryEvent.h"
 #import "SentryException.h"
-#import "SentryMechanism.h"
-#import "SentryRequest.h"
-#import "SentryStacktrace.h"
-#import "SentryThread.h"
 #import "SentryHub+Private.h"
-#import "SentryClient+Private.h"
-#import "SentryThreadInspector.h"
 #import "SentryLog.h"
+#import "SentryMechanism.h"
+#import "SentryRequest.h"
 #import "SentrySDK+Private.h"
 #import "SentryScope+Private.h"
 #import "SentrySerialization.h"
+#import "SentryStacktrace.h"
+#import "SentryThread.h"
+#import "SentryThreadInspector.h"
 #import "SentryTraceContext.h"
 #import "SentryTraceHeader.h"
 #import "SentryTracer.h"
@@ -224,7 +224,8 @@ - (void)urlSessionTaskResume:(NSURLSessionTask *)sessionTask
 
 - (void)urlSessionTask:(NSURLSessionTask *)sessionTask setState:(NSURLSessionTaskState)newState
 {
-    if (!self.isNetworkTrackingEnabled && !self.isNetworkBreadcrumbEnabled && !self.isCaptureFailedRequests) {
+    if (!self.isNetworkTrackingEnabled && !self.isNetworkBreadcrumbEnabled
+        && !self.isCaptureFailedRequests) {
         return;
     }
 
@@ -258,7 +259,7 @@ - (void)urlSessionTask:(NSURLSessionTask *)sessionTask setState:(NSURLSessionTas
 
     if (sessionTask.state == NSURLSessionTaskStateRunning) {
         [self captureEvent:sessionTask];
-        
+
         [self addBreadcrumbForSessionTask:sessionTask];
 
         NSInteger responseStatusCode = [self urlResponseStatusCode:sessionTask.response];
@@ -288,30 +289,29 @@ - (void)urlSessionTask:(NSURLSessionTask *)sessionTask setState:(NSURLSessionTas
 - (void)captureEvent:(NSURLSessionTask *)sessionTask
 {
     NSInteger responseStatusCode = [self urlResponseStatusCode:sessionTask.response];
-    
+
     // TODO: check the string contains and regex
     if (!self.isCaptureFailedRequests) {
         return;
     }
-    
+
     // TODO: check the range
     if (responseStatusCode == 201) {
         return;
     }
-    
-    NSString *message = [NSString stringWithFormat:@"HTTP Client Error with status code: %li",
-                                  (long)(responseStatusCode)];
+
+    NSString *message = [NSString
+        stringWithFormat:@"HTTP Client Error with status code: %li", (long)(responseStatusCode)];
 
     SentryEvent *event = [[SentryEvent alloc] initWithLevel:kSentryLevelError];
-    
+
     SentryThreadInspector *threadInspector = SentrySDK.currentHub.getClient.threadInspector;
     NSArray<SentryThread *> *threads = [threadInspector getCurrentThreadsWithStackTrace];
-    
+
     SentryException *sentryException = [[SentryException alloc] initWithValue:message
                                                                          type:@"HTTP-ClientError"];
     sentryException.mechanism = [[SentryMechanism alloc] initWithType:@"SentryNetworkTrackingIntegration"];
 
-
     if (threads.count > 0) {
         SentryStacktrace *sentryStacktrace = [threads[0] stacktrace];
         sentryStacktrace.snapshot = @(YES);
@@ -321,14 +321,14 @@ - (void)captureEvent:(NSURLSessionTask *)sessionTask
         //    [threads enumerateObjectsUsingBlock:^(SentryThread *_Nonnull obj, NSUInteger idx,
         //        BOOL *_Nonnull stop) { obj.current = [NSNumber numberWithBool:idx == 0]; }];
     }
-    
+
     SentryRequest *request = [[SentryRequest alloc] init];
 
     NSURLRequest *myRequest = (NSURLRequest *)sessionTask.currentRequest;
 
     NSURL *url = [[sessionTask currentRequest] URL];
     request.url = url.absoluteString;
-    
+
     request.fragment = url.fragment;
     request.queryString = url.query;
     request.method = myRequest.HTTPMethod;
@@ -343,7 +343,7 @@ - (void)captureEvent:(NSURLSessionTask *)sessionTask
 
     event.exceptions = @[ sentryException ];
     event.request = request;
-    
+
     NSHTTPURLResponse *myResponse = (NSHTTPURLResponse *)sessionTask.response;
 
     NSMutableDictionary<NSString *, id> *context = [[NSMutableDictionary alloc] init];;

Sources/Sentry/SentryNetworkTrackingIntegration.m

@@ -24,12 +24,13 @@ - (BOOL)installWithOptions:(SentryOptions *)options
     if (options.enableNetworkBreadcrumbs) {
         [SentryNetworkTracker.sharedInstance enableNetworkBreadcrumbs];
     }
-    
+
     if (options.enableCaptureFailedRequests) {
         [SentryNetworkTracker.sharedInstance enableCaptureFailedRequests];
     }
 
-    if (shouldEnableNetworkTracking || options.enableNetworkBreadcrumbs || options.enableCaptureFailedRequests) {
+    if (shouldEnableNetworkTracking || options.enableNetworkBreadcrumbs
+        || options.enableCaptureFailedRequests) {
         [SentryNetworkTrackingIntegration swizzleURLSessionTask];
         return YES;
     } else {

Sources/Sentry/SentryOptions.m

@@ -270,7 +270,7 @@ - (BOOL)validateOptions:(NSDictionary<NSString *, id> *)options
 
     [self setBool:options[@"enableAutoPerformanceTracking"]
             block:^(BOOL value) { self->_enableAutoPerformanceTracking = value; }];
-    
+
     [self setBool:options[@"enableCaptureFailedRequests"]
             block:^(BOOL value) { self->_enableCaptureFailedRequests = value; }];
 

Sources/Sentry/SentryRequest.h

@@ -19,8 +19,8 @@ NS_SWIFT_NAME(Request)
 @property (atomic, copy) NSString *_Nullable cookies;
 
 /**
-* Optional: A dictionary of submitted headers.
-*/
+ * Optional: A dictionary of submitted headers.
+ */
 @property (nonatomic, strong) NSDictionary<NSString *, NSString *> *_Nullable headers;
 
 /**

Sources/Sentry/SentryStacktrace.m

@@ -56,7 +56,7 @@ - (void)fixDuplicateFrames
         [serializedData setValue:self.registers forKey:@"registers"];
     }
     [serializedData setValue:self.snapshot forKey:@"snapshot"];
-    
+
     return serializedData;
 }