From 735f4ed62a565a30e91624ecc58525f2a0a7216c Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Tue, 5 Sep 2023 04:08:02 -0700 Subject: [PATCH] Fix use_hermes condition in React-Core (#39262) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/39262 The use_hermes condition in React core was imprecise as using hermes is the default now. So, if USE_HERMES is not defined, then we are using hermes. ## Changelog: [iOS][Fixed] - Use the right condition in React-Core for USE_HERMES. Reviewed By: dmytrorykun Differential Revision: D48907854 fbshipit-source-id: daeaa1782f23e0ab3992240e70f49ff0b2fd75de --- packages/react-native/React-Core.podspec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-native/React-Core.podspec b/packages/react-native/React-Core.podspec index 0b406e8f7ed633..115aa4e9aab95e 100644 --- a/packages/react-native/React-Core.podspec +++ b/packages/react-native/React-Core.podspec @@ -21,7 +21,7 @@ folly_version = '2021.07.22.00' socket_rocket_version = '0.6.0' boost_compiler_flags = '-Wno-documentation' -use_hermes = ENV['USE_HERMES'] == '1' +use_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1' use_frameworks = ENV['USE_FRAMEWORKS'] != nil header_subspecs = { @@ -95,7 +95,7 @@ Pod::Spec.new do |s| ] # If we are using Hermes (the default is use hermes, so USE_HERMES can be nil), we don't have jsc installed # So we have to exclude the JSCExecutorFactory - if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1" + if use_hermes exclude_files = exclude_files.append("React/CxxBridge/JSCExecutorFactory.{h,mm}") end ss.exclude_files = exclude_files @@ -136,10 +136,10 @@ Pod::Spec.new do |s| s.dependency "Yoga" s.dependency "glog" - if ENV['USE_HERMES'] == "0" - s.dependency 'React-jsc' - else + if use_hermes s.dependency 'React-hermes' s.dependency 'hermes-engine' + else + s.dependency 'React-jsc' end end