Use install_modules_dependencies (#5334)

piaskowyk · tomekzaw · Aleksandra Cynk · commit 558cce724e9c · 2023-11-24T16:20:30.000+01:00
## Summary Based on the changes in our libraries mentioned in this PR (software-mansion/react-native-gesture-handler#2635), we need to make adjustments to our `.podspec` file. We should utilize the `install_modules_dependencies` feature available in React Native since version 0.72. Backward compatibility: <img width="126" alt="image" src="https://github.com/software-mansion/react-native-reanimated/assets/36106620/ce5c1c67-8251-47d6-8d4b-98c959a4dfb8"> ## Test plan Check CI --------- Co-authored-by: Tomek Zawadzki <tomasz.zawadzki@swmansion.com>
diff --git a/Example/ios/Podfile.lock b/Example/ios/Podfile.lock
@@ -505,34 +505,9 @@ PODS:
   - RNGestureHandler (2.13.2):
     - React-Core
   - RNReanimated (3.5.0):
-    - DoubleConversion
-    - FBLazyVector
-    - glog
-    - hermes-engine
-    - RCT-Folly
-    - RCTRequired
-    - RCTTypeSafety
-    - React-callinvoker
+    - RCT-Folly (= 2021.07.22.00)
     - React-Core
-    - React-Core/DevSupport
-    - React-Core/RCTWebSocket
-    - React-CoreModules
-    - React-cxxreact
-    - React-hermes
-    - React-jsi
-    - React-jsiexecutor
-    - React-jsinspector
-    - React-RCTActionSheet
-    - React-RCTAnimation
-    - React-RCTAppDelegate
-    - React-RCTBlob
-    - React-RCTImage
-    - React-RCTLinking
-    - React-RCTNetwork
-    - React-RCTSettings
-    - React-RCTText
     - ReactCommon/turbomodule/core
-    - Yoga
   - RNScreens (3.25.0):
     - React-Core
     - React-RCTImage
@@ -798,7 +773,7 @@ SPEC CHECKSUMS:
   RNCMaskedView: f7c74478c83c4fdfc5cf4df51f80c0dd5cf125c6
   RNCPicker: 529d564911e93598cc399b56cc0769ce3675f8c8
   RNGestureHandler: bb86e378287f7713baf3ca205423eb8109790022
-  RNReanimated: 7032c33fc6caf259b4872375342b72183c688fc3
+  RNReanimated: d6138334fbdf0b4ba9a740db9b8caa06c20f38ed
   RNScreens: 85d3880b52d34db7b8eeebe2f1a0e807c05e69fa
   RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
@@ -807,4 +782,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: f37cea0ea1b6dc523fb88a9c2bdb9993f4b567ce
 
-COCOAPODS: 1.14.0
+COCOAPODS: 1.14.2
diff --git a/FabricExample/ios/Podfile.lock b/FabricExample/ios/Podfile.lock
@@ -1153,33 +1153,19 @@ PODS:
     - React-RCTFabric
     - ReactCommon/turbomodule/core
   - RNReanimated (3.5.0):
-    - DoubleConversion
-    - FBLazyVector
-    - glog
     - hermes-engine
-    - RCT-Folly
+    - RCT-Folly (= 2021.07.22.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-callinvoker
     - React-Codegen
     - React-Core
-    - React-Core/DevSupport
-    - React-Core/RCTWebSocket
-    - React-CoreModules
-    - React-cxxreact
-    - React-hermes
-    - React-jsi
-    - React-jsiexecutor
-    - React-jsinspector
-    - React-RCTActionSheet
-    - React-RCTAnimation
-    - React-RCTBlob
+    - React-debug
+    - React-Fabric
+    - React-graphics
+    - React-NativeModulesApple
     - React-RCTFabric
-    - React-RCTImage
-    - React-RCTLinking
-    - React-RCTNetwork
-    - React-RCTSettings
-    - React-RCTText
+    - React-utils
+    - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - RNScreens (3.25.0):
@@ -1487,7 +1473,7 @@ SPEC CHECKSUMS:
   React-perflogger: e3596db7e753f51766bceadc061936ef1472edc3
   React-RCTActionSheet: 17ab132c748b4471012abbcdcf5befe860660485
   React-RCTAnimation: c8bbaab62be5817d2a31c36d5f2571e3f7dcf099
-  React-RCTAppDelegate: d43ecd62e3ff9a8d09eab3a05ce786d160786dfe
+  React-RCTAppDelegate: 7a68d7f49d93f4899acde16ff5050854602a6ca2
   React-RCTBlob: 1bcf3a0341eb8d6950009b1ddb8aefaf46996b8c
   React-RCTFabric: 2d72175df6e0e230a13ec2a7eef184ac0a122fd3
   React-RCTImage: 670a3486b532292649b1aef3ffddd0b495a5cee4
@@ -1505,7 +1491,7 @@ SPEC CHECKSUMS:
   RNCMaskedView: f7c74478c83c4fdfc5cf4df51f80c0dd5cf125c6
   RNCPicker: 529d564911e93598cc399b56cc0769ce3675f8c8
   RNGestureHandler: 039162c42c65de1228c58eb48be90c279bfde3f1
-  RNReanimated: 87385a5102be3fed4b2ffd4d78ed8b49cb1350cb
+  RNReanimated: 4b82c89a58f66169352b947403f45b2142e7595b
   RNScreens: cba72a26a6c967765a8388fe85f78e7771012ca1
   RNSVG: df9aaada196f6a61c8e30dc55d41e6c108a954e7
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
@@ -1514,4 +1500,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 200355ebe627c91121916eeac614c78c24ec30b7
 
-COCOAPODS: 1.14.0
+COCOAPODS: 1.14.2
diff --git a/RNReanimated.podspec b/RNReanimated.podspec
@@ -2,22 +2,66 @@ require "json"
 require_relative './scripts/reanimated_utils'
 
 reanimated_package_json = JSON.parse(File.read(File.join(__dir__, "package.json")))
-config = find_config()
-assert_latest_react_native_with_new_architecture(config, reanimated_package_json)
-assert_minimal_react_native_version(config)
+$config = find_config()
+assert_latest_react_native_with_new_architecture($config, reanimated_package_json)
+assert_minimal_react_native_version($config)
 
-fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+$new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 is_release = ENV['PRODUCTION'] == '1'
-using_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1'
 
-folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DREACT_NATIVE_MINOR_VERSION=' + config[:react_native_minor_version].to_s
+folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DREACT_NATIVE_MINOR_VERSION=' + $config[:react_native_minor_version].to_s
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
 boost_compiler_flags = '-Wno-documentation'
-fabric_flags = fabric_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''
-example_flag = config[:is_reanimated_example_app] ? '-DIS_REANIMATED_EXAMPLE_APP' : ''
+fabric_flags = $new_arch_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''
+example_flag = $config[:is_reanimated_example_app] ? '-DIS_REANIMATED_EXAMPLE_APP' : ''
 version_flag = '-DREANIMATED_VERSION=' + reanimated_package_json["version"]
 debug_flag = is_release ? '-DNDEBUG' : ''
-ios_min_version = config[:react_native_minor_version] >= 73 ? '10.0' : '9.0'
+ios_min_version = $config[:react_native_minor_version] >= 73 ? '13.4' : '9.0'
+
+def self.install_modules_dependencies_legacy(s)
+  using_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1'
+  s.dependency "React-Core"
+  if $new_arch_enabled
+    s.dependency "React-RCTFabric"
+    s.dependency "React-Codegen"
+  end
+  s.dependency "RCT-Folly"
+  s.dependency "RCTRequired"
+  s.dependency "RCTTypeSafety"
+  s.dependency 'FBLazyVector'
+  if $config[:react_native_minor_version] <= 71
+    s.dependency 'FBReactNativeSpec'
+  end
+  s.dependency 'React-Core'
+  s.dependency 'React-CoreModules'
+  s.dependency 'React-Core/DevSupport'
+  if !$config[:is_tvos_target]
+    s.dependency 'React-RCTActionSheet'
+  end
+  s.dependency 'React-RCTNetwork'
+  s.dependency 'React-RCTAnimation'
+  s.dependency 'React-RCTLinking'
+  s.dependency 'React-RCTBlob'
+  s.dependency 'React-RCTSettings'
+  s.dependency 'React-RCTText'
+  s.dependency 'React-RCTImage'
+  s.dependency 'React-Core/RCTWebSocket'
+  s.dependency 'React-cxxreact'
+  s.dependency 'React-jsi'
+  s.dependency 'React-jsiexecutor'
+  s.dependency 'React-jsinspector'
+  s.dependency 'Yoga'
+  s.dependency 'DoubleConversion'
+  s.dependency 'glog'
+  if using_hermes && !$config[:is_tvos_target] && $config[:react_native_minor_version] >= 70
+    s.dependency 'React-hermes'
+    s.dependency 'hermes-engine'
+  end
+  s.dependency 'React-callinvoker'
+  if $config[:react_native_minor_version] >= 72 && !$new_arch_enabled
+    s.dependency 'React-RCTAppDelegate'
+  end
+end
 
 Pod::Spec.new do |s|
   
@@ -29,7 +73,6 @@ Pod::Spec.new do |s|
                    DESC
   s.homepage     = "https://github.com/software-mansion/react-native-reanimated"
   s.license      = "MIT"
-  # s.license    = { :type => "MIT", :file => "FILE_LICENSE" }
   s.author       = { "author" => "author@domain.cn" }
   s.platforms    = { :ios => ios_min_version, :tvos => "9.0", :osx => "10.14" }
   s.source       = { :git => "https://github.com/software-mansion/react-native-reanimated.git", :tag => "#{s.version}" }
@@ -53,53 +96,14 @@ Pod::Spec.new do |s|
   }
   s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + ' -DHERMES_ENABLE_DEBUGGER'
   s.xcconfig = {
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Public/React-hermes\" \"$(PODS_ROOT)/Headers/Public/hermes-engine\" \"$(PODS_ROOT)/#{config[:react_native_common_dir]}\"",
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Public/React-hermes\" \"$(PODS_ROOT)/Headers/Public/hermes-engine\" \"$(PODS_ROOT)/#{$config[:react_native_common_dir]}\"",
     "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + fabric_flags + " " + example_flag + " " + version_flag + " " + debug_flag
   }
-
   s.requires_arc = true
-
-  s.dependency "React-Core"
-  if fabric_enabled
-    s.dependency "React-RCTFabric"
-    s.dependency "React-Codegen"
-  end
-  s.dependency "RCT-Folly"
-  s.dependency "RCTRequired"
-  s.dependency "RCTTypeSafety"
   s.dependency "ReactCommon/turbomodule/core"
-  s.dependency 'FBLazyVector'
-  if config[:react_native_minor_version] <= 71
-    s.dependency 'FBReactNativeSpec'
-  end
-  s.dependency 'React-Core'
-  s.dependency 'React-CoreModules'
-  s.dependency 'React-Core/DevSupport'
-  if !config[:is_tvos_target]
-    s.dependency 'React-RCTActionSheet'
-  end
-  s.dependency 'React-RCTNetwork'
-  s.dependency 'React-RCTAnimation'
-  s.dependency 'React-RCTLinking'
-  s.dependency 'React-RCTBlob'
-  s.dependency 'React-RCTSettings'
-  s.dependency 'React-RCTText'
-  s.dependency 'React-RCTImage'
-  s.dependency 'React-Core/RCTWebSocket'
-  s.dependency 'React-cxxreact'
-  s.dependency 'React-jsi'
-  s.dependency 'React-jsiexecutor'
-  s.dependency 'React-jsinspector'
-  s.dependency 'Yoga'
-  s.dependency 'DoubleConversion'
-  s.dependency 'glog'
-  if using_hermes && !config[:is_tvos_target] && config[:react_native_minor_version] >= 70
-    s.dependency 'React-hermes'
-    s.dependency 'hermes-engine'
-  end
-  s.dependency 'React-callinvoker'
-
-  if config[:react_native_minor_version] >= 72 && !fabric_enabled
-    s.dependency 'React-RCTAppDelegate'
+  if defined?(install_modules_dependencies()) != nil
+    install_modules_dependencies(s)
+  else
+    install_modules_dependencies_legacy(s)
   end
 end
