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

Add .gitattributes to make spotlessApply work on Windows #691

Merged
merged 8 commits into from
Jan 19, 2023
Merged

Add .gitattributes to make spotlessApply work on Windows #691

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2bd57aa
Add gitattributes to make Spotless work on Windows.
TWiStErRob Jan 19, 2023
c644889
Add gradlew.bat support
TWiStErRob Jan 19, 2023
aa03d2e
Add binary support
TWiStErRob Jan 19, 2023
808ae23
Reorder for easier understanding
TWiStErRob Jan 19, 2023
34dd250
Be more explicit
TWiStErRob Jan 19, 2023
670b86f
Removed the wrapper customization, since Paparazzi is not using the "…
TWiStErRob Jan 19, 2023
c2d9a95
Code review
TWiStErRob Jan 19, 2023
b19ca5d
Revert "Removed the wrapper customization, since Paparazzi is not usi…
TWiStErRob Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Source code
*.kt text eol=lf
TWiStErRob marked this conversation as resolved.
Show resolved Hide resolved
*.java text eol=lf
*.xml text eol=lf

# Gradle files
*.gradle text eol=lf
*.properties text eol=lf
*.bat text eol=crlf
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Something is fishy still, even after resetting gradlew.bat keeps changing, any ideas welcome.

I tried autocrlf=true and false, and then reset, but no luck.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Re-cloned and all good, but I was able to reproduce it with the code here: https://stackoverflow.com/q/48642692/253468

This however fixes it: https://stackoverflow.com/a/19588910/253468

Right now it's above my git abilities, but it should be fine considering retrofit uses the same file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was solved in: #721


# GitHub stuff
*.md text eol=lf
*.yml text eol=lf

# Binaries
*.png binary
*.jar binary
4 changes: 0 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,3 @@ subprojects {
tasks.register("clean", Delete).configure {
delete rootProject.buildDir
}

tasks.named("wrapper").configure {
distributionType = Wrapper.DistributionType.ALL
TWiStErRob marked this conversation as resolved.
Show resolved Hide resolved
}