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

Update sbt-java-formatter to 0.8.0 #134

Merged
merged 3 commits into from
Apr 7, 2024
Merged

Conversation

scala-steward-asf[bot]
Copy link
Contributor

About this PR

πŸ“¦ Updates com.lightbend.sbt:sbt-java-formatter from 0.7.0 to 0.8.0

πŸ“œ GitHub Release Notes - Version Diff

Usage

βœ… Please merge!

I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.

If you'd like to skip this version, you can just close this PR. If you have any feedback, just mention me in the comments below.

Configure Scala Steward for your repository with a .scala-steward.conf file.

Have a fantastic day writing Scala!

βš™ Adjust future updates

Add this to your .scala-steward.conf file to ignore future updates of this dependency:

updates.ignore = [ { groupId = "com.lightbend.sbt", artifactId = "sbt-java-formatter" } ]

Or, add this to slow down future updates of this dependency:

dependencyOverrides = [{
  pullRequests = { frequency = "30 days" },
  dependency = { groupId = "com.lightbend.sbt", artifactId = "sbt-java-formatter" }
}]
labels: sbt-plugin-update, early-semver-major, semver-spec-minor, commit-count:n:3

@laglangyue
Copy link
Contributor

lgtm

Copy link
Member

@raboof raboof left a comment

Choose a reason for hiding this comment

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

impressed with how smart Scala Steward is

not sure the import ordering changes are a big improvement, but good to have them managed by the formatter I suppose

@@ -4,3 +4,6 @@ af0dc3cc8635a1f5a7760bbdcc6259559d70c77a
# manual
11b119182338cb43cd45f5849684818be61ee493
ebead18d8114832ebe4f9d7196686af087fb2507

# Scala Steward: Reformat with sbt-java-formatter 0.8.0
57b0d25b6ec89871ec0c3eb50b5868a14d46e764
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I guess both 'squash and merge' and 'rebase and merge' would break this, though, right? How should we deal with that? 'squash and merge' and then a follow-up PR to fix the ignore?

Copy link
Contributor

Choose a reason for hiding this comment

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

would rebase and merge work? I presume that one of the merge types works because there would be little point in this otherwise

in the end, there is no harm in doing follow up PRs to fix some of the commit ids in this file

Copy link
Member

Choose a reason for hiding this comment

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

no, only 'create a merge commit' avoids rewriting the commits.

Copy link
Contributor

Choose a reason for hiding this comment

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

So I a bit late to this whole thing, but the way that historically dealt with .git-blame-ignore-revs is that we only add a commit hash to that file after the PR that does the formatting is merged.

That way the formatting PR can have a nice clean git log (i.e. a single "atomic" commit that only applies the formatting change that is a separate from the other commits), that PR is then merged and then a new PR is made which adds that single formatting commit to .git-blame-ignore-revs

Copy link
Member

Choose a reason for hiding this comment

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

I don't think joining this discussion after only an hour is 'late' at all :)

OK, so your preference is to use 'rebase and merge' and then add the reformatting commit to .git-blame-ignore-revs in a separate PR. I can live with that.

@scala-steward-asf scala-steward-asf bot force-pushed the update/sbt-java-formatter-0.8.0 branch from c326dbb to 28fd2ab Compare April 7, 2024 09:04
@raboof
Copy link
Member

raboof commented Apr 7, 2024

failure was #103 again, re-running

@raboof raboof merged commit 42a206c into main Apr 7, 2024
28 checks passed
raboof added a commit to raboof/pekko-projection that referenced this pull request Apr 7, 2024
@mdedetrich mdedetrich deleted the update/sbt-java-formatter-0.8.0 branch April 7, 2024 10:20
raboof added a commit that referenced this pull request Apr 8, 2024
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.

4 participants