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.

Sign up for GitHub

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

Jump to bottom

New Kotlin formatting options #49

Merged
merged 2 commits into from
Jan 24, 2018
Merged

New Kotlin formatting options #49

merged 2 commits into from
Jan 24, 2018

Conversation

zach-klippenstein
Copy link
Contributor

  • Applied the default settings from the Kotlin style guide using the new plugin with more formatting support.
  • Tweaked the settings a bit to match our existing style better.

image

@JakeWharton
Copy link
Member

Update both styles? Or maybe just delete the Android-specific one and unify them...

@zach-klippenstein
Copy link
Contributor Author

I'll apply the kotlin stuff to both files for now – merging them is going to have a larger impact so I'll leave that for another PR.

@JakeWharton
Copy link
Member

👍

I already have #45 filed for merging the two. Just hoping for a volunteer.

@zach-klippenstein
Tweaked the newly-default Kotlin style to match our existing style more.
1101389 
Also copied the Kotlin style settings to the non-Android config.
@zach-klippenstein
Copy link
Contributor Author

I've copied the kotlin changes into the non-Android file.

@swankjesse swankjesse merged commit c49cefb into square:master Jan 24, 2018
@zach-klippenstein zach-klippenstein deleted the zachklipp/kotlin branch January 31, 2018 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@zach-klippenstein @JakeWharton @swankjesse