Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[Local] Xcode 15 patch #39754

Merged
merged 2 commits into from
Oct 4, 2023
Merged

[Local] Xcode 15 patch #39754

merged 2 commits into from
Oct 4, 2023

Conversation

fortmarek
Copy link
Contributor

Summary:

Applying this PR from @cipolleschi. We couldn't directly cherry-pick as the files have moved, so doing this to be safe.

Changelog:

[Internal] [Fixed] - Make the Xcode 15 workaround more robust.

Test Plan:

Try out rn-tester with Xcode 15.

@fortmarek fortmarek requested a review from cipolleschi October 2, 2023 16:55
@facebook-github-bot facebook-github-bot added CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. p: Shopify Partner: Shopify Partner labels Oct 2, 2023
Copy link
Contributor

@cipolleschi cipolleschi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: the grammar fix was not picked up, but a part from that, it is good!


trimmed_value = value.strip()
if !old_config.include?(trimmed_value)
config.build_settings[setting_name] = "#{old_config.strip()} #{trimmed_value}".strip()
end
end

def self.remove_value_to_setting_if_present(config, setting_name, value)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
def self.remove_value_to_setting_if_present(config, setting_name, value)
def self.remove_value_from_setting_if_present(config, setting_name, value)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

@cipolleschi
Copy link
Contributor

You might want to run pod update hermes-engine --no-repo-update to fix the errors in CI, though.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. p: Shopify Partner: Shopify Partner
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants