-
Notifications
You must be signed in to change notification settings - Fork 454
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
#221 Fixed handling of xcdatamodeld packages in subfolders #427
Conversation
Could you add test coverage and a CHANGELOG entry for this fix? Thanks! |
@segiddins done. I've tested the test case with and without my changes. With my changes it succeeded, without it failed. I'm not really experienced in Ruby so please let me know if there is anything I could improve. Thanks! |
@@ -12,6 +12,9 @@ | |||
[Danielle Tomlinson](https://github.com/dantoml) | |||
[#421](https://github.com/CocoaPods/Xcodeproj/pull/421) | |||
|
|||
* Fixed handling of xcdatamodeld packages in subfolders. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please add two spaces to the end of this? i.e * Fixed handling of xcdatamodeld packages in subfolders.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, done!
Finally the travis build finished (they had some incident that caused the delay) |
👍 |
This fixes issue #221.
The PR #291 from @adamhrz unfortunately only works when the model is one folder deep in the hierarchy. As soon as it is located on a deeper level (e.g.
Source/CoreData/Model.xcdatamodeld
), PR #291 leads to a crash.The underlying issue was that the
path
is relative to thegroup
but was handled as it would be absolute. I just joined the absolute/real path of thegroup
with thepath
to create the correctreal_path
.