Skip to content

Commit c66eb63

Browse files
mikehardymikehardy
committed
fix(ios): use react-native podspec module infra for deps
the `install_modules_dependencies` method has existed since much longer than our lowest supported react-native version so should be safe to call the important thing it does is include the correct pods for modules that have been converted to TurboModules, and this fixes compile errors that do not show up on react-native 0.78 but do show up on current react-native
1 parent 578c157 commit c66eb63

File tree

17 files changed

+443
-71
lines changed

17 files changed

+443
-71
lines changed

‎packages/analytics/RNFBAnalytics.podspec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,15 @@ Pod::Spec.new do |s|
2929
s.tvos.deployment_target = firebase_tvos_target
3030
s.source_files = 'ios/**/*.{h,m}'
3131

32-
# React Native dependencies
33-
s.dependency 'React-Core'
3432
s.dependency 'RNFBApp'
3533

34+
# React Native dependencies
35+
if defined?(install_modules_dependencies()) != nil
36+
install_modules_dependencies(s);
37+
else
38+
s.dependency "React-Core"
39+
end
40+
3641
if defined?($FirebaseSDKVersion)
3742
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
3843
firebase_sdk_version = $FirebaseSDKVersion

‎packages/app-check/RNFBAppCheck.podspec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,15 @@ Pod::Spec.new do |s|
2929
s.tvos.deployment_target = firebase_tvos_target
3030
s.source_files = 'ios/**/*.{h,m}'
3131

32-
# React Native dependencies
33-
s.dependency 'React-Core'
3432
s.dependency 'RNFBApp'
3533

34+
# React Native dependencies
35+
if defined?(install_modules_dependencies()) != nil
36+
install_modules_dependencies(s);
37+
else
38+
s.dependency "React-Core"
39+
end
40+
3641
if defined?($FirebaseSDKVersion)
3742
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
3843
firebase_sdk_version = $FirebaseSDKVersion

‎packages/app-distribution/RNFBAppDistribution.podspec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,15 @@ Pod::Spec.new do |s|
2727
s.macos.deployment_target = firebase_macos_target
2828
s.source_files = 'ios/**/*.{h,m}'
2929

30-
# React Native dependencies
31-
s.dependency 'React-Core'
3230
s.dependency 'RNFBApp'
3331

32+
# React Native dependencies
33+
if defined?(install_modules_dependencies()) != nil
34+
install_modules_dependencies(s);
35+
else
36+
s.dependency "React-Core"
37+
end
38+
3439
if defined?($FirebaseSDKVersion)
3540
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
3641
firebase_sdk_version = $FirebaseSDKVersion

‎packages/app/RNFBApp.podspec‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ Pod::Spec.new do |s|
2525
s.source_files = "ios/**/*.{h,m}"
2626

2727
# React Native dependencies
28-
s.dependency 'React-Core'
28+
if defined?(install_modules_dependencies()) != nil
29+
install_modules_dependencies(s);
30+
else
31+
s.dependency "React-Core"
32+
end
2933

3034
if (ENV.include?('FIREBASE_SDK_VERSION'))
3135
Pod::UI.puts "#{s.name}: Found Firebase SDK version in environment '#{ENV['FIREBASE_SDK_VERSION']}'"

‎packages/auth/RNFBAuth.podspec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,15 @@ Pod::Spec.new do |s|
2929
s.tvos.deployment_target = firebase_tvos_target
3030
s.source_files = 'ios/**/*.{h,m}'
3131

32-
# React Native dependencies
33-
s.dependency 'React-Core'
3432
s.dependency 'RNFBApp'
3533

34+
# React Native dependencies
35+
if defined?(install_modules_dependencies()) != nil
36+
install_modules_dependencies(s);
37+
else
38+
s.dependency "React-Core"
39+
end
40+
3641
if defined?($FirebaseSDKVersion)
3742
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
3843
firebase_sdk_version = $FirebaseSDKVersion

‎packages/crashlytics/RNFBCrashlytics.podspec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,15 @@ Pod::Spec.new do |s|
3131
s.tvos.deployment_target = firebase_tvos_target
3232
s.source_files = 'ios/**/*.{h,m}'
3333

34-
# React Native dependencies
35-
s.dependency 'React-Core'
3634
s.dependency 'RNFBApp'
3735

36+
# React Native dependencies
37+
if defined?(install_modules_dependencies()) != nil
38+
install_modules_dependencies(s);
39+
else
40+
s.dependency "React-Core"
41+
end
42+
3843
if defined?($FirebaseSDKVersion)
3944
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
4045
firebase_sdk_version = $FirebaseSDKVersion

‎packages/database/RNFBDatabase.podspec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@ Pod::Spec.new do |s|
3030
s.tvos.deployment_target = firebase_tvos_target
3131
s.source_files = 'ios/**/*.{h,m}'
3232

33-
# React Native dependencies
34-
s.dependency 'React-Core'
3533
s.dependency 'RNFBApp'
3634

35+
# React Native dependencies
36+
if defined?(install_modules_dependencies()) != nil
37+
install_modules_dependencies(s);
38+
else
39+
s.dependency "React-Core"
40+
end
41+
3742
if defined?($FirebaseSDKVersion)
3843
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
3944
firebase_sdk_version = $FirebaseSDKVersion

‎packages/firestore/RNFBFirestore.podspec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,15 @@ Pod::Spec.new do |s|
2929
s.tvos.deployment_target = firebase_tvos_target
3030
s.source_files = 'ios/**/*.{h,m,mm}'
3131

32-
# React Native dependencies
33-
s.dependency 'React-Core'
3432
s.dependency 'RNFBApp'
3533

34+
# React Native dependencies
35+
if defined?(install_modules_dependencies()) != nil
36+
install_modules_dependencies(s);
37+
else
38+
s.dependency "React-Core"
39+
end
40+
3641
if defined?($FirebaseSDKVersion)
3742
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
3843
firebase_sdk_version = $FirebaseSDKVersion

‎packages/functions/RNFBFunctions.podspec‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,14 @@ Pod::Spec.new do |s|
3232
# Turbo modules require these compiler flags
3333
s.compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1'
3434

35-
# React Native dependencies
36-
s.dependency 'React-Core'
3735
s.dependency 'RNFBApp'
38-
# Turbo module code generated podspecs
39-
s.dependency 'ReactCodegen'
40-
s.dependency 'ReactAppDependencyProvider'
41-
# Turbo modules requires these dependencies
42-
s.dependency 'RCT-Folly'
43-
s.dependency 'React-Fabric'
36+
37+
# React Native dependencies
38+
if defined?(install_modules_dependencies()) != nil
39+
install_modules_dependencies(s);
40+
else
41+
s.dependency "React-Core"
42+
end
4443

4544
if defined?($FirebaseSDKVersion)
4645
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"

‎packages/in-app-messaging/RNFBInAppMessaging.podspec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@ Pod::Spec.new do |s|
3030
s.tvos.deployment_target = firebase_tvos_target
3131
s.source_files = 'ios/**/*.{h,m}'
3232

33-
# React Native dependencies
34-
s.dependency 'React-Core'
3533
s.dependency 'RNFBApp'
3634

35+
# React Native dependencies
36+
if defined?(install_modules_dependencies()) != nil
37+
install_modules_dependencies(s);
38+
else
39+
s.dependency "React-Core"
40+
end
41+
3742
if defined?($FirebaseSDKVersion)
3843
Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
3944
firebase_sdk_version = $FirebaseSDKVersion

0 commit comments

Comments
 (0)