[RN][iOS][0.76] Bump folly to fix xcode 16.3 removed traits

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

@@ -32,6 +32,7 @@ header_search_paths = [
   "$(PODS_ROOT)/Headers/Private/React-Core",
   "$(PODS_ROOT)/boost",
   "$(PODS_ROOT)/DoubleConversion",
+  "$(PODS_ROOT)/fast_float/include",
   "$(PODS_ROOT)/fmt/include",
   "$(PODS_ROOT)/RCT-Folly",
   "${PODS_ROOT}/Headers/Public/FlipperKit",

packages/react-native/Libraries/Blob/React-RCTBlob.podspec

@@ -24,6 +24,7 @@ header_search_paths = [
   "\"$(PODS_ROOT)/RCT-Folly\"",
   "\"$(PODS_ROOT)/boost\"",
   "\"$(PODS_ROOT)/DoubleConversion\"",
+  "\"$(PODS_ROOT)/fast_float/include\"",
   "\"$(PODS_ROOT)/fmt/include\"",
   "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"",
 ]
@@ -48,7 +49,8 @@ Pod::Spec.new do |s|
                              }
 
   s.dependency "DoubleConversion"
-  s.dependency "fmt", "9.1.0"
+  s.dependency "fast_float"
+  s.dependency "fmt"
   s.dependency "RCT-Folly", folly_version
   s.dependency "React-jsi"
   s.dependency "React-Core/RCTBlobHeaders"

packages/react-native/React-Core.podspec

@@ -21,7 +21,7 @@ folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
 
 socket_rocket_config = get_socket_rocket_config()
-socket_rocket_version = socket_rocket_config[:version] 
+socket_rocket_version = socket_rocket_config[:version]
 
 boost_compiler_flags = '-Wno-documentation'
 
@@ -49,6 +49,7 @@ header_search_paths = [
   "$(PODS_TARGET_SRCROOT)/ReactCommon",
   "$(PODS_ROOT)/boost",
   "$(PODS_ROOT)/DoubleConversion",
+  "$(PODS_ROOT)/fast_float/include",
   "$(PODS_ROOT)/fmt/include",
   "$(PODS_ROOT)/RCT-Folly",
   "${PODS_ROOT}/Headers/Public/FlipperKit",

packages/react-native/React/CoreModules/React-CoreModules.podspec

@@ -20,14 +20,12 @@ folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
 
-socket_rocket_config = get_socket_rocket_config()
-socket_rocket_version = socket_rocket_config[:version] 
-
 header_search_paths = [
   "\"$(PODS_ROOT)/boost\"",
   "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\"",
   "\"$(PODS_ROOT)/RCT-Folly\"",
   "\"$(PODS_ROOT)/DoubleConversion\"",
+  "\"$(PODS_ROOT)/fast_float/include\"",
   "\"$(PODS_ROOT)/fmt/include\"",
   "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"",
 ]
@@ -51,14 +49,15 @@ Pod::Spec.new do |s|
                              }
   s.framework = "UIKit"
   s.dependency "DoubleConversion"
-  s.dependency "fmt", "9.1.0"
-  s.dependency "RCT-Folly", folly_version
-  s.dependency "RCTTypeSafety", version
-  s.dependency "React-Core/CoreModulesHeaders", version
-  s.dependency "React-RCTImage", version
-  s.dependency "React-jsi", version
+  s.dependency "fast_float"
+  s.dependency "fmt"
+  s.dependency "RCT-Folly"
+  s.dependency "RCTTypeSafety"
+  s.dependency "React-Core/CoreModulesHeaders"
+  s.dependency "React-RCTImage"
+  s.dependency "React-jsi"
   s.dependency 'React-RCTBlob'
-  s.dependency "SocketRocket", socket_rocket_version
+  s.dependency "SocketRocket"
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
 
   add_dependency(s, "ReactCodegen")

packages/react-native/React/CxxModule/RCTCxxMethod.mm

@@ -98,14 +98,22 @@ - (id)invokeWithBridge:(RCTBridge *)bridge module:(id)module arguments:(NSArray
       NSNumber *id2 = arguments[arguments.count - 1];
 
       second = ^(std::vector<folly::dynamic> args) {
-        [bridge enqueueCallback:id2 args:convertFollyDynamicToId(folly::dynamic(args.begin(), args.end()))];
+        folly::dynamic obj = folly::dynamic::array;
+        for (auto &arg : args) {
+          obj.push_back(std::move(arg));
+        }
+        [bridge enqueueCallback:id2 args:convertFollyDynamicToId(std::move(obj))];
       };
     } else {
       id1 = arguments[arguments.count - 1];
     }
 
     first = ^(std::vector<folly::dynamic> args) {
-      [bridge enqueueCallback:id1 args:convertFollyDynamicToId(folly::dynamic(args.begin(), args.end()))];
+      folly::dynamic obj = folly::dynamic::array;
+      for (auto &arg : args) {
+        obj.push_back(std::move(arg));
+      }
+      [bridge enqueueCallback:id1 args:convertFollyDynamicToId(std::move(obj))];
     };
   }
 

