From 33e19a9ad9c75cf5dcf3cbdd394935641eb51a61 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Thu, 22 Sep 2022 14:09:23 +0100 Subject: [PATCH] fix: pick up variables from podspec if they are not define in env vars --- sdks/hermes-engine/utils/build-apple-framework.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sdks/hermes-engine/utils/build-apple-framework.sh b/sdks/hermes-engine/utils/build-apple-framework.sh index bfd24dcbb2290f..42ae03422492d8 100755 --- a/sdks/hermes-engine/utils/build-apple-framework.sh +++ b/sdks/hermes-engine/utils/build-apple-framework.sh @@ -15,16 +15,24 @@ IMPORT_HERMESC_PATH=${HERMES_OVERRIDE_HERMESC_PATH:-$PWD/build_host_hermesc/Impo REACT_NATIVE_PATH=${REACT_NATIVE_PATH:-$PWD/../..} JSI_PATH="$REACT_NATIVE_PATH/ReactCommon/jsi" +function use_env_var_or_ruby_prop { + if [[ -n "$1" ]]; then + echo "$1" + else + ruby -rcocoapods-core -rjson -e "puts Pod::Specification.from_file('hermes-engine.podspec').$2" + fi +} + function get_release_version { - echo "${RELEASE_VERSION}" + use_env_var_or_ruby_prop "${RELEASE_VERSION}" "version" } function get_ios_deployment_target { - echo "${IOS_DEPLOYMENT_TARGET}" + use_env_var_or_ruby_prop "${IOS_DEPLOYMENT_TARGET}" "deployment_target('ios')" } function get_mac_deployment_target { - echo "${MAC_DEPLOYMENT_TARGET}" + use_env_var_or_ruby_prop "${MAC_DEPLOYMENT_TARGET}" "deployment_target('osx')" } # Build host hermes compiler for internal bytecode