Skip to content
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

Build settings have the same values repeated multiple times #391

Merged
merged 4 commits into from Jun 5, 2019

Conversation

platonsi
Copy link
Contributor

@platonsi platonsi commented Jun 5, 2019

Resolves #390

Short description 📝

The DefaultSettingsProvider targetSettings combines the build settings for the specified build variant with the build settings for variants. If there is a common build setting with $(inherited) in its value, the value is appended twice.

Solution 📦

In the SettingsHelper before combining build settings by appending the new value to the existing one check if the value are equal

Implementation 👩‍💻👨‍💻

  • Change SettingsHelper to check if setting values are equal before appending
  • Add unit test to cover this case

Test Plan 🛠

  • Verify unit tests pass via swift tests

@tuistbot
Copy link
Contributor

tuistbot commented Jun 5, 2019

1 Warning
⚠️ Have you introduced any user-facing changes? If so, please take some time to update the documentation. Keeping the documentation up to date makes it easier for users to learn how to use Tuist.

Generated by 🚫 Danger

@codecov
Copy link

codecov bot commented Jun 5, 2019

Codecov Report

Merging #391 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #391      +/-   ##
==========================================
+ Coverage   92.16%   92.16%   +<.01%     
==========================================
  Files         291      291              
  Lines       14585    14605      +20     
==========================================
+ Hits        13442    13461      +19     
- Misses       1143     1144       +1
Impacted Files Coverage Δ
...rTests/Settings/DefaultSettingsProviderTests.swift 100% <ø> (ø) ⬆️
Sources/TuistGenerator/Utils/SettingsHelper.swift 100% <100%> (ø) ⬆️
...uistGeneratorTests/Utils/SettingsHelperTests.swift 100% <100%> (ø) ⬆️
Sources/TuistGenerator/Graph/Graph.swift 95.31% <0%> (-0.43%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e48cf6d...e7eb36f. Read the comment docs.

Copy link
Collaborator

@kwridan kwridan left a comment

Choose a reason for hiding this comment

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

👍 thanks for submitting this - just a minor comment regarding the change log

CHANGELOG.md Outdated
@@ -19,6 +19,7 @@ Please, check out guidelines: https://keepachangelog.com/en/1.0.0/

### Fixed

- Fixing build settings repeated same value https://github.com/tuist/tuist/pull/391 @platonsi
Copy link
Collaborator

Choose a reason for hiding this comment

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

oops, looks like the entry was added under the previous version, this can go to the Next Version section. Pulling in the latest master should include Fixed section from yesterday

@kwridan kwridan merged commit f0c5b59 into tuist:master Jun 5, 2019
@kwridan kwridan deleted the bugs/buildSettings branch June 5, 2019 12:44
@pepicrft
Copy link
Contributor

pepicrft commented Jun 5, 2019

Thanks for fixing this @platonsi

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build settings have the same values repeated multiple times
4 participants