packages/react-native/React/React-RCTFabric.podspec

@@ -26,6 +26,7 @@ header_search_paths = [
   "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
   "\"$(PODS_ROOT)/boost\"",
   "\"$(PODS_ROOT)/DoubleConversion\"",
+  "\"$(PODS_ROOT)/fast_float/include\"",
   "\"$(PODS_ROOT)/fmt/include\"",
   "\"$(PODS_ROOT)/RCT-Folly\"",
   "\"$(PODS_ROOT)/Headers/Private/React-Core\"",

packages/react-native/React/third-party.xcconfig

@@ -8,5 +8,5 @@
 // LICENSE file in the root directory of this source tree.
 //
 
-HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_83_0 $(SRCROOT)/../third-party/folly-2024.01.01.00 $(SRCROOT)/../third-party/glog-0.3.5/src
+HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_83_0 $(SRCROOT)/../third-party/folly-2024.10.14.00 $(SRCROOT)/../third-party/glog-0.3.5/src
 OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_CLOCK_GETTIME=1

packages/react-native/ReactAndroid/build.gradle.kts

@@ -66,6 +66,7 @@ val prefabHeadersDir = project.file("$buildDir/prefab-headers")
 // Native versions which are defined inside the version catalog (libs.versions.toml)
 val BOOST_VERSION = libs.versions.boost.get()
 val DOUBLE_CONVERSION_VERSION = libs.versions.doubleconversion.get()
+val FAST_FLOAT_VERSION = libs.versions.fastFloat.get()
 val FMT_VERSION = libs.versions.fmt.get()
 val FOLLY_VERSION = libs.versions.folly.get()
 val GLOG_VERSION = libs.versions.glog.get()
@@ -179,6 +180,7 @@ val preparePrefab by
                       // react_nativemodule_core
                       Pair(File(buildDir, "third-party-ndk/boost/boost_1_83_0/").absolutePath, ""),
                       Pair(File(buildDir, "third-party-ndk/double-conversion/").absolutePath, ""),
+                      Pair(File(buildDir, "third-party-ndk/fast_float/include/").absolutePath, ""),
                       Pair(File(buildDir, "third-party-ndk/fmt/include/").absolutePath, ""),
                       Pair(File(buildDir, "third-party-ndk/folly/").absolutePath, ""),
                       Pair(File(buildDir, "third-party-ndk/glog/exported/").absolutePath, ""),
@@ -304,6 +306,27 @@ val prepareFolly by
       includeEmptyDirs = false
       into("$thirdPartyNdkDir/folly")
     }
+val downloadFastFloat by
+    tasks.creating(Download::class) {
+      dependsOn(createNativeDepsDirectories)
+      src("https://github.com/fastfloat/fast_float/archive/v${FAST_FLOAT_VERSION}.tar.gz")
+      onlyIfModified(true)
+      overwrite(false)
+      retries(5)
+      quiet(true)
+      dest(File(downloadsDir, "fast_float-${FAST_FLOAT_VERSION}.tar.gz"))
+    }
+
+val prepareFastFloat by
+    tasks.registering(Copy::class) {
+      dependsOn(if (dependenciesPath != null) emptyList() else listOf(downloadFastFloat))
+      from(dependenciesPath ?: tarTree(downloadFastFloat.dest))
+      from("src/main/jni/third-party/fast_float/")
+      include("fast_float-${FAST_FLOAT_VERSION}/include/**/*", "CMakeLists.txt")
+      eachFile { this.path = this.path.removePrefix("fast_float-${FAST_FLOAT_VERSION}/") }
+      includeEmptyDirs = false
+      into("$thirdPartyNdkDir/fast_float")
+    }
 
 val downloadFmt by
     tasks.creating(Download::class) {
@@ -541,6 +564,7 @@ android {
           "generateCodegenArtifactsFromSchema",
           prepareBoost,
           prepareDoubleConversion,
+          prepareFastFloat,
           prepareFmt,
           prepareFolly,
           prepareGlog,

packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt

@@ -49,6 +49,7 @@ add_library(fbjni ALIAS fbjni::fbjni)
 add_react_third_party_ndk_subdir(glog)
 add_react_third_party_ndk_subdir(boost)
 add_react_third_party_ndk_subdir(double-conversion)
+add_react_third_party_ndk_subdir(fast_float)
 add_react_third_party_ndk_subdir(fmt)
 add_react_third_party_ndk_subdir(folly)
 add_react_third_party_ndk_subdir(jsc)

packages/react-native/ReactAndroid/src/main/jni/fast_float/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-std=c++20 -fexceptions)
+
+add_library(fast_float INTERFACE)
+
+target_include_directories(fast_float INTERFACE include)

packages/react-native/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt

@@ -51,8 +51,7 @@ SET(folly_runtime_SRC
         folly/synchronization/SanitizeThread.cpp
         folly/synchronization/ParkingLot.cpp
         folly/system/AtFork.cpp
-        folly/system/ThreadId.cpp
-        folly/system/ThreadName.cpp)
+        folly/system/ThreadId.cpp)
 
 add_library(folly_runtime STATIC ${folly_runtime_SRC})
 
