fix(ios): Fix non UIKit builds (#3784)

getsentry · May 6, 2024 · 95f17dc · 95f17dc
1 parent 9ea1c36
commit 95f17dc
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Fix Apple non UIKit builds ([#3784](https://github.com/getsentry/sentry-react-native/pull/3784))
+
 ## 5.22.1
 
 ### Dependencies

diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
@@ -36,8 +36,11 @@
 
 #import "RNSentryEvents.h"
 #import "RNSentryDependencyContainer.h"
-#import "RNSentryFramesTrackerListener.h"
+
+#if SENTRY_HAS_UIKIT
 #import "RNSentryRNSScreen.h"
+#import "RNSentryFramesTrackerListener.h"
+#endif
 
 @interface SentryTraceContext : NSObject
 - (nullable instancetype)initWithDict:(NSDictionary<NSString *, id> *)dictionary;
@@ -192,6 +195,7 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
 RCT_EXPORT_METHOD(initNativeReactNavigationNewFrameTracking:(RCTPromiseResolveBlock)resolve
                                                    rejecter:(RCTPromiseRejectBlock)reject)
 {
+#if SENTRY_HAS_UIKIT
     if ([[NSThread currentThread] isMainThread]) {
         [RNSentryRNSScreen swizzleViewDidAppear];
     } else {
@@ -201,16 +205,20 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
     }
 
     [self initFramesTracking];
+#endif
     resolve(nil);
 }
 
 - (void)initFramesTracking {
+#if SENTRY_HAS_UIKIT
+
   RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) {
     if (self->hasListeners) {
       [self sendEventWithName:RNSentryNewFrameEvent body:@{ @"newFrameTimestampInSeconds": newFrameTimestampInSeconds }];
     }
   };
   [[RNSentryDependencyContainer sharedInstance] initializeFramesTrackerListenerWith: emitNewFrameEvent];
+#endif
 }
 
 // Will be called when this module's first listener is added.
@@ -370,7 +378,7 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd
 RCT_EXPORT_METHOD(fetchNativeAppStart:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-
+#if SENTRY_HAS_UIKIT
     SentryAppStartMeasurement *appStartMeasurement = PrivateSentrySDKOnly.appStartMeasurement;
 
     if (appStartMeasurement == nil) {
@@ -389,6 +397,9 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd
     // This is always set to true, as we would only allow an app start fetch to only happen once
     // in the case of a JS bundle reload, we do not want it to be instrumented again.
     didFetchAppStart = true;
+#else
+    resolve(nil);
+#endif
 }
 
 RCT_EXPORT_METHOD(fetchNativeFrames:(RCTPromiseResolveBlock)resolve

diff --git a/ios/RNSentryDependencyContainer.h b/ios/RNSentryDependencyContainer.h
@@ -7,9 +7,12 @@ SENTRY_NO_INIT
 
 @property (class, readonly, strong) RNSentryDependencyContainer* sharedInstance;
 
+#if SENTRY_HAS_UIKIT
+
 @property (nonatomic, strong) RNSentryFramesTrackerListener *framesTrackerListener;
 
 - (void)initializeFramesTrackerListenerWith:(RNSentryEmitNewFrameEvent) eventEmitter;
 
-@end
+#endif
 
+@end
diff --git a/ios/RNSentryDependencyContainer.m b/ios/RNSentryDependencyContainer.m
@@ -21,6 +21,8 @@ - (instancetype)init
     return self;
 }
 
+#if SENTRY_HAS_UIKIT
+
 - (void)initializeFramesTrackerListenerWith:(RNSentryEmitNewFrameEvent)eventEmitter
 {
   @synchronized(sentryDependencyContainerLock) {
@@ -29,4 +31,6 @@ - (void)initializeFramesTrackerListenerWith:(RNSentryEmitNewFrameEvent)eventEmit
   }
 }
 
+#endif
+
 @end
diff --git a/ios/RNSentryFramesTrackerListener.h b/ios/RNSentryFramesTrackerListener.h
@@ -1,3 +1,7 @@
+#import <Sentry/SentryDefines.h>
+
+#if SENTRY_HAS_UIKIT
+
 #import <Foundation/Foundation.h>
 #import <React/RCTEventEmitter.h>
 #import <Sentry/SentryFramesTracker.h>
@@ -15,3 +19,5 @@ typedef void (^RNSentryEmitNewFrameEvent)(NSNumber *newFrameTimestampInSeconds);
 @property (strong, nonatomic) RNSentryEmitNewFrameEvent emitNewFrameEvent;
 
 @end
+
+#endif
diff --git a/ios/RNSentryFramesTrackerListener.m b/ios/RNSentryFramesTrackerListener.m
@@ -1,5 +1,7 @@
 #import "RNSentryFramesTrackerListener.h"
 
+#if SENTRY_HAS_UIKIT
+
 @implementation RNSentryFramesTrackerListener
 
 - (instancetype)initWithSentryFramesTracker:(SentryFramesTracker *)framesTracker
@@ -28,3 +30,5 @@ - (void)startListening {
 }
 
 @end
+
+#endif
diff --git a/ios/RNSentryOnDrawReporter.m b/ios/RNSentryOnDrawReporter.m
@@ -1,3 +1,5 @@
+#if SENTRY_HAS_UIKIT
+
 #import <UIKit/UIKit.h>
 #import <React/RCTViewManager.h>
 #import "RNSentryFramesTrackerListener.h"
@@ -68,3 +70,5 @@ - (void)didSetProps:(NSArray<NSString *> *)changedProps
 }
 
 @end
+
+#endif
diff --git a/ios/RNSentryRNSScreen.h b/ios/RNSentryRNSScreen.h
@@ -1,7 +1,13 @@
+#import <Sentry/SentryDefines.h>
+
+#if SENTRY_HAS_UIKIT
+
 #import <Foundation/Foundation.h>
 
 @interface RNSentryRNSScreen : NSObject
 
 + (void)swizzleViewDidAppear;
 
 @end
+
+#endif
diff --git a/ios/RNSentryRNSScreen.m b/ios/RNSentryRNSScreen.m
@@ -1,8 +1,11 @@
+#import "RNSentryRNSScreen.h"
+
+#if SENTRY_HAS_UIKIT
+
 #import <Sentry/SentryFramesTracker.h>
 #import <Sentry/SentryDependencyContainer.h>
 #import <Sentry/SentrySwizzle.h>
 
-#import "RNSentryRNSScreen.h"
 #import "RNSentryDependencyContainer.h"
 
 @implementation RNSentryRNSScreen
@@ -24,3 +27,5 @@ + (void)swizzleViewDidAppear {
 }
 
 @end
+
+#endif