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

Don't deduplicate files in include with different paths but a same name #849

Merged
merged 3 commits into from Apr 29, 2020

Conversation

akkyie
Copy link
Contributor

@akkyie akkyie commented Apr 28, 2020

XcodeGen removes duplication among included files by their file names, not paths.
This could be problematic, when you want to define multiple targets in their respective specs:

- project.yml (root spec)
- Modules
 \- App
   \- targets.yml
   \- Sources
   \- Tests
 \- UI
   \- targets.yml
   \- Sources
   \- Tests
 \- Core
   \- targets.yml
   \- Sources
   \- Tests
...

When you include three targets.ymls from the project.yml, only the first in the include: list is actually included while the others are just ignored.

This changes that by allowing SpecFile use the full path of subspecs to merge them.
Test changes included.

Related: #599

Copy link
Owner

@yonaskolb yonaskolb left a comment

Choose a reason for hiding this comment

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

Thanks @akkyie!

@yonaskolb yonaskolb merged commit f3d2d09 into yonaskolb:master Apr 29, 2020
@akkyie akkyie deleted the include-same-name branch April 29, 2020 01:44
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.

None yet

2 participants