diff --git a/.ado/Brewfile b/.ado/Brewfile index 78fe5e50f1a9c3..5fcdf7d59341e8 100644 --- a/.ado/Brewfile +++ b/.ado/Brewfile @@ -1,4 +1 @@ -brew "watchman" -brew "xcbeautify" -# macOS 12 doesn't have `realpath` but macOS 13 does. Remove this line when Azure Pipelines supports macOS 13 images. -brew "coreutils" +brew "xcbeautify" \ No newline at end of file diff --git a/.ado/Brewfile.lock.json b/.ado/Brewfile.lock.json deleted file mode 100644 index 9939e1847acbca..00000000000000 --- a/.ado/Brewfile.lock.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "entries": { - "brew": { - "watchman": { - "version": "2023.12.04.00", - "bottle": { - "rebuild": 0, - "root_url": "https://ghcr.io/v2/homebrew/core", - "files": { - "arm64_sonoma": { - "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:71ba771348e2bbcff73f79dc7d671bb68c97a5505286c5b1ee75fd38ff59974b", - "sha256": "71ba771348e2bbcff73f79dc7d671bb68c97a5505286c5b1ee75fd38ff59974b" - }, - "arm64_ventura": { - "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:b4fc3efe5d6901a61d4b39e19f36463e683bb79d0d5fcb8cd269d5dcea0971cc", - "sha256": "b4fc3efe5d6901a61d4b39e19f36463e683bb79d0d5fcb8cd269d5dcea0971cc" - }, - "arm64_monterey": { - "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:367153c209b088e818ea5efedb7e2e3724124080dead65fde8165a37e5b3a6cd", - "sha256": "367153c209b088e818ea5efedb7e2e3724124080dead65fde8165a37e5b3a6cd" - }, - "sonoma": { - "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:5db2d4c8332526e1e596c959d147e2ef6793517536d38f40926eaf003e20a713", - "sha256": "5db2d4c8332526e1e596c959d147e2ef6793517536d38f40926eaf003e20a713" - }, - "ventura": { - "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:8467f3ba14225f3aca240def454a71d98749acface02bc0548d1796171907aa1", - "sha256": "8467f3ba14225f3aca240def454a71d98749acface02bc0548d1796171907aa1" - }, - "monterey": { - "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:b7350773a66ddbaba0c720dc379dc7410488fe34404518d2ad1665e34bde9e42", - "sha256": "b7350773a66ddbaba0c720dc379dc7410488fe34404518d2ad1665e34bde9e42" - }, - "x86_64_linux": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:c7b49a58c8f934acbf197566eb9f728396d424559db23d45b4f9cf4cb97bc66c", - "sha256": "c7b49a58c8f934acbf197566eb9f728396d424559db23d45b4f9cf4cb97bc66c" - } - } - } - }, - "xcbeautify": { - "version": "1.4.0", - "bottle": { - "rebuild": 1, - "root_url": "https://ghcr.io/v2/homebrew/core", - "files": { - "arm64_sonoma": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:d385bf64fa78e606790182eb51f0fbc0b6dccce34ce20c7028d095073a42175e", - "sha256": "d385bf64fa78e606790182eb51f0fbc0b6dccce34ce20c7028d095073a42175e" - }, - "arm64_ventura": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:b3837069522655f5f6273291cf2c9ee82511d038a244600bfe499ec07cc0a464", - "sha256": "b3837069522655f5f6273291cf2c9ee82511d038a244600bfe499ec07cc0a464" - }, - "arm64_monterey": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:6d6e61c71e6a387a761c8616b10836e01cc59637c0b69165ff823626720b8e82", - "sha256": "6d6e61c71e6a387a761c8616b10836e01cc59637c0b69165ff823626720b8e82" - }, - "sonoma": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:12ceb05ec96886a8194b6b2149d3cb410297b640d414be8b7329c868978b45e9", - "sha256": "12ceb05ec96886a8194b6b2149d3cb410297b640d414be8b7329c868978b45e9" - }, - "ventura": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:3572b97c6271dc9fefe856018d87ffde775f1b4c07d1b810005b4170344b43f6", - "sha256": "3572b97c6271dc9fefe856018d87ffde775f1b4c07d1b810005b4170344b43f6" - }, - "monterey": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:8e8829c7ef83f6738435baf383fc72f9b78a4b241595ee58db53b3c2489744c4", - "sha256": "8e8829c7ef83f6738435baf383fc72f9b78a4b241595ee58db53b3c2489744c4" - }, - "x86_64_linux": { - "cellar": "/home/linuxbrew/.linuxbrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:1f52ffa3bf532545b5d292ad8380f492bc3686003c8e6915d266ab212b8d3719", - "sha256": "1f52ffa3bf532545b5d292ad8380f492bc3686003c8e6915d266ab212b8d3719" - } - } - } - }, - "coreutils": { - "version": "9.4", - "bottle": { - "rebuild": 0, - "root_url": "https://ghcr.io/v2/homebrew/core", - "files": { - "arm64_sonoma": { - "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/coreutils/blobs/sha256:a37cf7152382ee80a7e4f6cb318929c4dd213d8367607e0b6dbf56762883ec29", - "sha256": "a37cf7152382ee80a7e4f6cb318929c4dd213d8367607e0b6dbf56762883ec29" - }, - "arm64_ventura": { - "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/coreutils/blobs/sha256:3707a17440f54975e547469c1309b2f260ef4bfc5c2c53ddc22998ae3a7fbe19", - "sha256": "3707a17440f54975e547469c1309b2f260ef4bfc5c2c53ddc22998ae3a7fbe19" - }, - "arm64_monterey": { - "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/coreutils/blobs/sha256:e4e7b23c4426f5e7902cabb6a2eae635e78460ebb16a8473a25f519955302c5a", - "sha256": "e4e7b23c4426f5e7902cabb6a2eae635e78460ebb16a8473a25f519955302c5a" - }, - "arm64_big_sur": { - "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/coreutils/blobs/sha256:37fc8c6586e633c1a8277bc0ecb9893b7d170709f0fc1e7e36bbb00abd14fcc7", - "sha256": "37fc8c6586e633c1a8277bc0ecb9893b7d170709f0fc1e7e36bbb00abd14fcc7" - }, - "sonoma": { - "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/coreutils/blobs/sha256:c1be62140384a011c75ba6395c6bae84f07d655624014f415354375e1dd0173a", - "sha256": "c1be62140384a011c75ba6395c6bae84f07d655624014f415354375e1dd0173a" - }, - "ventura": { - "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/coreutils/blobs/sha256:5f03b30eff5c9cd0bc74bb429059f9b9d7af4edb8e6b80b52228b0bf35d53197", - "sha256": "5f03b30eff5c9cd0bc74bb429059f9b9d7af4edb8e6b80b52228b0bf35d53197" - }, - "monterey": { - "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/coreutils/blobs/sha256:ec46f14061242a7439e7fbb1e328b3e1dccfec465425aaf25aa4b4fe5363f95b", - "sha256": "ec46f14061242a7439e7fbb1e328b3e1dccfec465425aaf25aa4b4fe5363f95b" - }, - "big_sur": { - "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/coreutils/blobs/sha256:6504082e9752f7a37fd9d02b5f31a5fe68342526f31a774ce7cda90dc189c97f", - "sha256": "6504082e9752f7a37fd9d02b5f31a5fe68342526f31a774ce7cda90dc189c97f" - }, - "x86_64_linux": { - "cellar": "/home/linuxbrew/.linuxbrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/coreutils/blobs/sha256:362b7fcf429b62749f37056d1c8de07dfd6a7a5445eb6eec8f1f64a07a87c1d5", - "sha256": "362b7fcf429b62749f37056d1c8de07dfd6a7a5445eb6eec8f1f64a07a87c1d5" - } - } - } - } - } - }, - "system": { - "macos": { - "ventura": { - "HOMEBREW_VERSION": "4.2.3", - "HOMEBREW_PREFIX": "/usr/local", - "Homebrew/homebrew-core": "api", - "CLT": "15.1.0.0.1.1700200546", - "Xcode": "14.3.1", - "macOS": "13.6.3" - } - } - } -} diff --git a/.ado/ado-test-cleanup.sh b/.ado/ado-test-cleanup.sh index 683194dcc50b25..d3c01cd6d86ba7 100755 --- a/.ado/ado-test-cleanup.sh +++ b/.ado/ado-test-cleanup.sh @@ -22,10 +22,6 @@ lsof -i tcp:5555 | awk 'NR!=1 {print $2}' | xargs kill # clear packager cache rm -fr "$TMPDIR/react-*" -# clear watchman state -rm -rf /usr/local/var/run/watchman/* -watchman watch-del-all - # dump the log files created by launchPackager.command and launchWebSocketServer.command THIS_DIR=$(dirname "$0") PACKAGER_LOG="${THIS_DIR}/launchPackager.log" diff --git a/.ado/templates/apple-tools-setup.yml b/.ado/templates/apple-tools-setup.yml index 67462a2dbf5c23..dc7bb090c9b947 100644 --- a/.ado/templates/apple-tools-setup.yml +++ b/.ado/templates/apple-tools-setup.yml @@ -3,5 +3,23 @@ steps: inputs: versionSpec: '18.x' - - script: 'brew bundle --file .ado/Brewfile' + - task: CmdLine@2 displayName: 'brew bundle' + inputs: + script: | + brew bundle --file .ado/Brewfile + cat .ado/Brewfile.lock.json + + - ${{ if ne(parameters.xcode_version, '')}}: + - template: apple-xcode-select.yml + parameters: + slice_name: ${{ parameters.slice_name }} + xcode_version: ${{ parameters.xcode_version }} + + - script: | + xcrun simctl list + displayName: 'List Simulators' + + - script: | + xcrun --sdk iphonesimulator --show-sdk-version + displayName: 'Determine iOS SDK version' diff --git a/packages/react-native/ReactAndroid/src/main/jni/third-party/fmt/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/third-party/fmt/CMakeLists.txt index 3c03de22fc4aca..65d6a74095ffdf 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/third-party/fmt/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/third-party/fmt/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -add_compile_options(-std=c++11 -fexceptions) +add_compile_options(-std=c++20 -fexceptions) add_library(fmt STATIC src/format.cc) diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index c6dcaf3c51a054..c2e1b4eb119528 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -51,7 +51,7 @@ Pod::Spec.new do |s| s.dependency "React-logger" s.dependency "glog" s.dependency "DoubleConversion" - s.dependency 'fmt' , '~> 6.2.1' + s.dependency "fmt", "9.1.0" s.dependency "React-Core" s.dependency "React-debug" s.dependency "React-utils" diff --git a/packages/react-native/ReactCommon/React-FabricImage.podspec b/packages/react-native/ReactCommon/React-FabricImage.podspec index 5dd828501dc17d..a9233b8291f593 100644 --- a/packages/react-native/ReactCommon/React-FabricImage.podspec +++ b/packages/react-native/ReactCommon/React-FabricImage.podspec @@ -72,7 +72,7 @@ Pod::Spec.new do |s| s.dependency "React-logger" s.dependency "glog" s.dependency "DoubleConversion" - s.dependency 'fmt' , '~> 6.2.1' + s.dependency "fmt", "9.1.0" s.dependency "React-ImageManager" s.dependency "React-utils" s.dependency "Yoga" diff --git a/packages/react-native/ReactCommon/ReactCommon.podspec b/packages/react-native/ReactCommon/ReactCommon.podspec index 2996e0eae67569..d2b5d781b9748c 100644 --- a/packages/react-native/ReactCommon/ReactCommon.podspec +++ b/packages/react-native/ReactCommon/ReactCommon.podspec @@ -50,7 +50,7 @@ Pod::Spec.new do |s| ss.dependency "RCT-Folly", folly_version s.dependency "React-logger", version ss.dependency "DoubleConversion" - ss.dependency 'fmt' , '~> 6.2.1' + ss.dependency "fmt", "9.1.0" ss.dependency "glog" if using_hermes ss.dependency "hermes-engine" diff --git a/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec b/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec index d8cf29fcc0d263..30f3f6ce12cced 100644 --- a/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec +++ b/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec @@ -41,7 +41,7 @@ Pod::Spec.new do |s| s.dependency "boost", "1.83.0" s.dependency "DoubleConversion" - s.dependency 'fmt' , '~> 6.2.1' + s.dependency "fmt", "9.1.0" s.dependency "RCT-Folly", folly_version s.dependency "glog" s.dependency "React-jsinspector", version diff --git a/packages/react-native/ReactCommon/hermes/React-hermes.podspec b/packages/react-native/ReactCommon/hermes/React-hermes.podspec index 15f390c8f472d0..d404f499c37537 100644 --- a/packages/react-native/ReactCommon/hermes/React-hermes.podspec +++ b/packages/react-native/ReactCommon/hermes/React-hermes.podspec @@ -47,7 +47,7 @@ Pod::Spec.new do |s| s.dependency "React-perflogger", version s.dependency "RCT-Folly", folly_version s.dependency "DoubleConversion" - s.dependency 'fmt' , '~> 6.2.1' + s.dependency "fmt", "9.1.0" s.dependency "glog" s.dependency "RCT-Folly/Futures", folly_version s.dependency "hermes-engine" diff --git a/packages/react-native/ReactCommon/jsi/React-jsi.podspec b/packages/react-native/ReactCommon/jsi/React-jsi.podspec index e9047318bc345e..5906672e0a6118 100644 --- a/packages/react-native/ReactCommon/jsi/React-jsi.podspec +++ b/packages/react-native/ReactCommon/jsi/React-jsi.podspec @@ -41,7 +41,7 @@ Pod::Spec.new do |s| s.dependency "boost", "1.83.0" s.dependency "DoubleConversion" - s.dependency 'fmt' , '~> 6.2.1' + s.dependency "fmt", "9.1.0" s.dependency "RCT-Folly", folly_version s.dependency "glog" diff --git a/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec index 31b279634b2424..b5c2ce90a7287b 100644 --- a/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec +++ b/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec @@ -40,7 +40,7 @@ Pod::Spec.new do |s| s.dependency "React-perflogger", version s.dependency "RCT-Folly", folly_version s.dependency "DoubleConversion" - s.dependency 'fmt' , '~> 6.2.1' + s.dependency "fmt", "9.1.0" s.dependency "glog" if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1" 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 a4257cf810a763..b4490893d64b1f 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec @@ -58,7 +58,7 @@ Pod::Spec.new do |s| s.dependency "RCT-Folly" s.dependency "DoubleConversion" - s.dependency "fmt", '~> 6.2.1' + s.dependency "fmt", "9.1.0" s.dependency "React-Core" s.dependency "React-cxxreact" s.dependency "React-jsi" 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 82099e76691c33..cebed468428602 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec +++ b/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec @@ -56,6 +56,6 @@ Pod::Spec.new do |s| s.dependency "RCT-Folly", folly_version s.dependency "DoubleConversion" - s.dependency 'fmt' , '~> 6.2.1' + s.dependency "fmt", "9.1.0" add_dependency(s, "React-debug") end diff --git a/packages/react-native/gradle/libs.versions.toml b/packages/react-native/gradle/libs.versions.toml index de80b09d068505..de5c2c035272ca 100644 --- a/packages/react-native/gradle/libs.versions.toml +++ b/packages/react-native/gradle/libs.versions.toml @@ -33,7 +33,7 @@ yoga-proguard-annotations = "1.19.0" # Native Dependencies boost="1_83_0" doubleconversion="1.1.6" -fmt="6.2.1" +fmt="9.1.0" folly="2022.05.16.00" glog="0.3.5" libevent="2.1.12" diff --git a/packages/react-native/scripts/react_native_pods.rb b/packages/react-native/scripts/react_native_pods.rb index 7123678fdcf20c..8ac2c54c0fdde2 100644 --- a/packages/react-native/scripts/react_native_pods.rb +++ b/packages/react-native/scripts/react_native_pods.rb @@ -161,7 +161,9 @@ def use_react_native! ( pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec" pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec" pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec" + pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec" pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true + pod 'SocketRocket', :podspec => "#{prefix}/third-party-podspecs/SocketRocket.podspec", :modular_headers => true # [visionOS] run_codegen!( app_path, diff --git a/packages/react-native/third-party-podspecs/RCT-Folly.podspec b/packages/react-native/third-party-podspecs/RCT-Folly.podspec index 61ac0d753df7d4..1e68a3e7c5f39e 100644 --- a/packages/react-native/third-party-podspecs/RCT-Folly.podspec +++ b/packages/react-native/third-party-podspecs/RCT-Folly.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |spec| spec.dependency 'boost' spec.dependency 'DoubleConversion' spec.dependency 'glog' - spec.dependency 'fmt' , '~> 6.2.1' + spec.dependency "fmt", "9.1.0" spec.compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_PTHREAD=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation -faligned-new' spec.source_files = 'folly/String.cpp', 'folly/Conv.cpp', diff --git a/packages/react-native/third-party-podspecs/SocketRocket.podspec b/packages/react-native/third-party-podspecs/SocketRocket.podspec new file mode 100644 index 00000000000000..c5ef21987a2a92 --- /dev/null +++ b/packages/react-native/third-party-podspecs/SocketRocket.podspec @@ -0,0 +1,30 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +# [visionOS] Local copy of SocketRocket.podspec with visionOS added as a platform + +socket_rocket_version = '0.7.0' + +Pod::Spec.new do |s| + s.name = 'SocketRocket' + s.version = socket_rocket_version + s.summary = 'A conforming WebSocket (RFC 6455) client library for iOS, macOS and tvOS.' + s.homepage = 'https://github.com/facebook/SocketRocket' + s.authors = { 'Nikita Lutsenko' => 'nlutsenko@me.com', 'Dan Federman' => 'federman@squareup.com', 'Mike Lewis' => 'mikelikespie@gmail.com' } + s.license = 'BSD' + s.source = { :git => 'https://github.com/facebook/SocketRocket.git', :tag => socket_rocket_version } + s.requires_arc = true + + s.source_files = 'SocketRocket/**/*.{h,m}' + s.public_header_files = 'SocketRocket/*.h' + + s.platforms = min_supported_versions + + s.ios.frameworks = 'CFNetwork', 'Security' + s.osx.frameworks = 'CoreServices', 'Security' + s.tvos.frameworks = 'CFNetwork', 'Security' + s.visionos.frameworks = 'CFNetwork', 'Security' + s.libraries = 'icucore' +end diff --git a/packages/react-native/third-party-podspecs/fmt.podspec b/packages/react-native/third-party-podspecs/fmt.podspec new file mode 100644 index 00000000000000..c2263595e751f0 --- /dev/null +++ b/packages/react-native/third-party-podspecs/fmt.podspec @@ -0,0 +1,25 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +Pod::Spec.new do |spec| + spec.name = "fmt" + spec.version = "9.1.0" + spec.license = { :type => "MIT" } + spec.homepage = "https://github.com/fmtlib/fmt" + spec.summary = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." + spec.authors = "The fmt contributors" + spec.source = { + :git => "https://github.com/fmtlib/fmt.git", + :tag => "9.1.0" + } + spec.pod_target_xcconfig = { + "CLANG_CXX_LANGUAGE_STANDARD" => "c++20", + } + spec.platforms = min_supported_versions + spec.libraries = "c++" + spec.public_header_files = "include/fmt/*.h" + spec.header_mappings_dir = "include" + spec.source_files = ["include/fmt/*.h", "src/format.cc"] +end diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index c58382f56741ad..122f3d3819cad1 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -9,24 +9,24 @@ PODS: - React-Core (= 0.73.8) - React-jsi (= 0.73.8) - ReactCommon/turbomodule/core (= 0.73.8) - - fmt (6.2.1) + - fmt (9.1.0) - glog (0.3.5) - - OCMock (3.9.1) + - OCMock (3.9.3) - RCT-Folly (2022.05.16.00): - boost - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Default (= 2022.05.16.00) - RCT-Folly/Default (2022.05.16.00): - boost - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (2022.05.16.00): - boost - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCTRequired (0.73.8) - RCTTypeSafety (0.73.8): @@ -272,7 +272,7 @@ PODS: - React-cxxreact (0.73.8): - boost (= 1.83.0) - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 0.73.8) @@ -285,7 +285,7 @@ PODS: - React-debug (0.73.8) - React-Fabric (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -318,7 +318,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/animations (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -337,7 +337,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/attributedstring (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -356,7 +356,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/componentregistry (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -375,7 +375,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/componentregistrynative (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -394,7 +394,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -424,7 +424,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/inputaccessory (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -443,7 +443,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/legacyviewmanagerinterop (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -462,7 +462,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/modal (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -481,7 +481,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/rncore (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -500,7 +500,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/root (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -519,7 +519,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/safeareaview (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -538,7 +538,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/scrollview (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -557,7 +557,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/text (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -576,7 +576,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/textinput (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -595,7 +595,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/unimplementedview (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -614,7 +614,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/components/view (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -634,7 +634,7 @@ PODS: - Yoga - React-Fabric/core (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -653,7 +653,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/imagemanager (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -672,7 +672,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/leakchecker (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -691,7 +691,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/mounting (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -710,7 +710,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/scheduler (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -729,7 +729,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/telemetry (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -748,7 +748,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/templateprocessor (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -767,7 +767,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/textlayoutmanager (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -787,7 +787,7 @@ PODS: - ReactCommon/turbomodule/core - React-Fabric/uimanager (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired @@ -806,7 +806,7 @@ PODS: - ReactCommon/turbomodule/core - React-FabricImage (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 0.73.8) @@ -849,12 +849,12 @@ PODS: - React-jsi (0.73.8): - boost (= 1.83.0) - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly (= 2022.05.16.00) - React-jsiexecutor (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly (= 2022.05.16.00) - React-cxxreact (= 0.73.8) @@ -986,7 +986,7 @@ PODS: - ReactCommon - React-rendererdebug (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - RCT-Folly (= 2022.05.16.00) - React-debug - React-rncore (0.73.8) @@ -1012,7 +1012,7 @@ PODS: - ReactCommon/turbomodule (= 0.73.8) - ReactCommon-Samples (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - RCT-Folly - React-Codegen - React-Core @@ -1023,7 +1023,7 @@ PODS: - ReactCommon - ReactCommon/turbomodule (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 0.73.8) @@ -1035,7 +1035,7 @@ PODS: - ReactCommon/turbomodule/core (= 0.73.8) - ReactCommon/turbomodule/bridging (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 0.73.8) @@ -1045,7 +1045,7 @@ PODS: - React-perflogger (= 0.73.8) - ReactCommon/turbomodule/core (0.73.8): - DoubleConversion - - fmt (~> 6.2.1) + - fmt (= 9.1.0) - glog - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 0.73.8) @@ -1065,6 +1065,7 @@ DEPENDENCIES: - DoubleConversion (from `../react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../react-native/React/FBReactNativeSpec`) + - fmt (from `../react-native/third-party-podspecs/fmt.podspec`) - glog (from `../react-native/third-party-podspecs/glog.podspec`) - OCMock (~> 3.9.1) - RCT-Folly (from `../react-native/third-party-podspecs/RCT-Folly.podspec`) @@ -1114,13 +1115,12 @@ DEPENDENCIES: - ReactCommon-Samples (from `../react-native/ReactCommon/react/nativemodule/samples`) - ReactCommon/turbomodule/core (from `../react-native/ReactCommon`) - ScreenshotManager (from `NativeModuleExample`) + - SocketRocket (from `../react-native/third-party-podspecs/SocketRocket.podspec`) - Yoga (from `../react-native/ReactCommon/yoga`) SPEC REPOS: trunk: - - fmt - OCMock - - SocketRocket EXTERNAL SOURCES: boost: @@ -1131,6 +1131,8 @@ EXTERNAL SOURCES: :path: "../react-native/Libraries/FBLazyVector" FBReactNativeSpec: :path: "../react-native/React/FBReactNativeSpec" + fmt: + :podspec: "../react-native/third-party-podspecs/fmt.podspec" glog: :podspec: "../react-native/third-party-podspecs/glog.podspec" RCT-Folly: @@ -1223,6 +1225,8 @@ EXTERNAL SOURCES: :path: "../react-native/ReactCommon/react/nativemodule/samples" ScreenshotManager: :path: NativeModuleExample + SocketRocket: + :podspec: "../react-native/third-party-podspecs/SocketRocket.podspec" Yoga: :path: "../react-native/ReactCommon/yoga" @@ -1231,10 +1235,10 @@ SPEC CHECKSUMS: DoubleConversion: 56bb181dd9093360c7cd027b592155b7f33eeb61 FBLazyVector: 0526cb6f8535f95130720d69bc9ed625be392b94 FBReactNativeSpec: cd81035e922b6c558728ad81e954ebad953c69d6 - fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 + fmt: bfe4e820dd96e7fde9e51e956fcdee44bd6df114 glog: 905b36b53c03b6e3afad8c8868237e84df8e17c4 - OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8 - RCT-Folly: 270f9eebb5a7d757382d0438ea993e4d7aa85932 + OCMock: 300b1b1b9155cb6378660b981c2557448830bdc6 + RCT-Folly: 7dd80816b9d4820bcad26a2e62c19c2b557531a6 RCTRequired: d3c6c7e483814fa538965961499b6539f8fc65fb RCTTypeSafety: 51632b725fe364e6663325185df8e87f1c4cf18e React: ab2b70e44e127aa2d76c43cabf7039796adfb2d8 @@ -1242,16 +1246,16 @@ SPEC CHECKSUMS: React-Codegen: 630bb8ebbeba4368e8763bdb2d4fe89d5f9b115f React-Core: 8524c3b04d093a652177cd8e3ce98fbafe7f5929 React-CoreModules: fbed4f81a6ca4b23e285456210084fec3e83612c - React-cxxreact: 83c4f8266822e130a2898f5f697dfa2d6e8b64b9 + React-cxxreact: 4f59d91c959ed81c37cf3eee6fd956767d6950dd React-debug: 62efeb8c8455801fb5548081d9934dcb08e410f0 - React-Fabric: 12827fdc2953a7d14640170b1a4f0921c0259d9a - React-FabricImage: 44be1ad74c7db27dcd82f01706f3629c9588eeeb + React-Fabric: 78c64258d71f0f2b89dc329f83d045ff95998806 + React-FabricImage: a0dce2f4bd4427d8d42ab5ae2200c36001f9a2e2 React-graphics: d6b03b35c595ec5c27a8721d4eff18440c8258a5 React-ImageManager: 4ce7edc9774c1d670c0c0086d43978f78987ce47 React-jsc: 5bef2b51e334b76481f7c74d1e93152860c0fe13 React-jserrorhandler: b1aca6af6b43053b3a2ff9d609bdce8e5fbb7ba8 - React-jsi: 34d5c83c2f058346aa3e9cad8b17bff577584b1d - React-jsiexecutor: a4f7403040508c1eb680cb2f2e7a0fb2335b9ee4 + React-jsi: 48727cce9043163a39b15aecfd604f021f9457a3 + React-jsiexecutor: 3aee1b1b9df12d62e4c4db0739a5ba595fd11366 React-jsinspector: 0a36e5d5ace0e7494208a8dbb49e322b9e17f471 React-logger: e5f66818947c9628d7fee559d385fc81d61f1da2 React-Mapbuffer: fae35991bccb1ffa6b64135a14637545c2930155 @@ -1271,15 +1275,15 @@ SPEC CHECKSUMS: React-RCTTest: 33510f150bb71034d27d05aab1d4eaf615c78b6e React-RCTText: 1cb1684a4638be1bd1a3312fa64a8d35464d4cdc React-RCTVibration: f38d5241dcffd547938c16feeed125d171f07e9b - React-rendererdebug: c3358c2a4a83257dfb2561af17e52350bd2ed7a3 + React-rendererdebug: 325ff79e4e5a3dfc58b5a2ee0ff972aedc0a72ec React-rncore: edaebc61f9fe2e200f5e5a6664acf7e1b7b699df React-runtimeexecutor: 5d60e5fb0bea1509ecb9757f013b345ecc37d49b React-runtimescheduler: acc91de6b5304ed736046e2d5df036b99e66a4ca React-utils: 01ecd50ae73a7e5275cb2c3298e650cc31bf5d5e - ReactCommon: 9abb67e5dcdbc3fd2e5f0c776497f0bb459b4783 - ReactCommon-Samples: 9f8d7da03e60688461eaca8dd797a29b3d33547f + ReactCommon: 36af1328f0f0ecd9054f2178484bf85a791cb853 + ReactCommon-Samples: 5179bb2b0fff5fb1d7edd3c7a538ca963817944e ScreenshotManager: b7521db0bb38052cee55c7fa9811ce55081f4055 - SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d + SocketRocket: 0c8713b5fd6abddb949e9ad04a7f320274f6e105 Yoga: addc2976fa66271744ce0c3dbe4b43d5de2043a3 PODFILE CHECKSUM: cfeda206bf8917b64b065521c6c7f81321a8f25b diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index 895ed82184b6fe..49ff3e0fbc2baf 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -1318,6 +1318,8 @@ OTHER_LDFLAGS = ( "-ObjC", "-lc++", + "-Wl", + "-ld_classic", ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../react-native"; SDKROOT = iphoneos; @@ -1402,6 +1404,8 @@ OTHER_LDFLAGS = ( "-ObjC", "-lc++", + "-Wl", + "-ld_classic", ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../react-native"; SDKROOT = iphoneos;