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

Error prone and google format fix annotation module #7154

Conversation

hellosagar
Copy link
Contributor

Overview

Fixed the error-prone warning and added the google java style format for the annotations module

Proposed Changes

So, the only error warning for the annotation module was UnrecognisedJavadocTag, and I've fixed that by converting the comment from previously this:

@see {@link org.robolectric.plugins.LooperModeConfigurer}, {@link org.robolectric.util.Scheduler}, {@link org.robolectric.shadows.ShadowLooper}

to this now:

* @see org.robolectric.plugins.LooperModeConfigurer
* @see org.robolectric.util.Scheduler
* @see org.robolectric.shadows.ShadowLooper

Which has the same effect on Javadoc rendering

and other than this its mostly, google's java format style changes

@utzcoz
Copy link
Member

utzcoz commented Mar 19, 2022

@hellosagar you can rebase on your old PR, and force-push to your branch without closing your old PR. Those are commands I often used to rebase on lastest master branch for my PR:

git fetch --all
git checkout my_branch
git rebase -i upstream/master
# squash or cherry-pick your commits, and delete commits you don't want with terminal and save your operation.
git push origin HEAD:my_branch -f

@utzcoz utzcoz requested a review from hoisie March 19, 2022 14:10
@hellosagar
Copy link
Contributor Author

hellosagar commented Mar 19, 2022

@hellosagar you can rebase on your old PR, and force-push to your branch without closing your old PR. Those are commands I often used to rebase on lastest master branch for my PR:

git fetch --all
git checkout my_branch
git rebase -i upstream/master
# squash or cherry-pick your commits, and delete commits you don't want with terminal and save your operation.
git push origin HEAD:my_branch -f

Thanks for sharing the sample, usually I avoid git force pus. but In these kind a cases it make sense to use it 👍🏻

@utzcoz
Copy link
Member

utzcoz commented Mar 19, 2022

usually I avoid git force pus.

Yup, we should avoid using git force normally. Robolectric doesn't support squash PR now for some sync-code reasons, and we don't like too much merge commits at repository, so it's an workable approach to avoid useless merge commits with git push for custom branch. We often use folk repository at self account namespace, and it's safe to force push self work branch. For me, I often check multiple times before using force-push for branches to avoid unexpected results.

@hellosagar hellosagar force-pushed the errorprone-and-google-format-fix-annotation-module branch from eb6d350 to 285a224 Compare April 1, 2022 18:35
@utzcoz
Copy link
Member

utzcoz commented Apr 3, 2022

@hellosagar It's recommended to rebase on master branch, instead of cherry-picking those commits separately.

@hellosagar
Copy link
Contributor Author

@utzcoz got it, yeah i will first rebase my master branch and synced it with my local branch

@hellosagar hellosagar force-pushed the errorprone-and-google-format-fix-annotation-module branch from 6663187 to ba5723a Compare April 3, 2022 07:45
@hellosagar
Copy link
Contributor Author

I think I'm doing something wrong because my commits are showing like this
Screenshot 2022-04-03 at 1 17 19 PM

@utzcoz
Copy link
Member

utzcoz commented Apr 3, 2022

@hellosagar you can checkout to you commit for this PR, rebase it on latest master branch and push it to your branch forcibly.

@hellosagar hellosagar force-pushed the errorprone-and-google-format-fix-annotation-module branch from ba5723a to faf0dfd Compare April 3, 2022 07:51
@hellosagar
Copy link
Contributor Author

hellosagar commented Apr 3, 2022

Thanks, I think its looking fine now

@hellosagar
Copy link
Contributor Author

hellosagar commented Apr 3, 2022

What I did wrong previously, do you know exactly ? I mean in terms how other persons commits showing as mine which is authored by someone else

@utzcoz
Copy link
Member

utzcoz commented Apr 3, 2022

Hi @hoisie could you help to review this PR? IMO, it's ready to be merged.

@utzcoz
Copy link
Member

utzcoz commented Apr 3, 2022

What I did wrong previously, do you know exactly ? I mean in terms how other persons commits showing as mine which is authored by someone else

Maybe you use some commands like cherry-pick to cherry-pick commits from master branch to your branch. When you pushed those commits, you became the committer of that commit.

@utzcoz utzcoz merged commit 31d9916 into robolectric:master Apr 3, 2022
@utzcoz
Copy link
Member

utzcoz commented Apr 3, 2022

Thanks @hellosagar. Congrats to your first PR.

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.

None yet

3 participants