Skip to content

chore: merge release into master #4577

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 2, 2019
Merged

chore: merge release into master #4577

merged 8 commits into from
May 2, 2019

Conversation

Fatme
Copy link
Contributor

@Fatme Fatme commented May 2, 2019

PR Checklist

What is the current behavior?

What is the new behavior?

Fixes/Implements/Closes #[Issue Number].

rosen-vladimirov and others added 8 commits April 23, 2019 09:49
    Currently CLI merges and prepares xcconfig files only for the current build configuration, i.e. debug or release. However, the `pod install` command works with both configurations. This leads to problem when some property is set in the project's (plugin's) build.xcconfig file as CLI will prepare the native iOS project only for one configuration. When `pod install` is executed, if the Pods project uses the property set in the build.xcconfig file, it will fail with error, as the value for debug and release will be different (i.e. it will be set only for one of them). Pods project does not support this behavior, so the build operation fails.

    So, ensure CLI merges all xcconfig files for both debug and release configurations. This way, the Pods project will be in sync, so it should continue its execution. This is important when using Cocoapods 1.6.0+ where some changes are applied for Swift support, which can be workarounded by setting SWIFT_VERSION in project's build.xcconfig file.
…g-all-configs

fix: prepare xcconfig files for all conigurations
chore: add changelog for 5.3.3 and 5.3.4
chore: add changelog for 5.3.1 release
# Conflicts:
#	npm-shrinkwrap.json
#	package.json
@ghost ghost assigned Fatme May 2, 2019
@ghost ghost added the new PR label May 2, 2019
@cla-bot cla-bot bot added the cla: yes label May 2, 2019
@Fatme Fatme merged commit 646f7a7 into master May 2, 2019
@Fatme Fatme deleted the fatme/merge-release-5.3.4 branch May 2, 2019 10:30
@ghost ghost removed the new PR label May 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants