Update RCTAppDelegate imports

expo · Jun 19, 2023 · 34014f6 · 34014f6
1 parent 2d37fd7
commit 34014f6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/apps/fabric-tester/ios/Podfile.lock b/apps/fabric-tester/ios/Podfile.lock
@@ -217,9 +217,9 @@ PODS:
   - FBLazyVector (0.72.0-rc.6)
   - fmt (6.2.1)
   - glog (0.3.5)
-  - hermes-engine (0.72.0-rc.5):
-    - hermes-engine/Pre-built (= 0.72.0-rc.5)
-  - hermes-engine/Pre-built (0.72.0-rc.5)
+  - hermes-engine (0.72.0-rc.6):
+    - hermes-engine/Pre-built (= 0.72.0-rc.6)
+  - hermes-engine/Pre-built (0.72.0-rc.6)
   - libaom (3.0.0):
     - libvmaf (>= 2.2.0)
   - libavif (0.11.1):
@@ -1480,7 +1480,7 @@ SPEC CHECKSUMS:
   FBLazyVector: b327077cb8fb7b15c901db6748abc4f971c1c9cc
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  hermes-engine: d7bcb29c5d42379f36b62f2e45cebb0728df0ec4
+  hermes-engine: b7b46b6fedb0d8befdb394e1b0e109b87db39687
   libaom: 144606b1da4b5915a1054383c3a4459ccdb3c661
   libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913

diff --git a/packages/expo-dev-launcher/ios/EXDevLauncherBridgeDelegate.mm b/packages/expo-dev-launcher/ios/EXDevLauncherBridgeDelegate.mm
@@ -2,7 +2,12 @@
 #import "EXDevLauncherController.h"
 
 #import <React/RCTBundleURLProvider.h>
+#if __has_include(<React_RCTAppDelegate/RCTAppSetupUtils.h>)
+// for importing the header from framework, the dash will be transformed to underscore
+#import <React_RCTAppDelegate/RCTAppSetupUtils.h>
+#else
 #import <React-RCTAppDelegate/RCTAppSetupUtils.h>
+#endif
 
 #ifdef RCT_NEW_ARCH_ENABLED
 

diff --git a/packages/expo-dev-menu/ios/DevClientAppDelegate.mm b/packages/expo-dev-menu/ios/DevClientAppDelegate.mm
@@ -3,7 +3,12 @@
 
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRuntimeExecutorFromBridge.h>
+#if __has_include(<React_RCTAppDelegate/RCTAppSetupUtils.h>)
+// for importing the header from framework, the dash will be transformed to underscore
+#import <React_RCTAppDelegate/RCTAppSetupUtils.h>
+#else
 #import <React-RCTAppDelegate/RCTAppSetupUtils.h>
+#endif
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <memory>

diff --git a/packages/expo-dev-menu/ios/DevMenuRCTBridge.mm b/packages/expo-dev-menu/ios/DevMenuRCTBridge.mm
@@ -28,7 +28,12 @@
 #import <React/RCTCxxBridgeDelegate.h>
 #import <React/RCTJSIExecutorRuntimeInstaller.h>
 #import <React/RCTRuntimeExecutorFromBridge.h>
+#if __has_include(<React_RCTAppDelegate/RCTAppSetupUtils.h>)
+// for importing the header from framework, the dash will be transformed to underscore
+#import <React_RCTAppDelegate/RCTAppSetupUtils.h>
+#else
 #import <React-RCTAppDelegate/RCTAppSetupUtils.h>
+#endif
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #if __has_include(<reacthermes/HermesExecutorFactory.h>)
 #import <reacthermes/HermesExecutorFactory.h>