Skip to content

Commit 7c94898

Browse files
Riccardo Cipolleschifacebook-github-bot
authored andcommitted
Fix podspec setup for 3rd parties when using dynamic linking (#37275)
Summary: Pull Request resolved: #37275 When enabling `USE_FRAMEWORKS=dynamic`, we need to explicitly defines all the dependencies used by the pods. This change add those missing dependencies. ## Changelog: [iOS][Added] - Add explicit dependencies for 3rd parties libraries Differential Revision: https://internalfb.com/D45523646 fbshipit-source-id: 93ca83e3edb95b16aba82e145014cb6b6b91f759
1 parent ab1411b commit 7c94898

File tree

5 files changed

+26
-2
lines changed

5 files changed

+26
-2
lines changed

packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,19 @@ Pod::Spec.new do |s|
7676
s.dependency "RCTRequired"
7777
s.dependency "RCTTypeSafety"
7878
s.dependency "ReactCommon/turbomodule/core"
79+
s.dependency "React-RCTNetwork"
80+
s.dependency "React-RCTImage"
81+
s.dependency "React-NativeModulesApple"
82+
s.dependency "React-CoreModules"
83+
84+
if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1"
85+
s.dependency "React-hermes"
86+
else
87+
s.dependency "React-jsc"
88+
end
7989

8090
if is_new_arch_enabled
91+
s.dependency "React-Fabric"
8192
s.dependency "React-RCTFabric"
8293
s.dependency "React-graphics"
8394

packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,13 +544,15 @@ def get_podspec_no_fabric_no_script
544544
[
545545
"\"$(PODS_ROOT)/boost\"",
546546
"\"$(PODS_ROOT)/RCT-Folly\"",
547+
"\"$(PODS_ROOT)/DoubleConversion\"",
547548
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
548549
"\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
549550
"\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
550551
"\"$(PODS_ROOT)/Headers/Private/Yoga\"",
551552
].join(' ')
552553
},
553554
'dependencies': {
555+
"DoubleConversion": [],
554556
"FBReactNativeSpec": [],
555557
"RCT-Folly": [],
556558
"RCTRequired": [],
@@ -563,7 +565,7 @@ def get_podspec_no_fabric_no_script
563565
"ReactCommon/turbomodule/core": [],
564566
"hermes-engine": [],
565567
"React-NativeModulesApple": [],
566-
"glog": []
568+
"glog": [],
567569
}
568570
}
569571
end

packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,17 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths
137137
[
138138
{ :dependency_name => "React-Core" },
139139
{ :dependency_name => "RCT-Folly", "version"=>"2021.07.22.00" },
140+
{ :dependency_name => "glog" },
140141
{ :dependency_name => "React-RCTFabric" },
141142
{ :dependency_name => "React-Codegen" },
142143
{ :dependency_name => "RCTRequired" },
143144
{ :dependency_name => "RCTTypeSafety" },
144145
{ :dependency_name => "ReactCommon/turbomodule/bridging" },
145146
{ :dependency_name => "ReactCommon/turbomodule/core" },
146147
{ :dependency_name => "React-NativeModulesApple" },
148+
{ :dependency_name => "Yoga" },
149+
{ :dependency_name => "React-Fabric" },
150+
{ :dependency_name => "React-graphics" },
147151
{ :dependency_name => "hermes-engine" }
148152
])
149153
end
@@ -169,6 +173,7 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler
169173
[
170174
{ :dependency_name => "React-Core" },
171175
{ :dependency_name => "RCT-Folly", "version"=>"2021.07.22.00" },
176+
{ :dependency_name => "glog" }
172177
]
173178
)
174179
end

packages/react-native/scripts/cocoapods/codegen_utils.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
8080
header_search_paths = [
8181
"\"$(PODS_ROOT)/boost\"",
8282
"\"$(PODS_ROOT)/RCT-Folly\"",
83+
"\"$(PODS_ROOT)/DoubleConversion\"",
8384
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
8485
"\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
8586
"\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
@@ -129,8 +130,9 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
129130
"React-jsi": [],
130131
"ReactCommon/turbomodule/bridging": [],
131132
"ReactCommon/turbomodule/core": [],
132-
"React-NativeModulesApple": [],
133+
"React-NativeModulesApple": [],
133134
"glog": [],
135+
"DoubleConversion": [],
134136
}
135137
}
136138

packages/react-native/scripts/cocoapods/new_architecture.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
108108

109109
spec.dependency "React-Core"
110110
spec.dependency "RCT-Folly", '2021.07.22.00'
111+
spec.dependency "glog"
111112

112113
if new_arch_enabled
113114
current_config["OTHER_CPLUSPLUSFLAGS"] = @@new_arch_cpp_flags
@@ -119,6 +120,9 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
119120
spec.dependency "ReactCommon/turbomodule/bridging"
120121
spec.dependency "ReactCommon/turbomodule/core"
121122
spec.dependency "React-NativeModulesApple"
123+
spec.dependency "Yoga"
124+
spec.dependency "React-Fabric"
125+
spec.dependency "React-graphics"
122126

123127
if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
124128
spec.dependency "hermes-engine"

0 commit comments

Comments
 (0)