mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
1bc9ddbce3
Summary: Fixed Flipper not recognizing app when using custom Xcode configuration names. This fixes the problem that renaming the "Debug" Xcode configuration causes Flipper to not work. Despite using the recommended `:configurations` parameters and instructing Cocoapods that it was a debug build (see https://github.com/facebook/react-native/issues/34332), it still wouldn't recognize the app due to missing C preprocessor flags, specifically it was missing `-DFB_SONARKIT_ENABLED=1`. ## Changelog <!-- Help reviewers and the release process by writing your own changelog entry. For an example, see: https://github.com/facebook/react-native/wiki/Changelog --> [General] [Fixed] - Flipper now supports custom Xcode build configuration names Pull Request resolved: https://github.com/facebook/react-native/pull/34333 Test Plan: I applied the PR change to 0.68.2 (which work similarly but code was refactored since then). I then used `patch-package` to test the change and the fix worked on 2 separate projects. Patch-package change equivalent: ```diff diff --git a/node_modules/react-native/scripts/react_native_pods.rb b/node_modules/react-native/scripts/react_native_pods.rb index f2ceeda..2ea57d6 100644 --- a/node_modules/react-native/scripts/react_native_pods.rb +++ b/node_modules/react-native/scripts/react_native_pods.rb @@ -180,7 +180,7 @@ def flipper_post_install(installer) # Enable flipper for React-Core Debug configuration if target.name == 'React-Core' target.build_configurations.each do |config| - if config.name == 'Debug' + if config.debug? config.build_settings['OTHER_CFLAGS'] = "$(inherited) -DFB_SONARKIT_ENABLED=1" end end ``` **Screen shot of Xcode after the patch has been applied, for RN v0.68.2:**  Reviewed By: dmitryrykun Differential Revision: D38373812 Pulled By: cipolleschi fbshipit-source-id: d2949927084160bf0c6f8af37a7966dd22fea9a6
119 lines
5.7 KiB
Ruby
119 lines
5.7 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(pathToReactNative)
|
||
pod 'React-Core/DevSupport', :path => "#{pathToReactNative}/"
|
||
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.debug?
|
||
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = ['$(inherited)', 'FB_SONARKIT_ENABLED=1']
|
||
end
|
||
end
|
||
end
|
||
end
|
||
end
|
||
|
||
class FlipperConfiguration
|
||
attr_reader :flipper_enabled
|
||
attr_reader :configurations
|
||
attr_reader :versions
|
||
|
||
def initialize(flipper_enabled, configurations, versions)
|
||
@flipper_enabled = flipper_enabled
|
||
@configurations = configurations
|
||
@versions = versions
|
||
end
|
||
|
||
def self.enabled(configurations = ["Debug"], versions = {})
|
||
FlipperConfiguration.new(true, configurations, versions)
|
||
end
|
||
|
||
def self.disabled
|
||
FlipperConfiguration.new(false, [], {})
|
||
end
|
||
|
||
def == (other)
|
||
return @flipper_enabled == other.flipper_enabled &&
|
||
@configurations == other.configurations &&
|
||
@versions == other.versions
|
||
end
|
||
end
|