@@ -51,14 +51,6 @@ def platform_config(key, project_root, target_platform)
51
51
config [ key ] if !config . nil? && !config . empty?
52
52
end
53
53
54
- def flipper_enabled?
55
- @flipper_versions != false
56
- end
57
-
58
- def flipper_versions
59
- @flipper_versions != false && ( @flipper_versions || { } )
60
- end
61
-
62
54
def nearest_node_modules ( project_root )
63
55
path = find_file ( 'node_modules' , project_root )
64
56
assert ( !path . nil? , "Could not find 'node_modules'" )
@@ -194,10 +186,6 @@ def resources_pod(project_root, target_platform, platforms)
194
186
Pathname . new ( app_dir ) . relative_path_from ( project_root ) . to_s
195
187
end
196
188
197
- def use_flipper! ( versions = { } )
198
- @flipper_versions = versions
199
- end
200
-
201
189
def use_react_native! ( project_root , target_platform , options )
202
190
react_native = react_native_path ( project_root , target_platform )
203
191
version = package_version ( react_native . to_s ) . segments
@@ -208,9 +196,7 @@ def use_react_native!(project_root, target_platform, options)
208
196
include_react_native! ( **options ,
209
197
app_path : find_file ( 'package.json' , project_root ) . parent . to_s ,
210
198
path : react_native . relative_path_from ( project_root ) . to_s ,
211
- rta_flipper_versions : flipper_versions ,
212
- rta_project_root : project_root ,
213
- rta_target_platform : target_platform )
199
+ rta_project_root : project_root )
214
200
end
215
201
216
202
def make_project! ( xcodeproj , project_root , target_platform , options )
@@ -315,7 +301,6 @@ def make_project!(xcodeproj, project_root, target_platform, options)
315
301
build_number = platform_config ( 'buildNumber' , project_root , target_platform )
316
302
build_settings [ 'PRODUCT_BUILD_NUMBER' ] = build_number || '1'
317
303
318
- supports_flipper = target_platform == :ios && flipper_enabled?
319
304
use_fabric = fabric_enabled? ( options , rn_version )
320
305
use_turbomodule = new_architecture_enabled? ( options , rn_version )
321
306
@@ -332,19 +317,13 @@ def make_project!(xcodeproj, project_root, target_platform, options)
332
317
( rn_version >= v ( 0 , 71 , 0 ) && rn_version < v ( 0 , 71 , 4 ) ) ||
333
318
( rn_version . positive? && rn_version < v ( 0 , 70 , 14 ) )
334
319
target . build_configurations . each do |config |
335
- use_flipper = config . name == 'Debug' && supports_flipper
336
-
337
320
config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ] ||= [ '$(inherited)' ]
338
321
config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ] << version_macro
339
322
config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ] << 'USE_FABRIC=1' if use_fabric
340
323
if enable_cxx17_removed_unary_binary_function
341
324
config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ] <<
342
325
'_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION=1'
343
326
end
344
- if use_flipper
345
- config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ] << 'FB_SONARKIT_ENABLED=1'
346
- config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ] << 'USE_FLIPPER=1'
347
- end
348
327
if use_turbomodule
349
328
config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ] << 'FOLLY_NO_CONFIG=1'
350
329
config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ] << 'RCT_NEW_ARCH_ENABLED=1'
@@ -357,10 +336,6 @@ def make_project!(xcodeproj, project_root, target_platform, options)
357
336
358
337
config . build_settings [ 'OTHER_SWIFT_FLAGS' ] ||= [ '$(inherited)' ]
359
338
config . build_settings [ 'OTHER_SWIFT_FLAGS' ] << '-DUSE_FABRIC' if use_fabric
360
- if use_flipper
361
- config . build_settings [ 'OTHER_SWIFT_FLAGS' ] << '-DFB_SONARKIT_ENABLED'
362
- config . build_settings [ 'OTHER_SWIFT_FLAGS' ] << '-DUSE_FLIPPER'
363
- end
364
339
config . build_settings [ 'OTHER_SWIFT_FLAGS' ] << '-DUSE_TURBOMODULE' if use_turbomodule
365
340
if single_app . is_a? String
366
341
config . build_settings [ 'OTHER_SWIFT_FLAGS' ] << '-DENABLE_SINGLE_APP_MODE'
@@ -455,11 +430,6 @@ def use_test_app_internal!(target_platform, options)
455
430
456
431
installer . pods_project . targets . each do |target |
457
432
case target . name
458
- when /\A Flipper/ , 'libevent'
459
- target . build_configurations . each do |config |
460
- # Flipper and its dependencies log too many warnings
461
- config . build_settings [ 'WARNING_CFLAGS' ] = [ '-w' ]
462
- end
463
433
when /\A React/
464
434
target . build_configurations . each do |config |
465
435
# Xcode 10.2 requires suppression of nullability for React
0 commit comments