Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .ado/Brewfile
Original file line number Diff line number Diff line change
@@ -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"
160 changes: 0 additions & 160 deletions .ado/Brewfile.lock.json

This file was deleted.

4 changes: 0 additions & 4 deletions .ado/ado-test-cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 19 additions & 1 deletion .ado/templates/apple-tools-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/React-Fabric.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/ReactCommon.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/jsi/React-jsi.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion packages/react-native/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/scripts/react_native_pods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
30 changes: 30 additions & 0 deletions packages/react-native/third-party-podspecs/SocketRocket.podspec
Original file line number Diff line number Diff line change
@@ -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' => '[email protected]', 'Dan Federman' => '[email protected]', 'Mike Lewis' => '[email protected]' }
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
25 changes: 25 additions & 0 deletions packages/react-native/third-party-podspecs/fmt.podspec
Original file line number Diff line number Diff line change
@@ -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
Loading