mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Mike Hardy
d493f45bd9
Summary: Patch release bumps that just change arm64 slice packaging See https://github.com/facebook/flipper/issues/3117#issuecomment-1123759397 These pods were just released by lblasa and this PR integrates them - I personally confirm success on an arm64 doing a macCatalyst build for the first time since react-native 0.64, and users report intel works fine as well - no regression ## Changelog [Catalyst][Fix] - use pods with arm64 macCatalyst slices Pull Request resolved: https://github.com/facebook/react-native/pull/33809 Test Plan: Run a macCatalyst build on intel machine and m1 machine, I use this harness as part of release-testers facebook group, and it exercises macCatalyst build if you pass in a valid development team (for signing) https://github.com/mikehardy/rnfbdemo/blob/main/make-demo.sh (the test harness is locally modified to no longer exclude M1 builds and with a patch-package that implements this PR, pending this merge+release...) Reviewed By: cortinico Differential Revision: D36339335 Pulled By: cipolleschi fbshipit-source-id: d4574fc960e6ff345b31a83ff4629e22edfcf2f7
95 lines
5.1 KiB
Ruby
95 lines
5.1 KiB
Ruby
# 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.
|
||
|
||
# Default versions of Flipper and related dependencies.
|
||
# Update this map to bump the dependencies.
|
||
$flipper_default_versions = {
|
||
'Flipper' => '0.125.0',
|
||
'Flipper-Boost-iOSX' => '1.76.0.1.11',
|
||
'Flipper-DoubleConversion' => '3.2.0.1',
|
||
'Flipper-Fmt' => '7.1.7',
|
||
'Flipper-Folly' => '2.6.10',
|
||
'Flipper-Glog' => '0.5.0.5',
|
||
'Flipper-PeerTalk' => '0.0.4',
|
||
'Flipper-RSocket' => '1.4.3',
|
||
'OpenSSL-Universal' => '1.1.1100',
|
||
}
|
||
|
||
# This function installs the `React-Core/DevSupport` subpods
|
||
# when the dependencies are installed for a non production app.
|
||
#
|
||
# @parameter production: a boolean that indicates whether we are in production or not.
|
||
# @parameter pathToReactNative: the path to the React Native installation
|
||
def install_flipper_dependencies(production, pathToReactNative)
|
||
unless production
|
||
pod 'React-Core/DevSupport', :path => "#{pathToReactNative}/"
|
||
end
|
||
end
|
||
|
||
|
||
# This function installs all the dependencies required by flipper.
|
||
#
|
||
# @parameter versions: a dictionary to specify a version of a dependencies. Default versions will be used if not specified
|
||
# @parameter configurations: an array of configurations to install the flipper dependencies. Defaults to ['Debug'].
|
||
def use_flipper_pods(versions = {}, configurations: ['Debug'])
|
||
versions['Flipper'] ||= $flipper_default_versions['Flipper']
|
||
versions['Flipper-Boost-iOSX'] ||= $flipper_default_versions['Flipper-Boost-iOSX']
|
||
versions['Flipper-DoubleConversion'] ||= $flipper_default_versions['Flipper-DoubleConversion']
|
||
versions['Flipper-Fmt'] ||= $flipper_default_versions['Flipper-Fmt']
|
||
versions['Flipper-Folly'] ||= $flipper_default_versions['Flipper-Folly']
|
||
versions['Flipper-Glog'] ||= $flipper_default_versions['Flipper-Glog']
|
||
versions['Flipper-PeerTalk'] ||= $flipper_default_versions['Flipper-PeerTalk']
|
||
versions['Flipper-RSocket'] ||= $flipper_default_versions['Flipper-RSocket']
|
||
versions['OpenSSL-Universal'] ||= $flipper_default_versions['OpenSSL-Universal']
|
||
pod 'FlipperKit', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/FlipperKitUserDefaultsPlugin', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/FlipperKitReactPlugin', versions['Flipper'], :configurations => configurations
|
||
# List all transitive dependencies for FlipperKit pods
|
||
# to avoid them being linked in Release builds
|
||
pod 'Flipper', versions['Flipper'], :configurations => configurations
|
||
pod 'Flipper-Boost-iOSX', versions['Flipper-Boost-iOSX'], :configurations => configurations
|
||
pod 'Flipper-DoubleConversion', versions['Flipper-DoubleConversion'], :configurations => configurations
|
||
pod 'Flipper-Fmt', versions['Flipper-Fmt'], :configurations => configurations
|
||
pod 'Flipper-Folly', versions['Flipper-Folly'], :configurations => configurations
|
||
pod 'Flipper-Glog', versions['Flipper-Glog'], :configurations => configurations
|
||
pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configurations => configurations
|
||
pod 'Flipper-RSocket', versions['Flipper-RSocket'], :configurations => configurations
|
||
pod 'FlipperKit/Core', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/CppBridge', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/FBCxxFollyDynamicConvert', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/FBDefines', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/FKPortForwarding', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/FlipperKitHighlightOverlay', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/FlipperKitLayoutTextSearchable', versions['Flipper'], :configurations => configurations
|
||
pod 'FlipperKit/FlipperKitNetworkPlugin', versions['Flipper'], :configurations => configurations
|
||
pod 'OpenSSL-Universal', versions['OpenSSL-Universal'], :configurations => configurations
|
||
end
|
||
|
||
# Applies some changes to some pods of the project:
|
||
# * it sets the Swift version for Yoga kit to 4.1
|
||
# * it sets the sonar-kit flag to React-Core pod
|
||
#
|
||
# @parameter installer: the installer object used to install the pods.
|
||
def flipper_post_install(installer)
|
||
installer.pods_project.targets.each do |target|
|
||
if target.name == 'YogaKit'
|
||
target.build_configurations.each do |config|
|
||
config.build_settings['SWIFT_VERSION'] = '4.1'
|
||
end
|
||
end
|
||
|
||
# Enable flipper for React-Core Debug configuration
|
||
if target.name == 'React-Core'
|
||
target.build_configurations.each do |config|
|
||
if config.name == 'Debug'
|
||
config.build_settings['OTHER_CFLAGS'] = "$(inherited) -DFB_SONARKIT_ENABLED=1"
|
||
end
|
||
end
|
||
end
|
||
end
|
||
end
|