@@ -51,14 +51,6 @@ def platform_config(key, project_root, target_platform)
5151  config [ key ]  if  !config . nil?  && !config . empty? 
5252end 
5353
54- def  flipper_enabled? 
55-   @flipper_versions  != false 
56- end 
57- 
58- def  flipper_versions 
59-   @flipper_versions  != false  && ( @flipper_versions  || { } ) 
60- end 
61- 
6254def  nearest_node_modules ( project_root ) 
6355  path  =  find_file ( 'node_modules' ,  project_root ) 
6456  assert ( !path . nil? ,  "Could not find 'node_modules'" ) 
@@ -194,10 +186,6 @@ def resources_pod(project_root, target_platform, platforms)
194186  Pathname . new ( app_dir ) . relative_path_from ( project_root ) . to_s 
195187end 
196188
197- def  use_flipper! ( versions  =  { } ) 
198-   @flipper_versions  =  versions 
199- end 
200- 
201189def  use_react_native! ( project_root ,  target_platform ,  options ) 
202190  react_native  =  react_native_path ( project_root ,  target_platform ) 
203191  version  =  package_version ( react_native . to_s ) . segments 
@@ -208,9 +196,7 @@ def use_react_native!(project_root, target_platform, options)
208196  include_react_native! ( **options , 
209197                        app_path : find_file ( 'package.json' ,  project_root ) . parent . to_s , 
210198                        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 ) 
214200end 
215201
216202def  make_project! ( xcodeproj ,  project_root ,  target_platform ,  options ) 
@@ -315,7 +301,6 @@ def make_project!(xcodeproj, project_root, target_platform, options)
315301  build_number  =  platform_config ( 'buildNumber' ,  project_root ,  target_platform ) 
316302  build_settings [ 'PRODUCT_BUILD_NUMBER' ]  =  build_number  || '1' 
317303
318-   supports_flipper  =  target_platform  == :ios  && flipper_enabled? 
319304  use_fabric  =  fabric_enabled? ( options ,  rn_version ) 
320305  use_turbomodule  =  new_architecture_enabled? ( options ,  rn_version ) 
321306
@@ -332,19 +317,13 @@ def make_project!(xcodeproj, project_root, target_platform, options)
332317        ( rn_version  >= v ( 0 ,  71 ,  0 )  && rn_version  < v ( 0 ,  71 ,  4 ) )  ||
333318        ( rn_version . positive?  && rn_version  < v ( 0 ,  70 ,  14 ) ) 
334319      target . build_configurations . each  do  |config |
335-         use_flipper  =  config . name  == 'Debug'  && supports_flipper 
336- 
337320        config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ]  ||= [ '$(inherited)' ] 
338321        config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ]  << version_macro 
339322        config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ]  << 'USE_FABRIC=1'  if  use_fabric 
340323        if  enable_cxx17_removed_unary_binary_function 
341324          config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ]  <<
342325            '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION=1' 
343326        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 
348327        if  use_turbomodule 
349328          config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ]  << 'FOLLY_NO_CONFIG=1' 
350329          config . build_settings [ 'GCC_PREPROCESSOR_DEFINITIONS' ]  << 'RCT_NEW_ARCH_ENABLED=1' 
@@ -357,10 +336,6 @@ def make_project!(xcodeproj, project_root, target_platform, options)
357336
358337        config . build_settings [ 'OTHER_SWIFT_FLAGS' ]  ||= [ '$(inherited)' ] 
359338        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 
364339        config . build_settings [ 'OTHER_SWIFT_FLAGS' ]  << '-DUSE_TURBOMODULE'  if  use_turbomodule 
365340        if  single_app . is_a?  String 
366341          config . build_settings [ 'OTHER_SWIFT_FLAGS' ]  << '-DENABLE_SINGLE_APP_MODE' 
@@ -455,11 +430,6 @@ def use_test_app_internal!(target_platform, options)
455430
456431    installer . pods_project . targets . each  do  |target |
457432      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 
463433      when  /\A React/ 
464434        target . build_configurations . each  do  |config |
465435          # Xcode 10.2 requires suppression of nullability for React 
0 commit comments