Skip to content

Commit

Permalink
Re-orgnize BridgelessApple files to keep proper header file include s…
Browse files Browse the repository at this point in the history
…tructure (#38322)

Summary:
Pull Request resolved: #38322

As title, so that we can keep the format
```#import <ReactCommon/RCTHost.h>```

Differential Revision: D47421732

fbshipit-source-id: b2ecb73da36d5769cad76dc3a33f4d3511648d10
  • Loading branch information
Lulu Wu authored and facebook-github-bot committed Jul 13, 2023
1 parent 93fbcae commit 101363e
Show file tree
Hide file tree
Showing 21 changed files with 15 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
Expand All @@ -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
Expand All @@ -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" }
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
#import <react/utils/ContextContainer.h>
#import <react/utils/ManagedObjectWrapper.h>

#import "../NativeViewConfig/RCTLegacyUIManagerConstantsProvider.h"
#import "ObjCTimerRegistry.h"
#import "RCTJSThreadManager.h"
#import "RCTLegacyUIManagerConstantsProvider.h"
#import "RCTPerformanceLoggerUtils.h"

#if RCT_DEV_MENU && __has_include(<React/RCTDevLoadingViewProtocol.h>)
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/scripts/cocoapods/bridgeless.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 101363e

Please sign in to comment.