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

Make use of --new-resolver flag in bootstrap command #2486

Merged
merged 1 commit into from
Jun 14, 2018

Conversation

tmspzz
Copy link
Member

@tmspzz tmspzz commented Jun 14, 2018

No description provided.

@tmspzz tmspzz requested a review from jdhealy June 14, 2018 08:09
@@ -17,7 +17,9 @@ public struct BootstrapCommand: CommandProtocol {
if !FileManager.default.fileExists(atPath: project.resolvedCartfileURL.path) {
let formatting = options.checkoutOptions.colorOptions.formatting
carthage.println(formatting.bullets + "No Cartfile.resolved found, updating dependencies")
return project.updateDependencies(shouldCheckout: options.checkoutAfterUpdate, buildOptions: options.buildOptions)
return project.updateDependencies(shouldCheckout: options.checkoutAfterUpdate,
useNewResolver: options.useNewResolver,
Copy link
Member Author

Choose a reason for hiding this comment

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

No idea why it looks like this on Github, looks fine in Xcode.

Copy link
Member

@ikesyo ikesyo Jun 14, 2018

Choose a reason for hiding this comment

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

No idea why it looks like this on Github, looks fine in Xcode.

That's because GitHub treats a tab as 8 spaces by default. You can change that by ?ts=4 or ts=2 query.

By the way I think this should be formatted like this:

return project.updateDependencies(
	shouldCheckout: options.checkoutAfterUpdate,
	useNewResolver: options.useNewResolver,
	buildOptions: options.buildOptions
)

@tmspzz tmspzz force-pushed the fix/bootstrap-resolver-flag branch from 7438ad0 to b0eef3b Compare June 14, 2018 08:28
@tmspzz
Copy link
Member Author

tmspzz commented Jun 14, 2018

@ikesyo Done

Copy link
Member

@ikesyo ikesyo left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@mdiep mdiep merged commit 341a46d into Carthage:master Jun 14, 2018
@tmspzz tmspzz deleted the fix/bootstrap-resolver-flag branch June 14, 2018 13:29
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