Re-orgnize BridgelessApple files to keep proper header file include s…

…tructure (#38322) Summary: Pull Request resolved: #38322 As title, so that we can keep the format ```#import <ReactCommon/RCTHost.h>``` Changelog: [iOS][Changed] - ] Re-orgnize BridgelessApple files to keep proper header file include structure Reviewed By: cipolleschi, dmytrorykun Differential Revision: D47421732 fbshipit-source-id: af14807d20676e8732c66fa7f792580819c33f33
facebook · Jul 24, 2023 · 736dd5a · 736dd5a
1 parent 3965158
commit 736dd5a
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 6 deletions.
diff --git a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec
@@ -47,6 +47,8 @@ header_search_paths = [
   "$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
   "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
   "$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
+  "$(PODS_CONFIGURATION_BUILD_DIR)/React-BridgelessApple/React_BridgelessApple.framework/Headers",
+  "$(PODS_CONFIGURATION_BUILD_DIR)/React-BridgelessCore/React_BridgelessCore.framework/Headers",
   "$(PODS_CONFIGURATION_BUILD_DIR)/React-RCTFabric/RCTFabric.framework/Headers/",
   "$(PODS_CONFIGURATION_BUILD_DIR)/React-utils/React_utils.framework/Headers/",
   "$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers/",

diff --git a/.../bridgeless/React-BridgelessApple.podspec → ...latform/ios/React-BridgelessApple.podspec b/.../bridgeless/React-BridgelessApple.podspec → ...latform/ios/React-BridgelessApple.podspec
@@ -5,7 +5,7 @@
 
 require "json"
 
-package = JSON.parse(File.read(File.join(__dir__, "../../..", "package.json")))
+package = JSON.parse(File.read(File.join(__dir__, "../../../../..", "package.json")))
 version = package['version']
 
 source = { :git => 'https://github.com/facebook/react-native.git' }
@@ -21,6 +21,12 @@ folly_version = '2021.07.22.00'
 folly_dep_name = 'RCT-Folly/Fabric'
 boost_compiler_flags = '-Wno-documentation'
 
+header_search_paths = [
+  "$(PODS_ROOT)/boost",
+  "$(PODS_TARGET_SRCROOT)/../../../..",
+  "$(PODS_TARGET_SRCROOT)/../../../../..",
+]
+
 Pod::Spec.new do |s|
   s.name                   = "React-BridgelessApple"
   s.version                = version
@@ -30,9 +36,9 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => min_ios_version_supported }
   s.source                 = source
-  s.source_files           = "platform/ios/**/*.{mm,h}"
+  s.source_files           = "ReactCommon/*.{mm,h}"
   s.header_dir             = "ReactCommon"
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/../..\" \"$(PODS_TARGET_SRCROOT)/../../..\"",
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => header_search_paths,
                                 "USE_HEADERMAP" => "YES",
                                 "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
                                 "GCC_WARN_PEDANTIC" => "YES" }
@@ -61,9 +67,9 @@ Pod::Spec.new do |s|
   if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
     s.dependency "hermes-engine"
     s.dependency "React-BridgelessHermes"
-    s.exclude_files = "platform/ios/JSC/*.{mm,h}"
+    s.exclude_files = "ReactCommon/RCTJscInstance.{mm,h}"
   else
     s.dependency "React-jsc"
-    s.exclude_files = "platform/ios/hermes/*.{mm,h}"
+    s.exclude_files = "ReactCommon/RCTHermesInstance.{mm,h}"
   end
 end
diff --git a/...ess/platform/ios/Core/ObjCTimerRegistry.h → ...tform/ios/ReactCommon/ObjCTimerRegistry.h b/...ess/platform/ios/Core/ObjCTimerRegistry.h → ...tform/ios/ReactCommon/ObjCTimerRegistry.h
diff --git a/...ss/platform/ios/Core/ObjCTimerRegistry.mm → ...form/ios/ReactCommon/ObjCTimerRegistry.mm b/...ss/platform/ios/Core/ObjCTimerRegistry.mm → ...form/ios/ReactCommon/ObjCTimerRegistry.mm
diff --git a/...rm/ios/Core/RCTContextContainerHandling.h → ...ReactCommon/RCTContextContainerHandling.h b/...rm/ios/Core/RCTContextContainerHandling.h → ...ReactCommon/RCTContextContainerHandling.h
diff --git a/...s/platform/ios/Hermes/RCTHermesInstance.h → ...tform/ios/ReactCommon/RCTHermesInstance.h b/...s/platform/ios/Hermes/RCTHermesInstance.h → ...tform/ios/ReactCommon/RCTHermesInstance.h
diff --git a/.../platform/ios/Hermes/RCTHermesInstance.mm → ...form/ios/ReactCommon/RCTHermesInstance.mm b/.../platform/ios/Hermes/RCTHermesInstance.mm → ...form/ios/ReactCommon/RCTHermesInstance.mm
diff --git a/...less/platform/ios/Core/RCTHost+Internal.h → ...atform/ios/ReactCommon/RCTHost+Internal.h b/...less/platform/ios/Core/RCTHost+Internal.h → ...atform/ios/ReactCommon/RCTHost+Internal.h
diff --git a/...ct/bridgeless/platform/ios/Core/RCTHost.h → ...geless/platform/ios/ReactCommon/RCTHost.h b/...ct/bridgeless/platform/ios/Core/RCTHost.h → ...geless/platform/ios/ReactCommon/RCTHost.h
diff --git a/...t/bridgeless/platform/ios/Core/RCTHost.mm → ...eless/platform/ios/ReactCommon/RCTHost.mm b/...t/bridgeless/platform/ios/Core/RCTHost.mm → ...eless/platform/ios/ReactCommon/RCTHost.mm
diff --git a/...ridgeless/platform/ios/Core/RCTInstance.h → ...ss/platform/ios/ReactCommon/RCTInstance.h b/...ridgeless/platform/ios/Core/RCTInstance.h → ...ss/platform/ios/ReactCommon/RCTInstance.h
diff --git a/...idgeless/platform/ios/Core/RCTInstance.mm → ...s/platform/ios/ReactCommon/RCTInstance.mm b/...idgeless/platform/ios/Core/RCTInstance.mm → ...s/platform/ios/ReactCommon/RCTInstance.mm
@@ -38,6 +38,7 @@
 
 #import "ObjCTimerRegistry.h"
 #import "RCTJSThreadManager.h"
