Skip to content

Avoid line endings conversion of gradlew.bat#944

Merged
tyler-whitman merged 1 commit intohelium:mainfrom
friederbluemle:fix-line-endings
Sep 20, 2021
Merged

Avoid line endings conversion of gradlew.bat#944
tyler-whitman merged 1 commit intohelium:mainfrom
friederbluemle:fix-line-endings

Conversation

@friederbluemle
Copy link
Copy Markdown
Contributor

@friederbluemle friederbluemle commented Sep 19, 2021

A fresh clone of this repo shows the file gradlew.bat as modified:

$ git clone https://github.com/helium/hotspot-app.git && cd hotspot-app/
// ...
$ git status
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   android/gradlew.bat

The reason is a configuration which will convert line endings when the file is placed in the working directory. This conversion in unnecessary, as the file gradlew.bat is generated by Gradle's wrapper task with the correct line endings. It should not be modified manually. This has already been fixed on react-native's main branch: facebook/react-native#31398

@tyler-whitman
Copy link
Copy Markdown
Contributor

tyler-whitman commented Sep 20, 2021

@friederbluemle thanks for this change. It looks like they ended up going with facebook/react-native#32178 so maybe these files should remain?

We could update react native and pull those changes in to resolve this issue I believe.

@friederbluemle
Copy link
Copy Markdown
Contributor Author

friederbluemle commented Sep 20, 2021

@friederbluemle thanks for this change. It looks like they ended up going with facebook/react-native#32178 so maybe these files should remain?

We could update react native and pull those changes in to resolve this issue I believe.

The PR you referenced only fixed the gradlew.bat line endings in React Native's repo. The files in your repository are already correct, so no conversion is necessary.

@tyler-whitman
Copy link
Copy Markdown
Contributor

tyler-whitman commented Sep 20, 2021

@friederbluemle thanks for this change. It looks like they ended up going with facebook/react-native#32178 so maybe these files should remain?
We could update react native and pull those changes in to resolve this issue I believe.

The PR you referenced only fixed the gradlew.bat line endings in React Native's repo. The files in your repository are already correct, so no conversion is necessary.

So we should still remove these files?

@friederbluemle
Copy link
Copy Markdown
Contributor Author

friederbluemle commented Sep 20, 2021

I would say yes, because:

  1. It'll fix the problem stated in the PR description
  2. They are already removed on RN's main branch

@tyler-whitman tyler-whitman merged commit 700bdb6 into helium:main Sep 20, 2021
@fabOnReact fabOnReact mentioned this pull request Feb 18, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@tyler-whitman tyler-whitman tyler-whitman approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@friederbluemle @tyler-whitman