@@ -67,4 +66,4 @@ target_compile_options(folly_runtime
 target_compile_options(folly_runtime PUBLIC ${folly_FLAGS})
 
 target_include_directories(folly_runtime PUBLIC .)
-target_link_libraries(folly_runtime glog double-conversion boost fmt)
+target_link_libraries(folly_runtime glog double-conversion boost fmt fast_float)

packages/react-native/ReactCommon/React-Fabric.podspec

@@ -53,7 +53,8 @@ Pod::Spec.new do |s|
   s.dependency "React-logger"
   s.dependency "glog"
   s.dependency "DoubleConversion"
-  s.dependency "fmt", "9.1.0"
+  s.dependency "fast_float"
+  s.dependency "fmt"
   s.dependency "React-Core"
   s.dependency "React-debug"
   s.dependency "React-featureflags"

packages/react-native/ReactCommon/React-FabricComponents.podspec

@@ -33,6 +33,7 @@ Pod::Spec.new do |s|
     "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
     "\"$(PODS_TARGET_SRCROOT)\"",
     "\"$(PODS_ROOT)/DoubleConversion\"",
+    "\"$(PODS_ROOT)/fast_float/include\"",
     "\"$(PODS_ROOT)/fmt/include\"",
   ]
 
@@ -74,7 +75,8 @@ Pod::Spec.new do |s|
   s.dependency "React-logger"
   s.dependency "glog"
   s.dependency "DoubleConversion"
-  s.dependency "fmt", "9.1.0"
+  s.dependency "fast_float"
+  s.dependency "fmt"
   s.dependency "React-Core"
   s.dependency "React-debug"
   s.dependency "React-featureflags"

packages/react-native/ReactCommon/React-FabricImage.podspec

@@ -30,6 +30,7 @@ header_search_path = [
   "\"$(PODS_ROOT)/RCT-Folly\"",
   "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
   "\"$(PODS_ROOT)/DoubleConversion\"",
+  "\"$(PODS_ROOT)/fast_float/include\"",
   "\"$(PODS_ROOT)/fmt/include\"",
 ]
 
@@ -65,16 +66,17 @@ Pod::Spec.new do |s|
     s.module_name             = 'React_FabricImage'
   end
 
-  s.dependency folly_dep_name, folly_version
+  s.dependency folly_dep_name
 
-  s.dependency "React-jsiexecutor", version
-  s.dependency "RCTRequired", version
-  s.dependency "RCTTypeSafety", version
+  s.dependency "React-jsiexecutor"
+  s.dependency "RCTRequired"
+  s.dependency "RCTTypeSafety"
   s.dependency "React-jsi"
   s.dependency "React-logger"
   s.dependency "glog"
   s.dependency "DoubleConversion"
-  s.dependency "fmt", "9.1.0"
+  s.dependency "fast_float"
+  s.dependency "fmt"
   s.dependency "React-ImageManager"
   s.dependency "React-utils"
   s.dependency "Yoga"

packages/react-native/ReactCommon/ReactCommon.podspec

@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.header_dir             = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
                                "USE_HEADERMAP" => "YES",
                                "DEFINES_MODULE" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
@@ -46,14 +46,15 @@ Pod::Spec.new do |s|
   # TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..."
   # Note: Update this only when ready to minimize breaking changes.
   s.subspec "turbomodule" do |ss|