+#import "RCTLegacyUIManagerConstantsProvider.h"
 #import "RCTPerformanceLoggerUtils.h"
 
 #if RCT_DEV_MENU && __has_include(<React/RCTDevLoadingViewProtocol.h>)

diff --git a/...ss/platform/ios/Core/RCTJSThreadManager.h → ...form/ios/ReactCommon/RCTJSThreadManager.h b/...ss/platform/ios/Core/RCTJSThreadManager.h → ...form/ios/ReactCommon/RCTJSThreadManager.h
diff --git a/...s/platform/ios/Core/RCTJSThreadManager.mm → ...orm/ios/ReactCommon/RCTJSThreadManager.mm b/...s/platform/ios/Core/RCTJSThreadManager.mm → ...orm/ios/ReactCommon/RCTJSThreadManager.mm
diff --git a/...dgeless/platform/ios/JSC/RCTJscInstance.h → ...platform/ios/ReactCommon/RCTJscInstance.h b/...dgeless/platform/ios/JSC/RCTJscInstance.h → ...platform/ios/ReactCommon/RCTJscInstance.h
diff --git a/...geless/platform/ios/JSC/RCTJscInstance.mm → ...latform/ios/ReactCommon/RCTJscInstance.mm b/...geless/platform/ios/JSC/RCTJscInstance.mm → ...latform/ios/ReactCommon/RCTJscInstance.mm
diff --git a/...fig/RCTLegacyUIManagerConstantsProvider.h → ...mon/RCTLegacyUIManagerConstantsProvider.h b/...fig/RCTLegacyUIManagerConstantsProvider.h → ...mon/RCTLegacyUIManagerConstantsProvider.h
diff --git a/...ig/RCTLegacyUIManagerConstantsProvider.mm → ...on/RCTLegacyUIManagerConstantsProvider.mm b/...ig/RCTLegacyUIManagerConstantsProvider.mm → ...on/RCTLegacyUIManagerConstantsProvider.mm
diff --git a/...form/ios/Core/RCTPerformanceLoggerUtils.h → ...s/ReactCommon/RCTPerformanceLoggerUtils.h b/...form/ios/Core/RCTPerformanceLoggerUtils.h → ...s/ReactCommon/RCTPerformanceLoggerUtils.h
diff --git a/...orm/ios/Core/RCTPerformanceLoggerUtils.mm → .../ReactCommon/RCTPerformanceLoggerUtils.mm b/...orm/ios/Core/RCTPerformanceLoggerUtils.mm → .../ReactCommon/RCTPerformanceLoggerUtils.mm
diff --git a/packages/react-native/scripts/cocoapods/bridgeless.rb b/packages/react-native/scripts/cocoapods/bridgeless.rb
@@ -11,7 +11,7 @@ def setup_bridgeless!(react_native_path: "../node_modules/react-native", use_her
     pod "React-jsitracing", :path => "#{react_native_path}/ReactCommon/hermes/executor/"
     pod "React-runtimescheduler", :path => "#{react_native_path}/ReactCommon/react/renderer/runtimescheduler"
     pod 'React-BridgelessCore', :path => "#{react_native_path}/ReactCommon/react/bridgeless"
-    pod 'React-BridgelessApple', :path => "#{react_native_path}/ReactCommon/react/bridgeless"
+    pod 'React-BridgelessApple', :path => "#{react_native_path}/ReactCommon/react/bridgeless/platform/ios"
     if use_hermes
         pod 'React-BridgelessHermes', :path => "#{react_native_path}/ReactCommon/react/bridgeless"
     end