From 28270c02f8f88d4624aba256e68b7bd8e7fb09d9 Mon Sep 17 00:00:00 2001
From: Tomek Zawadzki <tomasz.zawadzki@swmansion.com>
Date: Tue, 28 Jan 2025 16:45:16 +0100
Subject: [PATCH] Move `-DREACT_NATIVE_MINOR_VERSION` from `folly_flags` to
 `version_flags` in RNReanimated.podspec (#6948)

## Summary

This PR removes `folly_compiler_flags` in favor of `folly_flags` which
already contains `-Wno-comma -Wno-shorten-64-to-32` as well as moves
`-DREACT_NATIVE_MINOR_VERSION` flag from `folly_flags` to
`version_flags`.

## Test plan
---
 packages/react-native-reanimated/RNReanimated.podspec | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/react-native-reanimated/RNReanimated.podspec b/packages/react-native-reanimated/RNReanimated.podspec
index fa3ca5827ccb..03255d180b04 100644
--- a/packages/react-native-reanimated/RNReanimated.podspec
+++ b/packages/react-native-reanimated/RNReanimated.podspec
@@ -8,12 +8,11 @@ assert_minimal_react_native_version($config)
 $new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 is_release = ENV['PRODUCTION'] == '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]}"
-folly_compiler_flags = "#{folly_flags} -Wno-comma -Wno-shorten-64-to-32"
+folly_flags = "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32"
 boost_compiler_flags = '-Wno-documentation'
 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']}"
+version_flags = "-DREACT_NATIVE_MINOR_VERSION=#{$config[:react_native_minor_version]} -DREANIMATED_VERSION=#{reanimated_package_json['version']}"
 debug_flag = is_release ? '-DNDEBUG' : ''
 ios_min_version = '13.4'
 
@@ -125,7 +124,7 @@ Pod::Spec.new do |s|
     "GCC_PREPROCESSOR_DEFINITIONS[config=Debug]" => gcc_debug_definitions,
     "GCC_PREPROCESSOR_DEFINITIONS[config=Release]" => '$(inherited) NDEBUG=1',
   }
-  s.compiler_flags = "#{folly_compiler_flags} #{boost_compiler_flags}"
+  s.compiler_flags = "#{folly_flags} #{boost_compiler_flags}"
   s.xcconfig = {
     "HEADER_SEARCH_PATHS" => [
       '"$(PODS_ROOT)/boost"',
@@ -138,7 +137,7 @@ Pod::Spec.new do |s|
       "\"$(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}"
+    "OTHER_CFLAGS" => "$(inherited) #{folly_flags} #{fabric_flags} #{example_flag} #{version_flags} #{debug_flag} #{compilation_metadata_generation_flag}"
   }
   s.requires_arc = true
   s.dependency "ReactCommon/turbomodule/core"