From 7b6bb7555c9c48ed28b2cdbd0d7359f8fe03495e Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Thu, 14 Sep 2023 06:53:43 -0700 Subject: [PATCH] C++ 20 all the things (#39454) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/39454 1. Build with C++ 20 everywhere. 2. Update folly by three months to avoid a warning (we are still multiple years behind). 3. Adds some headers now included to the folly podspec 4. Replaces a deprecated atomic usage with equivalent. 5. Fixes deprecated implicit capturing `this` by value in lambdas Changelog: [Internal] Reviewed By: sammy-SC Differential Revision: D49271685 fbshipit-source-id: bc0707df5451cad3ca495e716a245a648f6dba47 --- .../generators/modules/GenerateModuleJniH.js | 2 +- .../GenerateModuleJniH-test.js.snap | 16 +- .../AppDelegate/React-RCTAppDelegate.podspec | 2 +- .../Libraries/Blob/React-RCTBlob.podspec | 4 +- .../Libraries/Image/React-RCTImage.podspec | 4 +- .../LinkingIOS/React-RCTLinking.podspec | 4 +- .../React-RCTAnimation.podspec | 4 +- .../Network/React-RCTNetwork.podspec | 4 +- .../React-RCTPushNotification.podspec | 4 +- .../Settings/React-RCTSettings.podspec | 4 +- .../TypeSafety/RCTTypeSafety.podspec | 2 +- .../Vibration/React-RCTVibration.podspec | 4 +- packages/react-native/React-Core.podspec | 4 +- .../CoreModules/React-CoreModules.podspec | 4 +- .../FBReactNativeSpec.podspec | 4 +- .../React/React-RCTFabric.podspec | 4 +- .../react-native/React/third-party.xcconfig | 2 +- .../cmake-utils/ReactNative-application.cmake | 4 +- .../ReactAndroid/src/main/jni/CMakeLists.txt | 4 +- .../src/main/jni/react/fabric/CMakeLists.txt | 2 +- .../react/hermes/reactexecutor/CMakeLists.txt | 2 +- .../src/main/jni/react/jni/CMakeLists.txt | 2 +- .../main/jni/react/mapbuffer/CMakeLists.txt | 2 +- .../jni/react/newarchdefaults/CMakeLists.txt | 2 +- .../jni/react/reactperflogger/CMakeLists.txt | 2 +- .../react/runtime/hermes/jni/CMakeLists.txt | 2 +- .../main/jni/react/runtime/jni/CMakeLists.txt | 2 +- .../main/jni/react/turbomodule/CMakeLists.txt | 2 +- .../main/jni/react/uimanager/CMakeLists.txt | 2 +- .../ReactCommon/React-Fabric.podspec | 4 +- .../ReactCommon/React-FabricImage.podspec | 4 +- .../ReactCommon/React-Mapbuffer.podspec | 2 +- .../ReactCommon/React-rncore.podspec | 2 +- .../ReactCommon/ReactCommon.podspec | 4 +- .../ReactCommon/butter/CMakeLists.txt | 2 +- .../react-native/ReactCommon/butter/butter.h | 2 +- .../ReactCommon/callinvoker/CMakeLists.txt | 2 +- .../callinvoker/React-callinvoker.podspec | 2 +- .../ReactCommon/cxxreact/CMakeLists.txt | 2 +- .../ReactCommon/cxxreact/NativeToJsBridge.h | 2 +- .../cxxreact/React-cxxreact.podspec | 4 +- .../ReactCommon/hermes/React-hermes.podspec | 4 +- .../hermes/executor/CMakeLists.txt | 2 +- .../hermes/executor/React-jsitracing.podspec | 2 +- .../hermes/inspector-modern/CMakeLists.txt | 2 +- .../ReactCommon/jserrorhandler/CMakeLists.txt | 2 +- .../React-jserrorhandler.podspec | 4 +- .../ReactCommon/jsi/React-jsi.podspec | 2 +- .../ReactCommon/jsiexecutor/CMakeLists.txt | 2 +- .../jsiexecutor/React-jsiexecutor.podspec | 4 +- .../jsinspector-modern/CMakeLists.txt | 2 +- .../React-jsinspector.podspec | 2 +- .../ReactCommon/logger/React-logger.podspec | 2 +- .../ReactCommon/react/bridging/CMakeLists.txt | 2 +- .../ReactCommon/react/config/CMakeLists.txt | 2 +- .../ReactCommon/react/debug/CMakeLists.txt | 2 +- .../react/debug/React-debug.podspec | 2 +- .../react/nativemodule/core/CMakeLists.txt | 2 +- .../ios/React-NativeModulesApple.podspec | 4 +- .../samples/ReactCommon-Samples.podspec | 4 +- .../samples/platform/android/CMakeLists.txt | 2 +- .../react/renderer/animations/CMakeLists.txt | 2 +- .../renderer/attributedstring/CMakeLists.txt | 2 +- .../renderer/componentregistry/CMakeLists.txt | 2 +- .../componentregistry/native/CMakeLists.txt | 2 +- .../renderer/components/image/CMakeLists.txt | 2 +- .../legacyviewmanagerinterop/CMakeLists.txt | 2 +- .../renderer/components/modal/CMakeLists.txt | 2 +- .../components/progressbar/CMakeLists.txt | 2 +- .../renderer/components/root/CMakeLists.txt | 2 +- .../components/scrollview/CMakeLists.txt | 2 +- .../renderer/components/switch/CMakeLists.txt | 2 +- .../renderer/components/text/CMakeLists.txt | 2 +- .../components/textinput/CMakeLists.txt | 2 +- .../unimplementedview/CMakeLists.txt | 2 +- .../renderer/components/view/CMakeLists.txt | 2 +- .../react/renderer/core/CMakeLists.txt | 2 +- .../react/renderer/debug/CMakeLists.txt | 2 +- .../debug/React-rendererdebug.podspec | 4 +- .../react/renderer/element/CMakeLists.txt | 3 +- .../react/renderer/graphics/CMakeLists.txt | 3 +- .../renderer/graphics/React-graphics.podspec | 2 +- .../renderer/imagemanager/CMakeLists.txt | 2 +- .../platform/ios/React-ImageManager.podspec | 2 +- .../react/renderer/leakchecker/CMakeLists.txt | 2 +- .../react/renderer/mapbuffer/CMakeLists.txt | 2 +- .../react/renderer/mounting/CMakeLists.txt | 2 +- .../renderer/runtimescheduler/CMakeLists.txt | 2 +- .../React-runtimescheduler.podspec | 4 +- .../react/renderer/scheduler/CMakeLists.txt | 2 +- .../react/renderer/telemetry/CMakeLists.txt | 2 +- .../renderer/templateprocessor/CMakeLists.txt | 2 +- .../renderer/textlayoutmanager/CMakeLists.txt | 2 +- .../react/renderer/uimanager/CMakeLists.txt | 2 +- .../ReactCommon/react/runtime/CMakeLists.txt | 2 +- .../react/runtime/React-RuntimeCore.podspec | 4 +- .../react/runtime/React-RuntimeHermes.podspec | 4 +- .../react/runtime/ReactInstance.cpp | 4 +- .../react/runtime/hermes/CMakeLists.txt | 2 +- .../runtime/nativeviewconfig/CMakeLists.txt | 2 +- .../platform/ios/React-RuntimeApple.podspec | 4 +- .../ReactCommon/react/utils/CMakeLists.txt | 2 +- .../react/utils/React-utils.podspec | 4 +- .../reactperflogger/CMakeLists.txt | 2 +- .../reactperflogger/React-perflogger.podspec | 2 +- .../runtimeexecutor/CMakeLists.txt | 2 +- .../React-runtimeexecutor.podspec | 2 +- .../react-native/gradle/libs.versions.toml | 2 +- .../cocoapods/__tests__/codegen-test.rb | 4 +- .../cocoapods/__tests__/codegen_utils-test.rb | 4 +- .../__tests__/new_architecture-test.rb | 30 ++-- .../__tests__/test_utils/CodegenUtilsMock.rb | 4 +- .../react-native/scripts/cocoapods/codegen.rb | 2 +- .../scripts/cocoapods/codegen_utils.rb | 6 +- .../scripts/cocoapods/new_architecture.rb | 4 +- .../react-native/scripts/cocoapods/utils.rb | 2 +- .../react-native/scripts/react_native_pods.rb | 2 +- .../sdks/hermes-engine/hermes-engine.podspec | 2 +- .../ios/HelloWorld.xcodeproj/project.pbxproj | 4 +- .../third-party-podspecs/RCT-Folly.podspec | 12 +- .../MyNativeView.podspec | 2 +- .../NativeCxxModuleExample/CMakeLists.txt | 2 +- .../NativeCxxModuleExample.podspec | 2 +- packages/rn-tester/Podfile.lock | 142 +++++++++--------- .../rn-tester/RCTTest/React-RCTTest.podspec | 4 +- .../RNTesterPods.xcodeproj/project.pbxproj | 4 +- 126 files changed, 264 insertions(+), 260 deletions(-) diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js index 836c8184351012..fb98080755456c 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js @@ -109,7 +109,7 @@ target_compile_options( -DLOG_TAG=\\"ReactNative\\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall ) `; diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap index b4adb4aa436416..cc203a0927bd07 100644 --- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap +++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap @@ -79,7 +79,7 @@ target_compile_options( -DLOG_TAG=\\\\\\"ReactNative\\\\\\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall ) ", @@ -165,7 +165,7 @@ target_compile_options( -DLOG_TAG=\\\\\\"ReactNative\\\\\\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall ) ", @@ -244,7 +244,7 @@ target_compile_options( -DLOG_TAG=\\\\\\"ReactNative\\\\\\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall ) ", @@ -330,7 +330,7 @@ target_compile_options( -DLOG_TAG=\\\\\\"ReactNative\\\\\\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall ) ", @@ -416,7 +416,7 @@ target_compile_options( -DLOG_TAG=\\\\\\"ReactNative\\\\\\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall ) ", @@ -510,7 +510,7 @@ target_compile_options( -DLOG_TAG=\\\\\\"ReactNative\\\\\\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall ) ", @@ -596,7 +596,7 @@ target_compile_options( -DLOG_TAG=\\\\\\"ReactNative\\\\\\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall ) ", @@ -690,7 +690,7 @@ target_compile_options( -DLOG_TAG=\\\\\\"ReactNative\\\\\\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall ) ", diff --git a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec index 90a39a1370c40c..72778d607c3ee1 100644 --- a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec +++ b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec @@ -75,7 +75,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths, "OTHER_CPLUSPLUSFLAGS" => other_cflags, - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "DEFINES_MODULE" => "YES" } s.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""} diff --git a/packages/react-native/Libraries/Blob/React-RCTBlob.podspec b/packages/react-native/Libraries/Blob/React-RCTBlob.podspec index 1c8fe558490dce..f4ac109278d7fb 100644 --- a/packages/react-native/Libraries/Blob/React-RCTBlob.podspec +++ b/packages/react-native/Libraries/Blob/React-RCTBlob.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -47,7 +47,7 @@ Pod::Spec.new do |s| s.header_dir = "RCTBlob" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } diff --git a/packages/react-native/Libraries/Image/React-RCTImage.podspec b/packages/react-native/Libraries/Image/React-RCTImage.podspec index 2d2850d17a959a..fdba81b5926d5d 100644 --- a/packages/react-native/Libraries/Image/React-RCTImage.podspec +++ b/packages/react-native/Libraries/Image/React-RCTImage.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -48,7 +48,7 @@ Pod::Spec.new do |s| s.header_dir = "RCTImage" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.framework = ["Accelerate", "UIKit"] diff --git a/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec b/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec index 534962b6f10e00..1905a819783a09 100644 --- a/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -51,7 +51,7 @@ Pod::Spec.new do |s| s.header_dir = "RCTLinking" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } diff --git a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec index afd7715b0e97b2..6c6993fff1a37e 100644 --- a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -47,7 +47,7 @@ Pod::Spec.new do |s| s.header_dir = "RCTAnimation" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(" ") } diff --git a/packages/react-native/Libraries/Network/React-RCTNetwork.podspec b/packages/react-native/Libraries/Network/React-RCTNetwork.podspec index 9b0f8a9e85e3c8..ce6f1b7ea1819a 100644 --- a/packages/react-native/Libraries/Network/React-RCTNetwork.podspec +++ b/packages/react-native/Libraries/Network/React-RCTNetwork.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -51,7 +51,7 @@ Pod::Spec.new do |s| s.header_dir = "RCTNetwork" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.frameworks = "MobileCoreServices" diff --git a/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index cdbdaa50ab8b60..b59ec5e149252a 100644 --- a/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -48,7 +48,7 @@ Pod::Spec.new do |s| s.header_dir = "RCTPushNotification" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.framework = "UserNotifications" diff --git a/packages/react-native/Libraries/Settings/React-RCTSettings.podspec b/packages/react-native/Libraries/Settings/React-RCTSettings.podspec index 482595894c33be..ebbfc7dec43083 100644 --- a/packages/react-native/Libraries/Settings/React-RCTSettings.podspec +++ b/packages/react-native/Libraries/Settings/React-RCTSettings.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -51,7 +51,7 @@ Pod::Spec.new do |s| s.header_dir = "RCTSettings" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } diff --git a/packages/react-native/Libraries/TypeSafety/RCTTypeSafety.podspec b/packages/react-native/Libraries/TypeSafety/RCTTypeSafety.podspec index 2e37af9e55a251..b13ec49c634b6b 100644 --- a/packages/react-native/Libraries/TypeSafety/RCTTypeSafety.podspec +++ b/packages/react-native/Libraries/TypeSafety/RCTTypeSafety.podspec @@ -29,7 +29,7 @@ Pod::Spec.new do |s| s.header_dir = "RCTTypeSafety" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/Libraries/TypeSafety\"" } diff --git a/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec b/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec index d8eb8e49d3bb26..4b78c4a1f3165b 100644 --- a/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec +++ b/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -50,7 +50,7 @@ Pod::Spec.new do |s| s.header_dir = "RCTVibration" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.frameworks = "AudioToolbox" diff --git a/packages/react-native/React-Core.podspec b/packages/react-native/React-Core.podspec index 69dd16f74108d7..f71bc8d5f05565 100644 --- a/packages/react-native/React-Core.podspec +++ b/packages/react-native/React-Core.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' socket_rocket_version = '0.6.0' boost_compiler_flags = '-Wno-documentation' @@ -77,7 +77,7 @@ Pod::Spec.new do |s| "HEADER_SEARCH_PATHS" => header_search_paths, "DEFINES_MODULE" => "YES", "GCC_PREPROCESSOR_DEFINITIONS" => "RCT_METRO_PORT=${RCT_METRO_PORT}", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "FRAMEWORK_SEARCH_PATHS" => frameworks_search_paths.join(" ") } s.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""} diff --git a/packages/react-native/React/CoreModules/React-CoreModules.podspec b/packages/react-native/React/CoreModules/React-CoreModules.podspec index caea51b5fbf160..44856ff627df49 100644 --- a/packages/react-native/React/CoreModules/React-CoreModules.podspec +++ b/packages/react-native/React/CoreModules/React-CoreModules.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' socket_rocket_version = '0.6.0' header_search_paths = [ @@ -46,7 +46,7 @@ Pod::Spec.new do |s| s.header_dir = "CoreModules" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(" ") } s.framework = "UIKit" diff --git a/packages/react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec b/packages/react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec index 0c65665cf5a685..2d8c139e15064f 100644 --- a/packages/react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec +++ b/packages/react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec @@ -20,7 +20,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' Pod::Spec.new do |s| s.name = "FBReactNativeSpec" @@ -38,7 +38,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\"" } diff --git a/packages/react-native/React/React-RCTFabric.podspec b/packages/react-native/React/React-RCTFabric.podspec index 62eb2cd801afa9..cf8e4d70f03276 100644 --- a/packages/react-native/React/React-RCTFabric.podspec +++ b/packages/react-native/React/React-RCTFabric.podspec @@ -18,7 +18,7 @@ end folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1' folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' header_search_paths = [ @@ -69,7 +69,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths, "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags, - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" }.merge!(ENV['USE_FRAMEWORKS'] != nil ? { "PUBLIC_HEADERS_FOLDER_PATH" => "$(CONTENTS_FOLDER_PATH)/Headers/React" }: {}) diff --git a/packages/react-native/React/third-party.xcconfig b/packages/react-native/React/third-party.xcconfig index e4262ca0387954..f791cb93161325 100644 --- a/packages/react-native/React/third-party.xcconfig +++ b/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_76_0 $(SRCROOT)/../third-party/folly-2021.07.22.00 $(SRCROOT)/../third-party/glog-0.3.5/src +HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_76_0 $(SRCROOT)/../third-party/folly-2021.10.25.00 $(SRCROOT)/../third-party/glog-0.3.5/src OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 diff --git a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake index a24bd464d51a40..d49fa9ed80d80b 100644 --- a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake +++ b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake @@ -54,10 +54,10 @@ target_compile_options(${CMAKE_PROJECT_NAME} # due to use migrating away from # #include # This can be removed for React Native 0.73 - -Wno-error=cpp + -Wno-error=cpp -fexceptions -frtti - -std=c++17 + -std=c++20 -DWITH_INSPECTOR=1 -DLOG_TAG=\"ReactNative\") diff --git a/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt index ba83e718a0602d..75f09d2a968718 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt @@ -22,7 +22,7 @@ endif(CCACHE_FOUND) # Make sure every shared lib includes a .note.gnu.build-id header add_link_options(-Wl,--build-id) -add_compile_options(-Wall -Werror -std=c++17) +add_compile_options(-Wall -Werror -std=c++20) function(add_react_android_subdir relative_path) add_subdirectory(${REACT_ANDROID_DIR}/${relative_path} ReactAndroid/${relative_path}) @@ -188,7 +188,7 @@ add_executable(reactnative_unittest -Werror -fexceptions -frtti - -std=c++17 + -std=c++20 -DHERMES_ENABLE_DEBUGGER) target_link_libraries(reactnative_unittest diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt index 865dbb262bba71..59bdac78c1926e 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt @@ -64,6 +64,6 @@ target_compile_options( -DLOG_TAG=\"Fabric\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall ) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt index 5a706244939548..0a7f253f63ce56 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt @@ -16,7 +16,7 @@ target_compile_options( hermes_executor PRIVATE $<$:-DHERMES_ENABLE_DEBUGGER=1> - -std=c++17 + -std=c++20 -fexceptions ) target_include_directories(hermes_executor PRIVATE .) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt index 0e49300c78e8a4..13f248431dae02 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt @@ -11,7 +11,7 @@ file(GLOB reactnativejni_SRC CONFIGURE_DEPENDS *.cpp) add_compile_options( -fexceptions -Wno-unused-lambda-capture - -std=c++17 + -std=c++20 -DWITH_INSPECTOR=1) ###################### diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt index 0aca9cb0f4eeca..2694a9cd06783b 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\") +add_compile_options(-fexceptions -frtti -std=c++20 -Wall -DLOG_TAG=\"Fabric\") file(GLOB mapbuffer_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/react/common/mapbuffer/*.cpp) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt index fefaedfa3b0521..166c5ed45344ec 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"ReactNative\") +add_compile_options(-fexceptions -frtti -std=c++20 -Wall -DLOG_TAG=\"ReactNative\") file(GLOB react_newarchdefaults_SRC CONFIGURE_DEPENDS *.cpp) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/reactperflogger/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/reactperflogger/CMakeLists.txt index 4c10b7eaca217e..ad2400a0dcee2f 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/reactperflogger/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/reactperflogger/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -add_compile_options(-fexceptions -frtti -std=c++17 -Wall) +add_compile_options(-fexceptions -frtti -std=c++20 -Wall) add_library(reactperfloggerjni SHARED reactperflogger/OnLoad.cpp) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/hermes/jni/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/hermes/jni/CMakeLists.txt index a779d4f72a712d..1848f355fb6fa9 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/hermes/jni/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/hermes/jni/CMakeLists.txt @@ -16,7 +16,7 @@ target_compile_options( hermesinstancejni PRIVATE $<$:-DHERMES_ENABLE_DEBUGGER=1> - -std=c++17 + -std=c++20 -fexceptions ) target_include_directories(hermesinstancejni PRIVATE .) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/CMakeLists.txt index 7b5fa858832498..ab59671367e982 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/CMakeLists.txt @@ -16,7 +16,7 @@ target_compile_options( rninstance PRIVATE $<$:-DHERMES_ENABLE_DEBUGGER=1> - -std=c++17 + -std=c++20 -fexceptions ) target_include_directories(rninstance PUBLIC .) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/CMakeLists.txt index 748e1c6ca00f86..2a937e547ca9f6 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/CMakeLists.txt @@ -10,7 +10,7 @@ add_compile_options( -fexceptions -frtti -Wno-unused-lambda-capture - -std=c++17) + -std=c++20) ######################### ### callinvokerholder ### diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt index 8fc6ee71f0f13c..ca7c6e0ad5c7be 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"ReactNative\") +add_compile_options(-fexceptions -frtti -std=c++20 -Wall -DLOG_TAG=\"ReactNative\") file(GLOB uimanagerjni_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) add_library(uimanagerjni SHARED ${uimanagerjni_SRC}) diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index c8413048921eb3..373e025f471523 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-gnu-zero-variadic-macro-arguments' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' folly_dep_name = 'RCT-Folly/Fabric' boost_compiler_flags = '-Wno-documentation' react_native_path = ".." @@ -33,7 +33,7 @@ Pod::Spec.new do |s| s.source = source s.source_files = "dummyFile.cpp" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "DEFINES_MODULE" => "YES" } if ENV['USE_FRAMEWORKS'] diff --git a/packages/react-native/ReactCommon/React-FabricImage.podspec b/packages/react-native/ReactCommon/React-FabricImage.podspec index 107c0dff95d1c4..6d3dcd76d1e329 100644 --- a/packages/react-native/ReactCommon/React-FabricImage.podspec +++ b/packages/react-native/ReactCommon/React-FabricImage.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-gnu-zero-variadic-macro-arguments' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' folly_dep_name = 'RCT-Folly/Fabric' boost_compiler_flags = '-Wno-documentation' react_native_path = ".." @@ -58,7 +58,7 @@ Pod::Spec.new do |s| s.header_dir = "react/renderer/components/image" s.compiler_flags = folly_compiler_flags s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_path.join(" ") } diff --git a/packages/react-native/ReactCommon/React-Mapbuffer.podspec b/packages/react-native/ReactCommon/React-Mapbuffer.podspec index 1b26f10a5315a5..ec5ecc87f2d32a 100644 --- a/packages/react-native/ReactCommon/React-Mapbuffer.podspec +++ b/packages/react-native/ReactCommon/React-Mapbuffer.podspec @@ -30,7 +30,7 @@ Pod::Spec.new do |s| s.public_header_files = 'react/renderer/mapbuffer/*.h' s.header_dir = "react/renderer/mapbuffer" s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\"", "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" } if ENV['USE_FRAMEWORKS'] s.header_mappings_dir = './' diff --git a/packages/react-native/ReactCommon/React-rncore.podspec b/packages/react-native/ReactCommon/React-rncore.podspec index c44a50ade669a5..b3d337a838eb87 100644 --- a/packages/react-native/ReactCommon/React-rncore.podspec +++ b/packages/react-native/ReactCommon/React-rncore.podspec @@ -49,7 +49,7 @@ Pod::Spec.new do |s| s.source_files = "dummyFile.cpp" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" } use_react_native_codegen!(s, { diff --git a/packages/react-native/ReactCommon/ReactCommon.podspec b/packages/react-native/ReactCommon/ReactCommon.podspec index 47699fd76ec110..8ea75fbc7f0903 100644 --- a/packages/react-native/ReactCommon/ReactCommon.podspec +++ b/packages/react-native/ReactCommon/ReactCommon.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-gnu-zero-variadic-macro-arguments' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' using_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1" Pod::Spec.new do |s| @@ -34,7 +34,7 @@ Pod::Spec.new do |s| 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)/Headers/Private/React-Core\"", "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "GCC_WARN_PEDANTIC" => "YES" } if ENV['USE_FRAMEWORKS'] s.header_mappings_dir = './' diff --git a/packages/react-native/ReactCommon/butter/CMakeLists.txt b/packages/react-native/ReactCommon/butter/CMakeLists.txt index 2f374d95165168..98e65cc1f0a79e 100644 --- a/packages/react-native/ReactCommon/butter/CMakeLists.txt +++ b/packages/react-native/ReactCommon/butter/CMakeLists.txt @@ -10,7 +10,7 @@ add_compile_options( -DLOG_TAG=\"Butter\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments) diff --git a/packages/react-native/ReactCommon/butter/butter.h b/packages/react-native/ReactCommon/butter/butter.h index 69cfb534f22bc1..1b823235c48b6b 100644 --- a/packages/react-native/ReactCommon/butter/butter.h +++ b/packages/react-native/ReactCommon/butter/butter.h @@ -23,7 +23,7 @@ namespace butter { * * Target C++ Version * ------------------ - * Currently, Butter targets C++17. + * Currently, Butter targets c++20. * * The Scope * --------- diff --git a/packages/react-native/ReactCommon/callinvoker/CMakeLists.txt b/packages/react-native/ReactCommon/callinvoker/CMakeLists.txt index f2206d066fb5ca..ec5b8172cae158 100644 --- a/packages/react-native/ReactCommon/callinvoker/CMakeLists.txt +++ b/packages/react-native/ReactCommon/callinvoker/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments) diff --git a/packages/react-native/ReactCommon/callinvoker/React-callinvoker.podspec b/packages/react-native/ReactCommon/callinvoker/React-callinvoker.podspec index 347ab4cc4ac501..6dd4413e830581 100644 --- a/packages/react-native/ReactCommon/callinvoker/React-callinvoker.podspec +++ b/packages/react-native/ReactCommon/callinvoker/React-callinvoker.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/packages/react-native/ReactCommon/cxxreact/CMakeLists.txt b/packages/react-native/ReactCommon/cxxreact/CMakeLists.txt index d1316d7deaa023..fc22793a571baa 100644 --- a/packages/react-native/ReactCommon/cxxreact/CMakeLists.txt +++ b/packages/react-native/ReactCommon/cxxreact/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wno-unused-lambda-capture -DLOG_TAG=\"ReactNative\") diff --git a/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.h b/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.h index 991e34db251ff2..c2073624b01739 100644 --- a/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.h +++ b/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.h @@ -127,7 +127,7 @@ class NativeToJsBridge { bool m_applicationScriptHasFailure = false; #ifdef WITH_FBSYSTRACE - std::atomic_uint_least32_t m_systraceCookie = ATOMIC_VAR_INIT(0); + std::atomic m_systraceCookie{0}; #endif }; diff --git a/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec b/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec index ef4639586cd85a..1478243c41c571 100644 --- a/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec +++ b/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec @@ -18,7 +18,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| @@ -35,7 +35,7 @@ Pod::Spec.new do |s| 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_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers\"", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" } s.header_dir = "cxxreact" diff --git a/packages/react-native/ReactCommon/hermes/React-hermes.podspec b/packages/react-native/ReactCommon/hermes/React-hermes.podspec index 2d400eaa0f766d..0a0742ede3be1e 100644 --- a/packages/react-native/ReactCommon/hermes/React-hermes.podspec +++ b/packages/react-native/ReactCommon/hermes/React-hermes.podspec @@ -18,7 +18,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| @@ -38,7 +38,7 @@ Pod::Spec.new do |s| 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)/libevent/include\"", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" } s.header_dir = "reacthermes" s.dependency "React-cxxreact", version diff --git a/packages/react-native/ReactCommon/hermes/executor/CMakeLists.txt b/packages/react-native/ReactCommon/hermes/executor/CMakeLists.txt index 29f7158d08b2ae..6c72e5d1b90ac2 100644 --- a/packages/react-native/ReactCommon/hermes/executor/CMakeLists.txt +++ b/packages/react-native/ReactCommon/hermes/executor/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -add_compile_options(-std=c++17) +add_compile_options(-std=c++20) file(GLOB_RECURSE hermes_executor_SRC CONFIGURE_DEPENDS *.cpp) add_library( diff --git a/packages/react-native/ReactCommon/hermes/executor/React-jsitracing.podspec b/packages/react-native/ReactCommon/hermes/executor/React-jsitracing.podspec index 0fa6b72212e7f2..3ccee99377915e 100644 --- a/packages/react-native/ReactCommon/hermes/executor/React-jsitracing.podspec +++ b/packages/react-native/ReactCommon/hermes/executor/React-jsitracing.podspec @@ -29,7 +29,7 @@ Pod::Spec.new do |s| s.header_dir = "." s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"${PODS_TARGET_SRCROOT}/../..\"", "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "GCC_WARN_PEDANTIC" => "YES" } if ENV['USE_FRAMEWORKS'] diff --git a/packages/react-native/ReactCommon/hermes/inspector-modern/CMakeLists.txt b/packages/react-native/ReactCommon/hermes/inspector-modern/CMakeLists.txt index 431eb7d143fe2e..bd051c84563f82 100644 --- a/packages/react-native/ReactCommon/hermes/inspector-modern/CMakeLists.txt +++ b/packages/react-native/ReactCommon/hermes/inspector-modern/CMakeLists.txt @@ -16,7 +16,7 @@ target_compile_options( hermes_inspector_modern PRIVATE -DHERMES_INSPECTOR_FOLLY_KLUDGE=1 - -std=c++17 + -std=c++20 -fexceptions ) diff --git a/packages/react-native/ReactCommon/jserrorhandler/CMakeLists.txt b/packages/react-native/ReactCommon/jserrorhandler/CMakeLists.txt index a007f929c0ed9e..612d100fa38a8f 100644 --- a/packages/react-native/ReactCommon/jserrorhandler/CMakeLists.txt +++ b/packages/react-native/ReactCommon/jserrorhandler/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -add_compile_options(-std=c++17) +add_compile_options(-std=c++20) file(GLOB_RECURSE js_error_handler_SRC CONFIGURE_DEPENDS *.cpp) add_library( diff --git a/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec b/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec index b8b6cb65914a31..d5a7888dca5ea3 100644 --- a/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec +++ b/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-gnu-zero-variadic-macro-arguments' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' folly_dep_name = 'RCT-Folly/Fabric' boost_compiler_flags = '-Wno-documentation' react_native_path = ".." @@ -34,7 +34,7 @@ Pod::Spec.new do |s| s.header_dir = "jserrorhandler" s.source_files = "JsErrorHandler.{cpp,h}" s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Mapbuffer/React_Mapbuffer.framework/Headers\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\"", "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" } s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags if ENV['USE_FRAMEWORKS'] diff --git a/packages/react-native/ReactCommon/jsi/React-jsi.podspec b/packages/react-native/ReactCommon/jsi/React-jsi.podspec index 1d795926cd89fc..26e21543080065 100644 --- a/packages/react-native/ReactCommon/jsi/React-jsi.podspec +++ b/packages/react-native/ReactCommon/jsi/React-jsi.podspec @@ -21,7 +21,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/packages/react-native/ReactCommon/jsiexecutor/CMakeLists.txt b/packages/react-native/ReactCommon/jsiexecutor/CMakeLists.txt index ae63005ed6d022..b05fccaf24c57c 100644 --- a/packages/react-native/ReactCommon/jsiexecutor/CMakeLists.txt +++ b/packages/react-native/ReactCommon/jsiexecutor/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -O3) add_library(jsireact diff --git a/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec index 8b5e6e1fcc7e07..f744a80edb2f77 100644 --- a/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec +++ b/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| @@ -32,7 +32,7 @@ Pod::Spec.new do |s| 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\"", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" } s.header_dir = "jsireact" s.dependency "React-cxxreact", version diff --git a/packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt b/packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt index dd361e90b9a132..3f16dd6ceaae32 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt +++ b/packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions - -std=c++17) + -std=c++20) file(GLOB jsinspector_SRC CONFIGURE_DEPENDS *.cpp) add_library(jsinspector SHARED ${jsinspector_SRC}) diff --git a/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec b/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec index 98f717e8339e3c..76bb5b0413d4e7 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec +++ b/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec @@ -27,5 +27,5 @@ Pod::Spec.new do |s| s.source = source s.source_files = "*.{cpp,h}" s.header_dir = 'jsinspector' - s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } + s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" } end diff --git a/packages/react-native/ReactCommon/logger/React-logger.podspec b/packages/react-native/ReactCommon/logger/React-logger.podspec index b5a51ca8921047..b2d4651ae63e7a 100644 --- a/packages/react-native/ReactCommon/logger/React-logger.podspec +++ b/packages/react-native/ReactCommon/logger/React-logger.podspec @@ -18,7 +18,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/packages/react-native/ReactCommon/react/bridging/CMakeLists.txt b/packages/react-native/ReactCommon/react/bridging/CMakeLists.txt index 8d8f81a768b49d..f084beccab6294 100644 --- a/packages/react-native/ReactCommon/react/bridging/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/bridging/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/config/CMakeLists.txt b/packages/react-native/ReactCommon/react/config/CMakeLists.txt index d6e93d1cde201f..c581816bd1177a 100644 --- a/packages/react-native/ReactCommon/react/config/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/config/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/debug/CMakeLists.txt b/packages/react-native/ReactCommon/react/debug/CMakeLists.txt index cb3497e77a12cd..ec0ec12da81283 100644 --- a/packages/react-native/ReactCommon/react/debug/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/debug/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/debug/React-debug.podspec b/packages/react-native/ReactCommon/react/debug/React-debug.podspec index 07970e5e283d8c..4754c832404f45 100644 --- a/packages/react-native/ReactCommon/react/debug/React-debug.podspec +++ b/packages/react-native/ReactCommon/react/debug/React-debug.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| s.source = source s.source_files = "**/*.{cpp,h}" s.header_dir = "react/debug" - s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "DEFINES_MODULE" => "YES" } if ENV['USE_FRAMEWORKS'] diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/core/CMakeLists.txt index 33a3d9b1ef5006..40888fcbde83f8 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/core/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec index b2b92ec2305369..5ee1d0dbe08750 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-gnu-zero-variadic-macro-arguments' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' using_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1" Pod::Spec.new do |s| @@ -34,7 +34,7 @@ Pod::Spec.new do |s| 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)/Headers/Private/React-Core\"", "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "GCC_WARN_PEDANTIC" => "YES" } if ENV['USE_FRAMEWORKS'] s.header_mappings_dir = './' diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec index b6123f91819dd3..7e196222a6494a 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-gnu-zero-variadic-macro-arguments' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' using_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1" Pod::Spec.new do |s| @@ -34,7 +34,7 @@ Pod::Spec.new do |s| 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)/Headers/Private/React-Core\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers\"", "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "GCC_WARN_PEDANTIC" => "YES" } if ENV['USE_FRAMEWORKS'] s.header_mappings_dir = './' diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt index bf4abadd8a948f..2e032601b0044d 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt index 89fe0368286bd8..e1674024b970c6 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/attributedstring/CMakeLists.txt index cc34a3fe959a90..01e325222a2d0d 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/componentregistry/CMakeLists.txt index fa02501aaf8338..7cc08f89db1c09 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt index ea49c8984747e1..752e65f5c1b232 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/image/CMakeLists.txt index cb7dcae7d6d3cf..9dbf4cbe43395e 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/image/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/CMakeLists.txt index 016015f62b3c25..e340c9d8dc7f9b 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/modal/CMakeLists.txt index ed70bda43a57c0..5dd94549149fd5 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/modal/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/modal/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt index f7091a4b8ae618..c72594888e5a37 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/root/CMakeLists.txt index 8592834feb1e27..b0ed65e10c6316 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/root/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/root/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt index d664e5e2faf16f..7c8aab4b1d9f9d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/switch/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/switch/CMakeLists.txt index b09fc00064447f..acc0fa27426c1e 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/switch/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/switch/CMakeLists.txt @@ -39,7 +39,7 @@ target_compile_options( -DLOG_TAG=\"Fabric\" -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/text/CMakeLists.txt index 1866337440ff89..184dc34e920436 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/text/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/textinput/CMakeLists.txt index 80eb0f5400e10e..39e2a428bb64e6 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt index 5620fb7f757f67..ab2dbcf4b7db0b 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt index 10755bf772c112..a6ad1aeea58083 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt index c8786aa0099c4e..8dc03e6ef55828 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/debug/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/debug/CMakeLists.txt index 23dfd98e46ecfb..d5271e9987892b 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/debug/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec b/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec index b7593acac75f3e..1f266cc93a7e93 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec +++ b/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -44,7 +44,7 @@ Pod::Spec.new do |s| s.header_dir = "react/renderer/debug" s.exclude_files = "tests" s.pod_target_xcconfig = { - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), "DEFINES_MODULE" => "YES" } diff --git a/packages/react-native/ReactCommon/react/renderer/element/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/element/CMakeLists.txt index d0af2a29e44a11..362871fb92185b 100644 --- a/packages/react-native/ReactCommon/react/renderer/element/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/element/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments @@ -26,4 +26,3 @@ target_link_libraries(react_render_element react_render_core react_render_componentregistry ) - diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt index ac5eae299c1ae0..dbfa549afd82ea 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments @@ -25,4 +25,3 @@ target_include_directories(react_render_graphics ) target_link_libraries(react_render_graphics glog fb fbjni folly_runtime react_debug) - diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec index 313684ac98793f..90f082896f20dc 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec +++ b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/imagemanager/CMakeLists.txt index e4fd71c8c93f8e..17c3040c65f21e 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec index 1116eb28e943c6..f99264f67b859a 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec @@ -57,7 +57,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => header_search_paths.join(" "), - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "DEFINES_MODULE" => "YES", } diff --git a/packages/react-native/ReactCommon/react/renderer/leakchecker/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/leakchecker/CMakeLists.txt index e8508fd5593ed2..183330b580acf8 100644 --- a/packages/react-native/ReactCommon/react/renderer/leakchecker/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/leakchecker/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt index 1d2ce40117a030..1962c29acc6b0d 100644 --- a/packages/react-native/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt index e369ae904fe39a..f43668e96b4dc7 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt index c11429d3812f9c..1a25e838653cb0 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec index ee12654b36b560..1120ad3a266d00 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -43,7 +43,7 @@ Pod::Spec.new do |s| s.header_dir = "react/renderer/runtimescheduler" s.exclude_files = "tests" s.pod_target_xcconfig = { - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(' ')} if ENV['USE_FRAMEWORKS'] diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt index 62e979c97194a8..fd7f93db411371 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/telemetry/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/telemetry/CMakeLists.txt index aae37e0c19d221..0b975fa10c0772 100644 --- a/packages/react-native/ReactCommon/react/renderer/telemetry/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/telemetry/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt index c8bac1961879e0..ce1065135e4f07 100644 --- a/packages/react-native/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt index 8027f57c47d53f..c3d7c1974910a7 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt index 9370ff520b7b62..a7b47e56945fef 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/runtime/CMakeLists.txt b/packages/react-native/ReactCommon/react/runtime/CMakeLists.txt index 2ad8ccb366b2d5..ace51b62265ca7 100644 --- a/packages/react-native/ReactCommon/react/runtime/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/runtime/CMakeLists.txt @@ -16,7 +16,7 @@ target_compile_options( bridgeless PRIVATE $<$:-DHERMES_ENABLE_DEBUGGER=1> - -std=c++17 + -std=c++20 -fexceptions ) target_include_directories(bridgeless PUBLIC .) diff --git a/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec b/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec index a12514439e7d3e..f83db3ebbd0475 100644 --- a/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec +++ b/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-gnu-zero-variadic-macro-arguments' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' folly_dep_name = 'RCT-Folly/Fabric' boost_compiler_flags = '-Wno-documentation' @@ -35,7 +35,7 @@ Pod::Spec.new do |s| s.header_dir = "react/runtime" s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"${PODS_TARGET_SRCROOT}/../..\"", "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "GCC_WARN_PEDANTIC" => "YES" } s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags diff --git a/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec b/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec index 98f943a64a7c69..98502c32edf067 100644 --- a/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec +++ b/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-gnu-zero-variadic-macro-arguments' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' folly_dep_name = 'RCT-Folly/Fabric' boost_compiler_flags = '-Wno-documentation' @@ -34,7 +34,7 @@ Pod::Spec.new do |s| s.header_dir = "react/runtime/hermes" s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"${PODS_TARGET_SRCROOT}/../..\" \"${PODS_TARGET_SRCROOT}/../../hermes/executor\"", "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "GCC_WARN_PEDANTIC" => "YES" } s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags diff --git a/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp b/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp index 2dd5a28c3653b5..0f85cf0b722a1b 100644 --- a/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp +++ b/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp @@ -244,7 +244,9 @@ void ReactInstance::callFunctionOnModule( const std::string& moduleName, const std::string& methodName, const folly::dynamic& args) { - bufferedRuntimeExecutor_->execute([=](jsi::Runtime& runtime) { + // TODO (C++ 20): This code previously implicitly captured `this` in a [=] + // capture group. Was it meaning to pass modules_ by value? + bufferedRuntimeExecutor_->execute([=, this](jsi::Runtime& runtime) { SystraceSection s( "ReactInstance::callFunctionOnModule", "moduleName", diff --git a/packages/react-native/ReactCommon/react/runtime/hermes/CMakeLists.txt b/packages/react-native/ReactCommon/react/runtime/hermes/CMakeLists.txt index 668675dbf9ee86..955bb14c946a6a 100644 --- a/packages/react-native/ReactCommon/react/runtime/hermes/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/runtime/hermes/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -add_compile_options(-std=c++17) +add_compile_options(-std=c++20) file(GLOB_RECURSE bridgeless_hermes_SRC CONFIGURE_DEPENDS *.cpp) add_library( diff --git a/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/CMakeLists.txt b/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/CMakeLists.txt index 68bd16e06e42ec..351b5cb4e3a755 100644 --- a/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -add_compile_options(-std=c++17) +add_compile_options(-std=c++20) file(GLOB_RECURSE bridgeless_nativeviewconfig_SRC CONFIGURE_DEPENDS *.cpp) add_library( diff --git a/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec b/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec index cd8a8f38fbc705..79de4234fd023c 100644 --- a/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec +++ b/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-gnu-zero-variadic-macro-arguments' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' folly_dep_name = 'RCT-Folly/Fabric' boost_compiler_flags = '-Wno-documentation' @@ -41,7 +41,7 @@ Pod::Spec.new do |s| s.header_dir = "ReactCommon" s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths, "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "GCC_WARN_PEDANTIC" => "YES" } s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags diff --git a/packages/react-native/ReactCommon/react/utils/CMakeLists.txt b/packages/react-native/ReactCommon/react/utils/CMakeLists.txt index 8c63c41500c5a0..495648afa6b365 100644 --- a/packages/react-native/ReactCommon/react/utils/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/utils/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/react-native/ReactCommon/react/utils/React-utils.podspec b/packages/react-native/ReactCommon/react/utils/React-utils.podspec index 031f43406d85f6..0867a3ec461b7e 100644 --- a/packages/react-native/ReactCommon/react/utils/React-utils.podspec +++ b/packages/react-native/ReactCommon/react/utils/React-utils.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", @@ -42,7 +42,7 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags s.header_dir = "react/utils" s.exclude_files = "tests" - s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), "DEFINES_MODULE" => "YES" } diff --git a/packages/react-native/ReactCommon/reactperflogger/CMakeLists.txt b/packages/react-native/ReactCommon/reactperflogger/CMakeLists.txt index 41fe1face06b31..d3120f62a8e76f 100644 --- a/packages/react-native/ReactCommon/reactperflogger/CMakeLists.txt +++ b/packages/react-native/ReactCommon/reactperflogger/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments) diff --git a/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec b/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec index 47013b99c38cf3..59581efaf38119 100644 --- a/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec +++ b/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/packages/react-native/ReactCommon/runtimeexecutor/CMakeLists.txt b/packages/react-native/ReactCommon/runtimeexecutor/CMakeLists.txt index f33e7068ccb47b..315341a91fe698 100644 --- a/packages/react-native/ReactCommon/runtimeexecutor/CMakeLists.txt +++ b/packages/react-native/ReactCommon/runtimeexecutor/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments) diff --git a/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec b/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec index 0a6e443579b399..563fad367fd64b 100644 --- a/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec +++ b/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| diff --git a/packages/react-native/gradle/libs.versions.toml b/packages/react-native/gradle/libs.versions.toml index 45d553115fa386..37a3b399ef3254 100644 --- a/packages/react-native/gradle/libs.versions.toml +++ b/packages/react-native/gradle/libs.versions.toml @@ -34,7 +34,7 @@ yoga-proguard-annotations = "1.19.0" boost="1_76_0" doubleconversion="1.1.6" fmt="6.2.1" -folly="2021.07.22.00" +folly="2021.10.25.00" glog="0.3.5" libevent="2.1.12" gtest="1.12.1" diff --git a/packages/react-native/scripts/cocoapods/__tests__/codegen-test.rb b/packages/react-native/scripts/cocoapods/__tests__/codegen-test.rb index cc2aead348ea7c..593b109d16e618 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/codegen-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/codegen-test.rb @@ -242,7 +242,7 @@ def testRunCodegen_whenNewArchEnabled_runsCodegen :codegen_output_dir=>"build/generated/ios", :config_file_dir=>"", :fabric_enabled=>false, - :folly_version=>"2021.07.22.00", + :folly_version=>"2021.10.25.00", :react_native_path=>"../node_modules/react-native" }]) assert_equal(codegen_utils_mock.get_react_codegen_spec_params, []) @@ -270,7 +270,7 @@ def testRunCodegen_whenNewArchDisabled_runsCodegen assert_equal(codegen_utils_mock.use_react_native_codegen_discovery_params, []) assert_equal(codegen_utils_mock.get_react_codegen_spec_params, [{ :fabric_enabled => true, - :folly_version=>"2021.07.22.00", + :folly_version=>"2021.10.25.00", :package_json_file => "~/app/package.json", :script_phases => nil }]) diff --git a/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb b/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb index 48e41a7318a9ff..f29335fab2df30 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb @@ -385,7 +385,7 @@ def testUseReactCodegenDiscovery_whenParametersAreGood_executeCodegen ]) assert_equal(codegen_utils_mock.get_react_codegen_spec_params, [{ :fabric_enabled => false, - :folly_version=>"2021.07.22.00", + :folly_version=>"2021.10.25.00", :package_json_file => "#{app_path}/ios/../node_modules/react-native/package.json", :script_phases => "echo TestScript" }]) @@ -535,7 +535,7 @@ def get_podspec_no_fabric_no_script 'homepage' => 'https://facebook.com/', 'license' => 'Unlicense', 'authors' => 'Facebook', - 'compiler_flags' => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation -Wno-nullability-completeness -std=c++17", + 'compiler_flags' => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation -Wno-nullability-completeness -std=c++20", 'source' => { :git => '' }, 'header_mappings_dir' => './', 'platforms' => { diff --git a/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb b/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb index 1b7d2e53ca8489..e0beeb8591af58 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb @@ -25,10 +25,10 @@ def test_setClangCxxLanguageStandardIfNeeded_whenReactCoreIsPresent installer = prepare_mocked_installer_with_react_core NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer) - assert_equal(installer.aggregate_targets[0].user_project.build_configurations[0].build_settings["CLANG_CXX_LANGUAGE_STANDARD"], "c++17") - assert_equal(installer.aggregate_targets[1].user_project.build_configurations[0].build_settings["CLANG_CXX_LANGUAGE_STANDARD"], "c++17") + assert_equal(installer.aggregate_targets[0].user_project.build_configurations[0].build_settings["CLANG_CXX_LANGUAGE_STANDARD"], "c++20") + assert_equal(installer.aggregate_targets[1].user_project.build_configurations[0].build_settings["CLANG_CXX_LANGUAGE_STANDARD"], "c++20") assert_equal(installer.pods_project.targets[1].received_resolved_build_setting_parameters, [ReceivedCommonResolvedBuildSettings.new("CLANG_CXX_LANGUAGE_STANDARD", true)]) - assert_equal(Pod::UI.collected_messages, ["Setting CLANG_CXX_LANGUAGE_STANDARD to c++17 on /test/path.xcproj", "Setting CLANG_CXX_LANGUAGE_STANDARD to c++17 on /test/path2.xcproj"]) + assert_equal(Pod::UI.collected_messages, ["Setting CLANG_CXX_LANGUAGE_STANDARD to c++20 on /test/path.xcproj", "Setting CLANG_CXX_LANGUAGE_STANDARD to c++20 on /test/path2.xcproj"]) end def test_setClangCxxLanguageStandardIfNeeded_whenReactCoreIsNotPresent @@ -45,10 +45,10 @@ def test_setClangCxxLanguageStandardIfNeeded_whenThereAreDifferentValuesForLangu installer = prepare_mocked_installer_with_react_core_and_different_language_standards NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer) - assert_equal(installer.aggregate_targets[0].user_project.build_configurations[0].build_settings["CLANG_CXX_LANGUAGE_STANDARD"], "c++17") - assert_equal(installer.aggregate_targets[1].user_project.build_configurations[0].build_settings["CLANG_CXX_LANGUAGE_STANDARD"], "c++17") + assert_equal(installer.aggregate_targets[0].user_project.build_configurations[0].build_settings["CLANG_CXX_LANGUAGE_STANDARD"], "c++20") + assert_equal(installer.aggregate_targets[1].user_project.build_configurations[0].build_settings["CLANG_CXX_LANGUAGE_STANDARD"], "c++20") assert_equal(installer.pods_project.targets[1].received_resolved_build_setting_parameters, [ReceivedCommonResolvedBuildSettings.new("CLANG_CXX_LANGUAGE_STANDARD", true)]) - assert_equal(Pod::UI.collected_messages, ["Setting CLANG_CXX_LANGUAGE_STANDARD to c++17 on /test/path.xcproj", "Setting CLANG_CXX_LANGUAGE_STANDARD to c++17 on /test/path2.xcproj"]) + assert_equal(Pod::UI.collected_messages, ["Setting CLANG_CXX_LANGUAGE_STANDARD to c++20 on /test/path.xcproj", "Setting CLANG_CXX_LANGUAGE_STANDARD to c++20 on /test/path2.xcproj"]) end # =================== # @@ -128,18 +128,18 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths spec = SpecMock.new # Act - NewArchitectureHelper.install_modules_dependencies(spec, true, '2021.07.22.00') + NewArchitectureHelper.install_modules_dependencies(spec, true, '2021.10.25.00') # Assert assert_equal(spec.compiler_flags, 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_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-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.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++17") + 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 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1") assert_equal( spec.dependencies, [ { :dependency_name => "React-Core" }, - { :dependency_name => "RCT-Folly", "version"=>"2021.07.22.00" }, + { :dependency_name => "RCT-Folly", "version"=>"2021.10.25.00" }, { :dependency_name => "glog" }, { :dependency_name => "React-RCTFabric" }, { :dependency_name => "React-Codegen" }, @@ -169,17 +169,17 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler } # Act - NewArchitectureHelper.install_modules_dependencies(spec, false, '2021.07.22.00') + NewArchitectureHelper.install_modules_dependencies(spec, false, '2021.10.25.00') # Assert assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{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_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-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.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++17") + 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"=>"2021.07.22.00" }, + { :dependency_name => "RCT-Folly", "version"=>"2021.10.25.00" }, { :dependency_name => "glog" } ] ) @@ -337,8 +337,8 @@ def prepare_mocked_installer_with_react_core TargetMock.new( "React-Core", [ - BuildConfigurationMock.new("Debug", { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }), - BuildConfigurationMock.new("Release", { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }), + BuildConfigurationMock.new("Debug", { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" }), + BuildConfigurationMock.new("Release", { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" }), ] ) ] @@ -367,7 +367,7 @@ def prepare_mocked_installer_with_react_core_and_different_language_standards TargetMock.new( "React-Core", [ - BuildConfigurationMock.new("Debug", { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }), + BuildConfigurationMock.new("Debug", { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" }), BuildConfigurationMock.new("Release", { "CLANG_CXX_LANGUAGE_STANDARD" => "new" }), ] ) diff --git a/packages/react-native/scripts/cocoapods/__tests__/test_utils/CodegenUtilsMock.rb b/packages/react-native/scripts/cocoapods/__tests__/test_utils/CodegenUtilsMock.rb index c7bba3d2ec67f3..28edf9a3777746 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/test_utils/CodegenUtilsMock.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/test_utils/CodegenUtilsMock.rb @@ -66,7 +66,7 @@ def get_react_codegen_script_phases( return @react_codegen_script_phases end - def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fabric_enabled: false, hermes_enabled: true, script_phases: nil) + def get_react_codegen_spec(package_json_file, folly_version: '2021.10.25.00', fabric_enabled: false, hermes_enabled: true, script_phases: nil) @get_react_codegen_spec_params.push({ package_json_file: package_json_file, folly_version: folly_version, @@ -92,7 +92,7 @@ def use_react_native_codegen_discovery!( config_file_dir: '', codegen_output_dir: 'build/generated/ios', config_key: 'codegenConfig', - folly_version: "2021.07.22.00", + folly_version: "2021.10.25.00", codegen_utils: CodegenUtilsMock.new() ) @use_react_native_codegen_discovery_params.push({ diff --git a/packages/react-native/scripts/cocoapods/codegen.rb b/packages/react-native/scripts/cocoapods/codegen.rb index d42dabd479a895..d38ac16b16f27f 100644 --- a/packages/react-native/scripts/cocoapods/codegen.rb +++ b/packages/react-native/scripts/cocoapods/codegen.rb @@ -81,7 +81,7 @@ def run_codegen!( codegen_output_dir: 'build/generated/ios', config_key: 'codegenConfig', package_json_file: '~/app/package.json', - folly_version: '2021.07.22.00', + folly_version: '2021.10.25.00', codegen_utils: CodegenUtils.new() ) diff --git a/packages/react-native/scripts/cocoapods/codegen_utils.rb b/packages/react-native/scripts/cocoapods/codegen_utils.rb index d6dcf29c50291f..b1d2f243c61ed5 100644 --- a/packages/react-native/scripts/cocoapods/codegen_utils.rb +++ b/packages/react-native/scripts/cocoapods/codegen_utils.rb @@ -69,7 +69,7 @@ def generate_react_codegen_podspec!(spec, codegen_output_dir, file_manager: File # - hermes_enabled: whether hermes is enabled or not. # - script_phases: whether we want to add some build script phases or not. # - file_manager: a class that implements the `File` interface. Defaults to `File`, the Dependency can be injected for testing purposes. - def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fabric_enabled: false, hermes_enabled: true, script_phases: nil, file_manager: File) + def get_react_codegen_spec(package_json_file, folly_version: '2021.10.25.00', fabric_enabled: false, hermes_enabled: true, script_phases: nil, file_manager: File) package = JSON.parse(file_manager.read(package_json_file)) version = package['version'] new_arch_disabled = ENV['RCT_NEW_ARCH_ENABLED'] != "1" @@ -114,7 +114,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa 'homepage' => 'https://facebook.com/', 'license' => 'Unlicense', 'authors' => 'Facebook', - 'compiler_flags' => "#{folly_compiler_flags} #{boost_compiler_flags} -Wno-nullability-completeness -std=c++17", + 'compiler_flags' => "#{folly_compiler_flags} #{boost_compiler_flags} -Wno-nullability-completeness -std=c++20", 'source' => { :git => '' }, 'header_mappings_dir' => './', 'platforms' => min_supported_versions, @@ -288,7 +288,7 @@ def use_react_native_codegen_discovery!( config_file_dir: '', codegen_output_dir: 'build/generated/ios', config_key: 'codegenConfig', - folly_version: '2021.07.22.00', + folly_version: '2021.10.25.00', codegen_utils: CodegenUtils.new(), file_manager: File ) diff --git a/packages/react-native/scripts/cocoapods/new_architecture.rb b/packages/react-native/scripts/cocoapods/new_architecture.rb index 42556e332037ed..51fa600f5f11ee 100644 --- a/packages/react-native/scripts/cocoapods/new_architecture.rb +++ b/packages/react-native/scripts/cocoapods/new_architecture.rb @@ -12,7 +12,7 @@ class NewArchitectureHelper @@new_arch_cpp_flags = "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 #{@@shared_flags}" - @@cplusplus_version = "c++17" + @@cplusplus_version = "c++20" def self.set_clang_cxx_language_standard_if_needed(installer) language_standard = nil @@ -127,7 +127,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version) spec.dependency "React-Core" - spec.dependency "RCT-Folly", '2021.07.22.00' + spec.dependency "RCT-Folly", '2021.10.25.00' spec.dependency "glog" if new_arch_enabled diff --git a/packages/react-native/scripts/cocoapods/utils.rb b/packages/react-native/scripts/cocoapods/utils.rb index 87f8d1966306b5..d3063b7ac3d6b0 100644 --- a/packages/react-native/scripts/cocoapods/utils.rb +++ b/packages/react-native/scripts/cocoapods/utils.rb @@ -156,7 +156,7 @@ def self.apply_xcode_15_patch(installer) installer.target_installation_results.pod_target_installation_results .each do |pod_name, target_installation_result| target_installation_result.native_target.build_configurations.each do |config| - # unary_function and binary_function are no longer provided in C++17 and newer standard modes as part of Xcode 15. They can be re-enabled with setting _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION + # unary_function and binary_function are no longer provided in c++20 and newer standard modes as part of Xcode 15. They can be re-enabled with setting _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION # Ref: https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Deprecations config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= '$(inherited) ' config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << '"_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION" ' diff --git a/packages/react-native/scripts/react_native_pods.rb b/packages/react-native/scripts/react_native_pods.rb index 4c1904443487be..6ee3440a483932 100644 --- a/packages/react-native/scripts/react_native_pods.rb +++ b/packages/react-native/scripts/react_native_pods.rb @@ -20,7 +20,7 @@ $CODEGEN_OUTPUT_DIR = 'build/generated/ios' $CODEGEN_COMPONENT_DIR = 'react/renderer/components' $CODEGEN_MODULE_DIR = '.' -$FOLLY_VERSION = '2021.07.22.00' +$FOLLY_VERSION = '2021.10.25.00' $START_TIME = Time.now.to_i diff --git a/packages/react-native/sdks/hermes-engine/hermes-engine.podspec b/packages/react-native/sdks/hermes-engine/hermes-engine.podspec index 227be7560c6a67..8fd33af931a9d7 100644 --- a/packages/react-native/sdks/hermes-engine/hermes-engine.podspec +++ b/packages/react-native/sdks/hermes-engine/hermes-engine.podspec @@ -30,7 +30,7 @@ Pod::Spec.new do |spec| spec.source_files = '' spec.pod_target_xcconfig = { - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "CLANG_CXX_LIBRARY" => "compiler-default" } diff --git a/packages/react-native/template/ios/HelloWorld.xcodeproj/project.pbxproj b/packages/react-native/template/ios/HelloWorld.xcodeproj/project.pbxproj index 6390f4b55591c0..0866b9518aaeba 100644 --- a/packages/react-native/template/ios/HelloWorld.xcodeproj/project.pbxproj +++ b/packages/react-native/template/ios/HelloWorld.xcodeproj/project.pbxproj @@ -516,7 +516,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LANGUAGE_STANDARD = "c++20"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -587,7 +587,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LANGUAGE_STANDARD = "c++20"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; diff --git a/packages/react-native/third-party-podspecs/RCT-Folly.podspec b/packages/react-native/third-party-podspecs/RCT-Folly.podspec index 84e5b354d9b30c..5ee1e1066c4ee2 100644 --- a/packages/react-native/third-party-podspecs/RCT-Folly.podspec +++ b/packages/react-native/third-party-podspecs/RCT-Folly.podspec @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. -folly_release_version = '2021.07.22.00' +folly_release_version = '2021.10.25.00' Pod::Spec.new do |spec| spec.name = 'RCT-Folly' @@ -50,6 +50,7 @@ Pod::Spec.new do |spec| 'folly/container/*.h', 'folly/container/detail/*.h', 'folly/detail/*.h', + 'folly/experimental/coro/*.h', 'folly/functional/*.h', 'folly/hash/*.h', 'folly/lang/*.h', @@ -57,13 +58,15 @@ Pod::Spec.new do |spec| 'folly/memory/detail/*.h', 'folly/net/*.h', 'folly/net/detail/*.h', - 'folly/portability/*.h' + 'folly/portability/*.h', + 'folly/syhcnronization/*.h', # workaround for https://github.com/facebook/react-native/issues/14326 spec.preserve_paths = 'folly/*.h', 'folly/container/*.h', 'folly/container/detail/*.h', 'folly/detail/*.h', + 'folly/experimental/coro/*.h', 'folly/functional/*.h', 'folly/hash/*.h', 'folly/lang/*.h', @@ -71,10 +74,11 @@ Pod::Spec.new do |spec| 'folly/memory/detail/*.h', 'folly/net/*.h', 'folly/net/detail/*.h', - 'folly/portability/*.h' + 'folly/portability/*.h', + 'folly/syhcnronization/*.h', spec.libraries = "c++abi" # NOTE Apple-only: Keep c++abi here due to https://github.com/react-native-community/releases/issues/251 spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/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\"" diff --git a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec index 49d150495fe467..97a0f9082f4fd2 100644 --- a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec +++ b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/facebook/my-native-view.git", :tag => "#{s.version}" } s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" } s.source_files = "ios/**/*.{h,m,mm,cpp}" diff --git a/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt b/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt index 79c30443a3475e..0fe23d107d9e16 100644 --- a/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt +++ b/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_options( -fexceptions -frtti - -std=c++17 + -std=c++20 -Wall -Wpedantic -Wno-gnu-zero-variadic-macro-arguments diff --git a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.podspec b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.podspec index 81fb57362af56a..1d41471bc34cc2 100644 --- a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.podspec +++ b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" } install_modules_dependencies(s) diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 6c496c29e3dbd2..3167ea10959cf4 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -4,7 +4,7 @@ PODS: - DoubleConversion (1.1.6) - FBLazyVector (1000.0.0) - FBReactNativeSpec (1000.0.0): - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core (= 1000.0.0) @@ -76,23 +76,23 @@ PODS: - libevent (2.1.12) - OCMock (3.9.1) - OpenSSL-Universal (1.1.1100) - - RCT-Folly (2021.07.22.00): + - RCT-Folly (2021.10.25.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Default (= 2021.07.22.00) - - RCT-Folly/Default (2021.07.22.00): + - RCT-Folly/Default (= 2021.10.25.00) + - RCT-Folly/Default (2021.10.25.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Fabric (2021.07.22.00): + - RCT-Folly/Fabric (2021.10.25.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Futures (2021.07.22.00): + - RCT-Folly/Futures (2021.10.25.00): - boost - DoubleConversion - fmt (~> 6.2.1) @@ -140,7 +140,7 @@ PODS: - React-Core (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default (= 1000.0.0) - React-cxxreact - React-hermes @@ -154,7 +154,7 @@ PODS: - React-Core/CoreModulesHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -168,7 +168,7 @@ PODS: - React-Core/Default (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-cxxreact - React-hermes - React-jsi @@ -181,7 +181,7 @@ PODS: - React-Core/DevSupport (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default (= 1000.0.0) - React-Core/RCTWebSocket (= 1000.0.0) - React-cxxreact @@ -197,7 +197,7 @@ PODS: - React-Core/RCTActionSheetHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -211,7 +211,7 @@ PODS: - React-Core/RCTAnimationHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -225,7 +225,7 @@ PODS: - React-Core/RCTBlobHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -239,7 +239,7 @@ PODS: - React-Core/RCTImageHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -253,7 +253,7 @@ PODS: - React-Core/RCTLinkingHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -267,7 +267,7 @@ PODS: - React-Core/RCTNetworkHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -281,7 +281,7 @@ PODS: - React-Core/RCTPushNotificationHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -295,7 +295,7 @@ PODS: - React-Core/RCTSettingsHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -309,7 +309,7 @@ PODS: - React-Core/RCTTextHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -323,7 +323,7 @@ PODS: - React-Core/RCTVibrationHeaders (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default - React-cxxreact - React-hermes @@ -337,7 +337,7 @@ PODS: - React-Core/RCTWebSocket (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core/Default (= 1000.0.0) - React-cxxreact - React-hermes @@ -349,7 +349,7 @@ PODS: - SocketRocket (= 0.6.0) - Yoga - React-CoreModules (1000.0.0): - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - RCTTypeSafety (= 1000.0.0) - React-Codegen (= 1000.0.0) - React-Core/CoreModulesHeaders (= 1000.0.0) @@ -363,7 +363,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-callinvoker (= 1000.0.0) - React-debug (= 1000.0.0) - React-jsi (= 1000.0.0) @@ -376,7 +376,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -409,7 +409,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -427,7 +427,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -445,7 +445,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -463,7 +463,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -481,7 +481,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -499,7 +499,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -528,7 +528,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -546,7 +546,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -564,7 +564,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -582,7 +582,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -600,7 +600,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -618,7 +618,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -636,7 +636,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -654,7 +654,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -672,7 +672,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -690,7 +690,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -708,7 +708,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -727,7 +727,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -745,7 +745,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -763,7 +763,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -781,7 +781,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -799,7 +799,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -817,7 +817,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -835,7 +835,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -853,7 +853,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -872,7 +872,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core @@ -890,7 +890,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Fabric @@ -905,14 +905,14 @@ PODS: - Yoga - React-graphics (1000.0.0): - glog - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - React-Core/Default (= 1000.0.0) - React-hermes (1000.0.0): - DoubleConversion - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - RCT-Folly/Futures (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) + - RCT-Folly/Futures (= 2021.10.25.00) - React-cxxreact (= 1000.0.0) - React-jsi - React-jsiexecutor (= 1000.0.0) @@ -928,19 +928,19 @@ PODS: - React-rendererdebug - React-utils - React-jserrorhandler (1000.0.0): - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - React-jsi (= 1000.0.0) - React-Mapbuffer - React-jsi (1000.0.0): - boost (= 1.76.0) - DoubleConversion - glog - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-jsiexecutor (1000.0.0): - DoubleConversion - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-perflogger (= 1000.0.0) @@ -965,7 +965,7 @@ PODS: - React-RCTActionSheet (1000.0.0): - React-Core/RCTActionSheetHeaders (= 1000.0.0) - React-RCTAnimation (1000.0.0): - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - RCTTypeSafety (= 1000.0.0) - React-Codegen (= 1000.0.0) - React-Core/RCTAnimationHeaders (= 1000.0.0) @@ -987,7 +987,7 @@ PODS: - ReactCommon/turbomodule/core - React-RCTBlob (1000.0.0): - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Codegen (= 1000.0.0) - React-Core/RCTBlobHeaders (= 1000.0.0) - React-Core/RCTWebSocket (= 1000.0.0) @@ -997,7 +997,7 @@ PODS: - React-RCTFabric (1000.0.0): - glog - hermes-engine - - RCT-Folly/Fabric (= 2021.07.22.00) + - RCT-Folly/Fabric (= 2021.10.25.00) - React-Core (= 1000.0.0) - React-debug - React-Fabric (= 1000.0.0) @@ -1012,7 +1012,7 @@ PODS: - React-utils - Yoga - React-RCTImage (1000.0.0): - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - RCTTypeSafety (= 1000.0.0) - React-Codegen (= 1000.0.0) - React-Core/RCTImageHeaders (= 1000.0.0) @@ -1025,7 +1025,7 @@ PODS: - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTNetwork (1000.0.0): - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - RCTTypeSafety (= 1000.0.0) - React-Codegen (= 1000.0.0) - React-Core/RCTNetworkHeaders (= 1000.0.0) @@ -1038,14 +1038,14 @@ PODS: - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTSettings (1000.0.0): - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - RCTTypeSafety (= 1000.0.0) - React-Codegen (= 1000.0.0) - React-Core/RCTSettingsHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTTest (1000.0.0): - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core (= 1000.0.0) - React-CoreModules (= 1000.0.0) - React-jsi (= 1000.0.0) @@ -1054,14 +1054,14 @@ PODS: - React-Core/RCTTextHeaders (= 1000.0.0) - Yoga - React-RCTVibration (1000.0.0): - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Codegen (= 1000.0.0) - React-Core/RCTVibrationHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-rendererdebug (1000.0.0): - DoubleConversion - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-debug - React-rncore (1000.0.0) - React-runtimeexecutor (1000.0.0): @@ -1069,7 +1069,7 @@ PODS: - React-runtimescheduler (1000.0.0): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-callinvoker - React-debug - React-jsi @@ -1077,7 +1077,7 @@ PODS: - React-utils - React-utils (1000.0.0): - glog - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-debug - ReactCommon-Samples (1000.0.0): - DoubleConversion @@ -1092,7 +1092,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-callinvoker (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) @@ -1102,7 +1102,7 @@ PODS: - DoubleConversion - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-callinvoker (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) @@ -1110,7 +1110,7 @@ PODS: - React-perflogger (= 1000.0.0) - ScreenshotManager (0.0.1): - glog - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2021.10.25.00) - React-Core - SocketRocket (0.6.0) - Yoga (1.14.0) diff --git a/packages/rn-tester/RCTTest/React-RCTTest.podspec b/packages/rn-tester/RCTTest/React-RCTTest.podspec index 77658d2f875ba5..86dc5d202899c5 100644 --- a/packages/rn-tester/RCTTest/React-RCTTest.podspec +++ b/packages/rn-tester/RCTTest/React-RCTTest.podspec @@ -17,7 +17,7 @@ else end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' +folly_version = '2021.10.25.00' Pod::Spec.new do |s| s.name = "React-RCTTest" @@ -35,7 +35,7 @@ Pod::Spec.new do |s| s.header_dir = "RCTTest" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\"" } diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index fcfc531a6c8504..5b26a72d91a77a 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -898,7 +898,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LANGUAGE_STANDARD = "c++20"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -989,7 +989,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LANGUAGE_STANDARD = "c++20"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES;