diff --git a/apps/fabric-example/ios/Podfile.lock b/apps/fabric-example/ios/Podfile.lock index 32370f1ae65..f16d4c6cca0 100644 --- a/apps/fabric-example/ios/Podfile.lock +++ b/apps/fabric-example/ios/Podfile.lock @@ -2229,7 +2229,7 @@ SPEC CHECKSUMS: RNCPicker: d051e0647af8b2ad01a3d39a6b5dd9b7c0ccc166 RNFlashList: 6f169ad83e52579b7754cbbcec1b004c27d82c93 RNGestureHandler: c374c750a0a9bacd95f5c740d146ab9428549d6b - RNReanimated: 3eda8373a520a38427b68054026b5a8d40d42cfe + RNReanimated: 648a88c56c6881c93255e0eab431859b346e0b42 RNScreens: de6e57426ba0e6cbc3fb5b4f496e7f08cb2773c2 RNSVG: 08750404f92a36162a92522cc77dee437be1d257 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 diff --git a/apps/macos-example/macos/Podfile.lock b/apps/macos-example/macos/Podfile.lock index 8243fcb9c89..11e64ba7301 100644 --- a/apps/macos-example/macos/Podfile.lock +++ b/apps/macos-example/macos/Podfile.lock @@ -1270,7 +1270,7 @@ SPEC CHECKSUMS: RNCAsyncStorage: ec53e44dc3e75b44aa2a9f37618a49c3bc080a7a RNCPicker: 0173dedc74776227ec6dcc61bb85cd9f07bbb2ac RNGestureHandler: bb81850add626ddd265294323310fec6e861c96b - RNReanimated: 857daa16ccc117c0491ad6950c9579cb436295df + RNReanimated: 8e5c163219a6444172d851df401a1e86721635f0 RNSVG: 01eb8d8a0e2289ec3ecc9626ce920e00d2174992 SocketRocket: f6c6249082c011e6de2de60ed641ef8bbe0cfac9 Yoga: 329461de6a23b9e0c108d197fd0f6e87c8c8ecf2 diff --git a/apps/paper-example/ios/Podfile.lock b/apps/paper-example/ios/Podfile.lock index 9ad745bfb43..8e14f6af20c 100644 --- a/apps/paper-example/ios/Podfile.lock +++ b/apps/paper-example/ios/Podfile.lock @@ -2019,7 +2019,7 @@ SPEC CHECKSUMS: RNCPicker: 0173dedc74776227ec6dcc61bb85cd9f07bbb2ac RNFlashList: 115dd44377580761bff386a0caebf165424cf16f RNGestureHandler: 6dfe7692a191ee224748964127114edf057a1475 - RNReanimated: 3ffdf9d59cc891c4cbd29b5182ed845aea6ec187 + RNReanimated: ac6bc4e337cfc694308e094f1d73487c21832bc8 RNScreens: 19719a9c326e925498ac3b2d35c4e50fe87afc06 RNSVG: 01eb8d8a0e2289ec3ecc9626ce920e00d2174992 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 diff --git a/apps/tvos-example/ios/Podfile.lock b/apps/tvos-example/ios/Podfile.lock index 8a81c020a14..936805d7167 100644 --- a/apps/tvos-example/ios/Podfile.lock +++ b/apps/tvos-example/ios/Podfile.lock @@ -1267,7 +1267,7 @@ SPEC CHECKSUMS: React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8 React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74 ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2 - RNReanimated: fe28ce0f9e7a41852e6b0e0b5ac557236ae39db9 + RNReanimated: 0552e8e7058dfe736c41ce163c0cd66eaf0ca906 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: e7f2a2256464d4ef7b3825d216bd22aac3b449c1 diff --git a/packages/react-native-reanimated/RNReanimated.podspec b/packages/react-native-reanimated/RNReanimated.podspec index 57bf6ea1eea..dbc74033361 100644 --- a/packages/react-native-reanimated/RNReanimated.podspec +++ b/packages/react-native-reanimated/RNReanimated.podspec @@ -116,7 +116,17 @@ Pod::Spec.new do |s| } s.compiler_flags = "#{folly_compiler_flags} #{boost_compiler_flags}" 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]}\"", + "\"$(PODS_ROOT)/#{$config[:react_native_reanimated_dir_from_pods_root]}/apple\"", + "\"$(PODS_ROOT)/#{$config[:react_native_reanimated_dir_from_pods_root]}/Common/cpp\"", + ].join(' '), "OTHER_CFLAGS" => "$(inherited) #{folly_flags} #{fabric_flags} #{example_flag} #{version_flag} #{debug_flag} #{compilation_metadata_generation_flag}" } s.requires_arc = true diff --git a/packages/react-native-reanimated/scripts/reanimated_utils.rb b/packages/react-native-reanimated/scripts/reanimated_utils.rb index 580dba05da8..9fc7b15b617 100644 --- a/packages/react-native-reanimated/scripts/reanimated_utils.rb +++ b/packages/react-native-reanimated/scripts/reanimated_utils.rb @@ -14,6 +14,7 @@ def find_config() :is_tvos_target => nil, :react_native_node_modules_dir => nil, :react_native_common_dir => nil, + :react_native_reanimated_dir_from_pods_root => nil, } react_native_node_modules_dir = File.join(File.dirname(`cd "#{Pod::Config.instance.installation_root.to_s}" && node --print "require.resolve('react-native/package.json')"`), '..') @@ -43,6 +44,10 @@ def find_config() react_native_common_dir_relative = Pathname.new(react_native_common_dir_absolute).relative_path_from(pods_root).to_s result[:react_native_common_dir] = react_native_common_dir_relative + react_native_reanimated_dir_absolute = File.join(__dir__, '..') + react_native_reanimated_dir_relative = Pathname.new(react_native_reanimated_dir_absolute).relative_path_from(pods_root).to_s + result[:react_native_reanimated_dir_from_pods_root] = react_native_reanimated_dir_relative + return result end