Skip to content

[RN][iOS] Fix Dynamic framework build and resolve circular dependency for JSC #54421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cipolleschi wants to merge 1 commit into from
Closed

[RN][iOS] Fix Dynamic framework build and resolve circular dependency for JSC #54421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react-native/React/CoreModules/React-CoreModules.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ Pod::Spec.new do |s|
add_dependency(s, "React-RCTFBReactNativeSpec")
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
add_dependency(s, "React-NativeModulesApple")
add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])

add_rn_third_party_dependencies(s)
add_rncore_dependency(s)
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/React/Runtime/React-RCTRuntime.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Pod::Spec.new do |s|

add_dependency(s, "React-RuntimeCore")
add_dependency(s, "React-RuntimeApple")
add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])

if use_third_party_jsc()
s.exclude_files = ["RCTHermesInstanceFactory.{mm,h}", "RCTJscInstanceFactory.{mm,h}"]
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Pod::Spec.new do |s|
s.dependency "React-logger", version
s.dependency "React-debug", version
s.dependency "React-timing", version
add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])

s.resource_bundles = {'React-cxxreact_privacy' => 'PrivacyInfo.xcprivacy'}

Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Pod::Spec.new do |s|
add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])
if use_hermes()
s.dependency 'hermes-engine'
end
Expand Down
4 changes: 4 additions & 0 deletions ...ages/react-native/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ Pod::Spec.new do |s|
s.dependency "React-oscompat"
s.dependency "React-timing"

if use_hermes()
s.dependency "hermes-engine"
end

add_rn_third_party_dependencies(s)
add_rncore_dependency(s)
end
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/jsitooling/React-jsitooling.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Pod::Spec.new do |s|
add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])

add_rn_third_party_dependencies(s)
add_rncore_dependency(s)
Expand Down
4 changes: 3 additions & 1 deletion packages/react-native/ReactCommon/react/utils/React-utils.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ Pod::Spec.new do |s|

s.dependency "React-jsi", version

depend_on_js_engine(s)
if use_hermes()
s.dependency "hermes-engine"
end
add_rn_third_party_dependencies(s)
add_rncore_dependency(s)

Expand Down
Loading