-    ss.dependency "React-callinvoker", version
-    ss.dependency "React-perflogger", version
-    ss.dependency "React-cxxreact", version
-    ss.dependency "React-jsi", version
-    ss.dependency "RCT-Folly", folly_version
-    ss.dependency "React-logger", version
+    ss.dependency "React-callinvoker"
+    ss.dependency "React-perflogger"
+    ss.dependency "React-cxxreact"
+    ss.dependency "React-jsi"
+    ss.dependency "RCT-Folly"
+    ss.dependency "React-logger"
     ss.dependency "DoubleConversion"
-    ss.dependency "fmt", "9.1.0"
+    ss.dependency "fast_float"
+    ss.dependency "fmt"
     ss.dependency "glog"
     if using_hermes
       ss.dependency "hermes-engine"

packages/react-native/ReactCommon/cxxreact/CxxNativeModule.cpp

@@ -47,9 +47,12 @@ namespace {
 CxxModule::Callback convertCallback(
     std::function<void(folly::dynamic)> callback) {
   return [callback = std::move(callback)](std::vector<folly::dynamic> args) {
-    callback(folly::dynamic(
-        std::make_move_iterator(args.begin()),
-        std::make_move_iterator(args.end())));
+    // after unpinning folly, can use folly::dynamic::array_range
+    folly::dynamic obj = folly::dynamic::array;
+    for (auto& arg : args) {
+      obj.push_back(std::move(arg));
+    }
+    callback(std::move(obj));
   };
 }
 

packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -35,24 +35,25 @@ Pod::Spec.new do |s|
   s.exclude_files          = "SampleCxxModule.*"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.pod_target_xcconfig    = {
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers\"",
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers\"",
     "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
   }
   s.header_dir             = "cxxreact"
 
   s.dependency "boost"
   s.dependency "DoubleConversion"
-  s.dependency "fmt", "9.1.0"
-  s.dependency "RCT-Folly", folly_version
+  s.dependency "fast_float"
+  s.dependency "fmt"
+  s.dependency "RCT-Folly"
   s.dependency "glog"
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
-  s.dependency "React-callinvoker", version
-  s.dependency "React-runtimeexecutor", version
-  s.dependency "React-perflogger", version
-  s.dependency "React-jsi", version
-  s.dependency "React-logger", version
-  s.dependency "React-debug", version
-  s.dependency "React-timing", version
+  s.dependency "React-callinvoker"
+  s.dependency "React-runtimeexecutor"
+  s.dependency "React-perflogger"
+  s.dependency "React-jsi"
+  s.dependency "React-logger"
+  s.dependency "React-debug"
+  s.dependency "React-timing"
 
   s.resource_bundles = {'React-cxxreact_privacy' => 'PrivacyInfo.xcprivacy'}
 

packages/react-native/ReactCommon/hermes/React-hermes.podspec

@@ -36,17 +36,18 @@ Pod::Spec.new do |s|
   s.public_header_files    = "executor/HermesExecutorFactory.h"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.pod_target_xcconfig    = {
-                               "HEADER_SEARCH_PATHS" => "\"${PODS_ROOT}/hermes-engine/destroot/include\" \"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"",
+                               "HEADER_SEARCH_PATHS" => "\"${PODS_ROOT}/hermes-engine/destroot/include\" \"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\"",
                                "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
                              }
   s.header_dir             = "reacthermes"
-  s.dependency "React-cxxreact", version
-  s.dependency "React-jsiexecutor", version
+  s.dependency "React-cxxreact"
+  s.dependency "React-jsiexecutor"
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
-  s.dependency "React-perflogger", version
-  s.dependency "RCT-Folly", folly_version
+  s.dependency "React-perflogger"
+  s.dependency "RCT-Folly"
   s.dependency "DoubleConversion"
-  s.dependency "fmt", "9.1.0"
+  s.dependency "fast_float"
+  s.dependency "fmt"
   s.dependency "glog"
   s.dependency "hermes-engine"
   s.dependency "React-jsi"

packages/react-native/ReactCommon/jsi/React-jsi.podspec

@@ -37,13 +37,14 @@ Pod::Spec.new do |s|
 
   s.header_dir    = "jsi"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"",
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\"",
                                "DEFINES_MODULE" => "YES" }
 
   s.dependency "boost"
   s.dependency "DoubleConversion"
-  s.dependency "fmt", "9.1.0"
-  s.dependency "RCT-Folly", folly_version
+  s.dependency "fast_float"
+  s.dependency "fmt"
+  s.dependency "RCT-Folly"
   s.dependency "glog"
 
   s.source_files  = "**/*.{cpp,h}"