Bugfix: settings override on occasion (v. 2.14.0) #812
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
March 21, 2020 20:52
yonaskolb
reviewed
Mar 22, 2020
| @@ -81,7 +81,7 @@ extension Project { | |||
| buildSettings += settings.buildSettings | |||
|
|
|||
| for (configVariant, settings) in settings.configSettings { | |||
| let isPartialMatch = config.name.lowercased().contains(configVariant.lowercased()) | |||
| let isPartialMatch = config.name.lowercased().split(separator: " ").contains(Substring(configVariant.lowercased())) | |||
There was a problem hiding this comment.
As far as I can see this would be a breaking change, as putting stag for Staging Release would now fail, as this is now matching whole words instead of any substring.
We could change this so it finds a config in the following order:
- an exact match
- matching a word (space delimited)
- any substring
There was a problem hiding this comment.
Got your point, thank you! I'll update the fix and add extra tests to cover this scenario as soon as have time.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
On our project we have to use build configurations with prefixed names (e. g. Test and ABTest), and it leads to a situation, when ABTest build settings are overridden with Test ones.
Solution
Updated
getBuildSettingsfunction ofProjectto take this edge case into consideration.Unit testing note
As
getBuildSettingsresult depends onsettings.configSettingsenumeration order, which is undefined, sometimes this function works correctly even without a provided fix. So, added unit test case may not fail on old implementation from time to time.