mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
[RN][iOS][0.76] Bump folly to fix xcode 16.3 removed traits (#50431)
* Update Gemfile for Ruby > 3.2 * [RN]Bump folly to fix issue with Xcode 16.3
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -98,14 +98,22 @@ using namespace facebook::react;
|
||||
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))];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -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\"",
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
+2
-3
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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));
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -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'}
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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}"
|
||||
|
||||
@@ -32,16 +32,17 @@ Pod::Spec.new do |s|
|
||||
s.source = source
|
||||
s.source_files = "jsireact/*.{cpp,h}"
|
||||
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\"",
|
||||
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }
|
||||
s.header_dir = "jsireact"
|
||||
|
||||
s.dependency "React-cxxreact", version
|
||||
s.dependency "React-jsi", version
|
||||
s.dependency "React-perflogger", version
|
||||
s.dependency "RCT-Folly", folly_version
|
||||
s.dependency "React-cxxreact"
|
||||
s.dependency "React-jsi"
|
||||
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"
|
||||
add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
|
||||
s.header_dir = 'jsinspector-modern'
|
||||
s.compiler_flags = folly_compiler_flags
|
||||
s.pod_target_xcconfig = {
|
||||
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"",
|
||||
"HEADER_SEARCH_PATHS" => "\"$(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(),
|
||||
"DEFINES_MODULE" => "YES"
|
||||
}.merge!(use_frameworks ? {
|
||||
@@ -49,12 +49,12 @@ Pod::Spec.new do |s|
|
||||
end
|
||||
|
||||
s.dependency "glog"
|
||||
s.dependency "RCT-Folly", folly_version
|
||||
s.dependency "RCT-Folly"
|
||||
s.dependency "React-featureflags"
|
||||
s.dependency "DoubleConversion"
|
||||
s.dependency "React-runtimeexecutor", version
|
||||
s.dependency "React-runtimeexecutor"
|
||||
s.dependency "React-jsi"
|
||||
s.dependency "React-perflogger", version
|
||||
s.dependency "React-perflogger"
|
||||
if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
|
||||
s.dependency "hermes-engine"
|
||||
end
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
|
||||
s.platforms = min_supported_versions
|
||||
s.source = source
|
||||
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",
|
||||
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
|
||||
"GCC_WARN_PEDANTIC" => "YES" }
|
||||
|
||||
+3
-1
@@ -27,6 +27,7 @@ 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\"",
|
||||
]
|
||||
@@ -62,7 +63,8 @@ Pod::Spec.new do |s|
|
||||
|
||||
s.dependency "RCT-Folly"
|
||||
s.dependency "DoubleConversion"
|
||||
s.dependency "fmt", "9.1.0"
|
||||
s.dependency "fast_float"
|
||||
s.dependency "fmt"
|
||||
s.dependency "React-Core"
|
||||
s.dependency "React-cxxreact"
|
||||
s.dependency "React-jsi"
|
||||
|
||||
@@ -24,6 +24,7 @@ header_search_paths = [
|
||||
"\"$(PODS_ROOT)/RCT-Folly\"",
|
||||
"\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\"",
|
||||
"\"$(PODS_ROOT)/DoubleConversion\"",
|
||||
"\"$(PODS_ROOT)/fast_float/include\"",
|
||||
"\"$(PODS_ROOT)/fmt/include\""
|
||||
]
|
||||
|
||||
@@ -55,8 +56,9 @@ Pod::Spec.new do |s|
|
||||
s.header_mappings_dir = "../../.."
|
||||
end
|
||||
|
||||
s.dependency "RCT-Folly", folly_version
|
||||
s.dependency "RCT-Folly"
|
||||
s.dependency "DoubleConversion"
|
||||
s.dependency "fmt", "9.1.0"
|
||||
s.dependency "fast_float"
|
||||
s.dependency "fmt"
|
||||
add_dependency(s, "React-debug")
|
||||
end
|
||||
|
||||
@@ -29,6 +29,7 @@ Pod::Spec.new do |s|
|
||||
"\"$(PODS_TARGET_SRCROOT)/../../../\"",
|
||||
"\"$(PODS_ROOT)/RCT-Folly\"",
|
||||
"\"$(PODS_ROOT)/DoubleConversion\"",
|
||||
"\"$(PODS_ROOT)/fast_float/include\"",
|
||||
"\"$(PODS_ROOT)/fmt/include\""
|
||||
]
|
||||
|
||||
@@ -61,10 +62,11 @@ Pod::Spec.new do |s|
|
||||
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }
|
||||
|
||||
s.dependency "glog"
|
||||
s.dependency "RCT-Folly/Fabric", folly_version
|
||||
s.dependency "RCT-Folly/Fabric"
|
||||
s.dependency "React-jsi"
|
||||
s.dependency "React-jsiexecutor"
|
||||
s.dependency "React-utils"
|
||||
s.dependency "DoubleConversion"
|
||||
s.dependency "fmt", "9.1.0"
|
||||
s.dependency "fast_float"
|
||||
s.dependency "fmt"
|
||||
end
|
||||
|
||||
+1
@@ -27,6 +27,7 @@ Pod::Spec.new do |s|
|
||||
"\"$(PODS_TARGET_SRCROOT)\"",
|
||||
"\"$(PODS_ROOT)/RCT-Folly\"",
|
||||
"\"$(PODS_ROOT)/DoubleConversion\"",
|
||||
"\"$(PODS_ROOT)/fast_float/include\"",
|
||||
"\"$(PODS_ROOT)/fmt/include\"",
|
||||
].join(" ")
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@ header_search_paths = [
|
||||
"\"$(PODS_TARGET_SRCROOT)/..\"",
|
||||
"\"$(PODS_ROOT)/RCT-Folly\"",
|
||||
"\"$(PODS_ROOT)/DoubleConversion\"",
|
||||
"\"$(PODS_ROOT)/fast_float/include\"",
|
||||
"\"$(PODS_ROOT)/fmt/include\""
|
||||
]
|
||||
|
||||
|
||||
@@ -35,8 +35,9 @@ yoga-proguard-annotations = "1.19.0"
|
||||
# Native Dependencies
|
||||
boost="1_83_0"
|
||||
doubleconversion="1.1.6"
|
||||
fmt="9.1.0"
|
||||
folly="2024.01.01.00"
|
||||
fastFloat="6.1.4"
|
||||
fmt="11.0.2"
|
||||
folly="2024.10.14.00"
|
||||
glog="0.3.5"
|
||||
gtest="1.12.1"
|
||||
|
||||
|
||||
@@ -521,13 +521,12 @@ class CodegenUtilsTests < Test::Unit::TestCase
|
||||
"\"$(PODS_ROOT)/boost\"",
|
||||
"\"$(PODS_ROOT)/RCT-Folly\"",
|
||||
"\"$(PODS_ROOT)/DoubleConversion\"",
|
||||
"\"$(PODS_ROOT)/fast_float/include\"",
|
||||
"\"$(PODS_ROOT)/fmt/include\"",
|
||||
"\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"",
|
||||
"\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
|
||||
"\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
|
||||
"\"$(PODS_ROOT)/Headers/Private/Yoga\"",
|
||||
"\"$(PODS_ROOT)/DoubleConversion\"",
|
||||
"\"$(PODS_ROOT)/fmt/include\"",
|
||||
"\"$(PODS_TARGET_SRCROOT)\"",
|
||||
].join(' ')
|
||||
},
|
||||
|
||||
@@ -132,21 +132,21 @@ class NewArchitectureTests < Test::Unit::TestCase
|
||||
spec = SpecMock.new
|
||||
|
||||
# Act
|
||||
NewArchitectureHelper.install_modules_dependencies(spec, true, '2024.01.01.00')
|
||||
NewArchitectureHelper.install_modules_dependencies(spec, true, '2024.10.14.00')
|
||||
|
||||
# Assert
|
||||
folly_config = Helpers::Constants.folly_config
|
||||
folly_compiler_flags = folly_config[:compiler_flags]
|
||||
|
||||
assert_equal(spec.compiler_flags, "-DRCT_NEW_ARCH_ENABLED=1 #{NewArchitectureHelper.folly_compiler_flags}")
|
||||
assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-featureflags/React_featureflags.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-ImageManager/React_ImageManager.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-rendererdebug/React_rendererdebug.framework/Headers\"")
|
||||
assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-featureflags/React_featureflags.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-ImageManager/React_ImageManager.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-rendererdebug/React_rendererdebug.framework/Headers\"")
|
||||
assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++20")
|
||||
assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 "+ folly_compiler_flags)
|
||||
assert_equal(
|
||||
spec.dependencies,
|
||||
[
|
||||
{ :dependency_name => "React-Core" },
|
||||
{ :dependency_name => "RCT-Folly", "version"=>"2024.01.01.00" },
|
||||
{ :dependency_name => "RCT-Folly", "version"=>"2024.10.14.00" },
|
||||
{ :dependency_name => "glog" },
|
||||
{ :dependency_name => "React-RCTFabric" },
|
||||
{ :dependency_name => "ReactCodegen" },
|
||||
@@ -178,17 +178,17 @@ class NewArchitectureTests < Test::Unit::TestCase
|
||||
}
|
||||
|
||||
# Act
|
||||
NewArchitectureHelper.install_modules_dependencies(spec, false, '2024.01.01.00')
|
||||
NewArchitectureHelper.install_modules_dependencies(spec, false, '2024.10.14.00')
|
||||
|
||||
# Assert
|
||||
assert_equal(Helpers::Constants.folly_config[:compiler_flags], "#{NewArchitectureHelper.folly_compiler_flags}")
|
||||
assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-featureflags/React_featureflags.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-ImageManager/React_ImageManager.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-rendererdebug/React_rendererdebug.framework/Headers\"")
|
||||
assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-featureflags/React_featureflags.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-ImageManager/React_ImageManager.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-rendererdebug/React_rendererdebug.framework/Headers\"")
|
||||
assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++20")
|
||||
assert_equal(
|
||||
spec.dependencies,
|
||||
[
|
||||
{ :dependency_name => "React-Core" },
|
||||
{ :dependency_name => "RCT-Folly", "version"=>"2024.01.01.00" },
|
||||
{ :dependency_name => "RCT-Folly", "version"=>"2024.10.14.00" },
|
||||
{ :dependency_name => "glog" },
|
||||
{ :dependency_name => "React-RCTFabric" },
|
||||
{ :dependency_name => "ReactCodegen" },
|
||||
|
||||
@@ -814,7 +814,7 @@ class UtilsTests < Test::Unit::TestCase
|
||||
if pod_name == "SecondTarget"
|
||||
target_installation_result.native_target.build_configurations.each do |config|
|
||||
received_search_path = config.build_settings["HEADER_SEARCH_PATHS"]
|
||||
expected_Search_path = "$(inherited) \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCodegen/ReactCodegen.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/imagemanager/platform/ios\""
|
||||
expected_Search_path = "$(inherited) \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCodegen/ReactCodegen.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/imagemanager/platform/ios\""
|
||||
assert_equal(received_search_path, expected_Search_path)
|
||||
end
|
||||
else
|
||||
|
||||
@@ -80,13 +80,12 @@ class CodegenUtils
|
||||
"\"$(PODS_ROOT)/boost\"",
|
||||
"\"$(PODS_ROOT)/RCT-Folly\"",
|
||||
"\"$(PODS_ROOT)/DoubleConversion\"",
|
||||
"\"$(PODS_ROOT)/fast_float/include\"",
|
||||
"\"$(PODS_ROOT)/fmt/include\"",
|
||||
"\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"",
|
||||
"\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
|
||||
"\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
|
||||
"\"$(PODS_ROOT)/Headers/Private/Yoga\"",
|
||||
"\"$(PODS_ROOT)/DoubleConversion\"",
|
||||
"\"$(PODS_ROOT)/fmt/include\"",
|
||||
"\"$(PODS_TARGET_SRCROOT)\"",
|
||||
]
|
||||
framework_search_paths = []
|
||||
|
||||
@@ -46,11 +46,15 @@ module Helpers
|
||||
}
|
||||
|
||||
@@folly_config = {
|
||||
:version => '2024.01.01.00',
|
||||
:version => '2024.10.14.00',
|
||||
:git => 'https://github.com/facebook/folly.git',
|
||||
:compiler_flags => '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
}
|
||||
|
||||
@@fast_float_config = {
|
||||
:git => "https://github.com/fastfloat/fast_float.git",
|
||||
}
|
||||
|
||||
@@fmt_config = {
|
||||
:git => "https://github.com/fmtlib/fmt.git",
|
||||
}
|
||||
@@ -79,6 +83,14 @@ module Helpers
|
||||
@@folly_config.update(new_folly_config)
|
||||
end
|
||||
|
||||
def self.fast_float_config
|
||||
return @@fast_float_config
|
||||
end
|
||||
|
||||
def self.set_fast_float_config(new_fast_float_config)
|
||||
@@fast_float_config.update(new_fast_float_config)
|
||||
end
|
||||
|
||||
def self.boost_config
|
||||
return @@boost_config
|
||||
end
|
||||
|
||||
@@ -83,6 +83,7 @@ class NewArchitectureHelper
|
||||
header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
|
||||
if ENV['USE_FRAMEWORKS']
|
||||
header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
|
||||
header_search_paths << "\"$(PODS_ROOT)/fast_float/include\""
|
||||
header_search_paths << "\"$(PODS_ROOT)/fmt/include\""
|
||||
ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-graphics", "React_graphics", ["react/renderer/graphics/platform/ios"])
|
||||
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", ["react/renderer/components/view/platform/cxx"]))
|
||||
|
||||
@@ -564,6 +564,7 @@ class ReactNativePodsUtils
|
||||
ReactNativePodsUtils.update_header_paths_if_depends_on(target_installation_result, "RCT-Folly", [
|
||||
"\"$(PODS_ROOT)/RCT-Folly\"",
|
||||
"\"$(PODS_ROOT)/DoubleConversion\"",
|
||||
"\"$(PODS_ROOT)/fast_float/include\"",
|
||||
"\"$(PODS_ROOT)/fmt/include\"",
|
||||
"\"$(PODS_ROOT)/boost\""
|
||||
])
|
||||
@@ -639,6 +640,7 @@ class ReactNativePodsUtils
|
||||
"ReactCommon",
|
||||
"Yoga",
|
||||
"boost",
|
||||
"fast_float",
|
||||
"fmt",
|
||||
"glog",
|
||||
"hermes-engine",
|
||||
|
||||
@@ -156,6 +156,7 @@ def use_react_native! (
|
||||
pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
|
||||
pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec"
|
||||
pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
|
||||
pod 'fast_float', :podspec => "#{prefix}/third-party-podspecs/fast_float.podspec"
|
||||
pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec"
|
||||
pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
|
||||
|
||||
@@ -280,6 +281,13 @@ def get_glog_config()
|
||||
return Helpers::Constants.glog_config
|
||||
end
|
||||
|
||||
# This method returns an hash with the fast_float git url
|
||||
# that can be used to configure libraries.
|
||||
# @return an hash with the `:git` field.
|
||||
def get_fast_float_config()
|
||||
return Helpers::Constants.fast_float_config
|
||||
end
|
||||
|
||||
# This method returns an hash with the fmt git url
|
||||
# that can be used to configure libraries.
|
||||
# @return an hash with the `:git` field.
|
||||
@@ -319,6 +327,12 @@ def set_glog_config(glog_config)
|
||||
Helpers::Constants.set_glog_config(glog_config)
|
||||
end
|
||||
|
||||
# This method can be used to set the fast_float config
|
||||
# that can be used to configure libraries.
|
||||
def set_fast_float_config(fmt_config)
|
||||
Helpers::Constants.set_fast_float_config(fast_float_config)
|
||||
end
|
||||
|
||||
# This method can be used to set the fmt config
|
||||
# that can be used to configure libraries.
|
||||
def set_fmt_config(fmt_config)
|
||||
|
||||
@@ -23,7 +23,8 @@ Pod::Spec.new do |spec|
|
||||
spec.dependency 'boost'
|
||||
spec.dependency 'DoubleConversion'
|
||||
spec.dependency 'glog'
|
||||
spec.dependency "fmt", "9.1.0"
|
||||
spec.dependency "fast_float"
|
||||
spec.dependency "fmt"
|
||||
spec.compiler_flags = folly_compiler_flags + ' -DFOLLY_HAVE_PTHREAD=1 -Wno-documentation -faligned-new'
|
||||
spec.source_files = 'folly/String.cpp',
|
||||
'folly/Conv.cpp',
|
||||
@@ -34,18 +35,19 @@ Pod::Spec.new do |spec|
|
||||
'folly/lang/ToAscii.cpp',
|
||||
'folly/ScopeGuard.cpp',
|
||||
'folly/Unicode.cpp',
|
||||
'folly/dynamic.cpp',
|
||||
'folly/json.cpp',
|
||||
'folly/json_pointer.cpp',
|
||||
'folly/json/dynamic.cpp',
|
||||
'folly/json/json.cpp',
|
||||
'folly/json/json_pointer.cpp',
|
||||
'folly/container/detail/F14Table.cpp',
|
||||
'folly/detail/Demangle.cpp',
|
||||
'folly/detail/FileUtilDetail.cpp',
|
||||
'folly/detail/SplitStringSimd.cpp',
|
||||
'folly/detail/StaticSingletonManager.cpp',
|
||||
'folly/detail/UniqueInstance.cpp',
|
||||
'folly/hash/SpookyHashV2.cpp',
|
||||
'folly/lang/Assume.cpp',
|
||||
'folly/lang/CString.cpp',
|
||||
'folly/lang/Exception.cpp',
|
||||
'folly/memory/ReentrantAllocator.cpp',
|
||||
'folly/memory/detail/MallocImpl.cpp',
|
||||
'folly/net/NetOps.cpp',
|
||||
'folly/portability/SysUio.cpp',
|
||||
@@ -53,11 +55,15 @@ Pod::Spec.new do |spec|
|
||||
'folly/system/AtFork.cpp',
|
||||
'folly/system/ThreadId.cpp',
|
||||
'folly/*.h',
|
||||
'folly/algorithm/simd/*.h',
|
||||
'folly/algorithm/simd/detail/*.h',
|
||||
'folly/chrono/*.h',
|
||||
'folly/container/*.h',
|
||||
'folly/container/detail/*.h',
|
||||
'folly/detail/*.h',
|
||||
'folly/functional/*.h',
|
||||
'folly/hash/*.h',
|
||||
'folly/json/*.h',
|
||||
'folly/lang/*.h',
|
||||
'folly/memory/*.h',
|
||||
'folly/memory/detail/*.h',
|
||||
@@ -68,11 +74,15 @@ Pod::Spec.new do |spec|
|
||||
|
||||
# workaround for https://github.com/facebook/react-native/issues/14326
|
||||
spec.preserve_paths = 'folly/*.h',
|
||||
'folly/algorithm/simd/*.h',
|
||||
'folly/algorithm/simd/detail/*.h',
|
||||
'folly/chrono/*.h',
|
||||
'folly/container/*.h',
|
||||
'folly/container/detail/*.h',
|
||||
'folly/detail/*.h',
|
||||
'folly/functional/*.h',
|
||||
'folly/hash/*.h',
|
||||
'folly/json/*.h',
|
||||
'folly/lang/*.h',
|
||||
'folly/memory/*.h',
|
||||
'folly/memory/detail/*.h',
|
||||
@@ -84,7 +94,7 @@ Pod::Spec.new do |spec|
|
||||
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
|
||||
"DEFINES_MODULE" => "YES",
|
||||
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
|
||||
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"",
|
||||
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\"",
|
||||
# In dynamic framework (use_frameworks!) mode, ignore the unused and undefined boost symbols when generating the library.
|
||||
"OTHER_LDFLAGS" => "\"-Wl,-U,_jump_fcontext\" \"-Wl,-U,_make_fcontext\""
|
||||
}
|
||||
@@ -105,7 +115,6 @@ Pod::Spec.new do |spec|
|
||||
'folly/concurrency/CacheLocality.cpp',
|
||||
'folly/detail/Futex.cpp',
|
||||
'folly/synchronization/ParkingLot.cpp',
|
||||
'folly/portability/Malloc.cpp',
|
||||
'folly/concurrency/CacheLocality.h',
|
||||
'folly/synchronization/*.h',
|
||||
'folly/system/ThreadId.h'
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
# 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.
|
||||
|
||||
fast_float_config = get_fast_float_config()
|
||||
fast_float_git_url = fast_float_config[:git]
|
||||
|
||||
Pod::Spec.new do |spec|
|
||||
spec.name = "fast_float"
|
||||
spec.version = "6.1.4"
|
||||
spec.license = { :type => "MIT" }
|
||||
spec.homepage = "https://github.com/fastfloat/fast_float"
|
||||
spec.summary = "{fast_float} is an open-source number parsing library for C++. The library provides fast header-only implementations."
|
||||
spec.authors = "The fast_float contributors"
|
||||
spec.source = {
|
||||
:git => fast_float_git_url,
|
||||
:tag => "v6.1.4"
|
||||
}
|
||||
spec.pod_target_xcconfig = {
|
||||
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
|
||||
"GCC_WARN_INHIBIT_ALL_WARNINGS" => "YES" # Disable warnings because we don't control this library
|
||||
}
|
||||
spec.platforms = min_supported_versions
|
||||
spec.libraries = "c++"
|
||||
spec.public_header_files = "include/fast_float/*.h"
|
||||
spec.header_mappings_dir = "include"
|
||||
spec.source_files = ["include/fast_float/*.h"]
|
||||
end
|
||||
@@ -8,14 +8,14 @@ fmt_git_url = fmt_config[:git]
|
||||
|
||||
Pod::Spec.new do |spec|
|
||||
spec.name = "fmt"
|
||||
spec.version = "9.1.0"
|
||||
spec.version = "11.0.2"
|
||||
spec.license = { :type => "MIT" }
|
||||
spec.homepage = "https://github.com/fmtlib/fmt"
|
||||
spec.summary = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams."
|
||||
spec.authors = "The fmt contributors"
|
||||
spec.source = {
|
||||
:git => fmt_git_url,
|
||||
:tag => "9.1.0"
|
||||
:tag => "11.0.2"
|
||||
}
|
||||
spec.pod_target_xcconfig = {
|
||||
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
|
||||
|
||||
@@ -10,3 +10,6 @@ gem 'rexml'
|
||||
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
|
||||
gem 'xcodeproj', '< 1.26.0'
|
||||
gem 'concurrent-ruby', '< 1.3.4'
|
||||
gem 'logger'
|
||||
gem 'benchmark'
|
||||
gem 'bigdecimal'
|
||||
|
||||
+283
-229
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user