Skip to content

Merge xcconfig files #1042

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

Merged
merged 1 commit into from
Oct 12, 2015
Merged

Merge xcconfig files #1042

merged 1 commit into from
Oct 12, 2015

Conversation

jasssonpet
Copy link
Contributor

@ns-bot
Copy link

ns-bot commented Oct 9, 2015

Test PASSed.

@jasssonpet
Copy link
Contributor Author

Some relative paths in the xcconfig files would get messed up now, with the merge strategy.

this.$fs.deleteFile(this.pluginsDebugXcconfigFilePath).wait();
this.$fs.deleteFile(this.pluginsReleaseXcconfigFilePath).wait();

let allPlugins: IPluginData[] = (<IPluginsService>this.$injector.resolve("pluginsService")).getAllInstalledPlugins().wait();
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we use constructor injection?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There were some circular dependencies.

@Fatme
Copy link
Contributor

Fatme commented Oct 12, 2015

👍

jasssonpet added a commit that referenced this pull request Oct 12, 2015
@jasssonpet jasssonpet merged commit 331e33b into master Oct 12, 2015
@jasssonpet jasssonpet deleted the merge-xcconfigs branch October 12, 2015 08:08
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.

3 participants