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

CB-14141: Don't duplicate resource files in xcodeproj #373

Merged
merged 1 commit into from
Sep 2, 2018

Conversation

dpogue
Copy link
Member

@dpogue dpogue commented Jun 17, 2018

Platforms affected

iOS

What does this PR do?

When copying a resource-file to a target that already exists, don't add it to the xcodeproj file a second time.

My particular scenario is that I wanted to overwrite CDVLaunchScreen.storyboard and it was getting added to the xcodeproj twice and causing weird failures.

What testing has been done on this change?

Checklist

  • Reported an issue in the JIRA database
  • Commit message follows the format
  • Added automated test coverage as appropriate for this change.

@dpogue dpogue requested a review from shazron June 17, 2018 05:18
@codecov-io
Copy link

codecov-io commented Jun 17, 2018

Codecov Report

Merging #373 into master will increase coverage by 0.04%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #373      +/-   ##
==========================================
+ Coverage   63.99%   64.03%   +0.04%     
==========================================
  Files          14       14              
  Lines        1697     1699       +2     
  Branches      286      287       +1     
==========================================
+ Hits         1086     1088       +2     
  Misses        611      611
Impacted Files Coverage Δ
bin/templates/scripts/cordova/lib/prepare.js 84.72% <100%> (+0.06%) ⬆️

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 46da4bc...e2c885f. Read the comment docs.

Copy link
Member

@jcesarmobile jcesarmobile left a comment

Choose a reason for hiding this comment

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

LGTM

@janpio janpio merged commit ad96ef0 into apache:master Sep 2, 2018
@dpogue dpogue deleted the resouce-file-overwrite branch March 6, 2019 05:04
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.

5 participants