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 google-java-format to 1.22.0 #452

Closed
wants to merge 1 commit into from

Conversation

nreid260
Copy link
Contributor

@nreid260 nreid260 commented Apr 2, 2024

This update adds support for multiline tokens, which fixes several bugs related to multiline strings.

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 2, 2024
@nreid260 nreid260 changed the title Update google-java-format to 1.22 Update google-java-format to 1.22.0 Apr 2, 2024
@nreid260
Copy link
Contributor Author

nreid260 commented Apr 2, 2024

@hick209 😄

@hick209
Copy link
Contributor

hick209 commented Apr 2, 2024

I don't know if we could actually land this as internally we're barely at 1.21-ish (more like 1.19 really), but I am currently working on changing that.

Let me try pulling it and see what happens

@facebook-github-bot
Copy link
Contributor

@hick209 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@hick209
Copy link
Contributor

hick209 commented Apr 2, 2024

It fails the tests internally. Looks like this would have to wait until we have performed the upgrade on our end.

Also does this clash with this issue here? #201
I'm no Java version number and flavors and all expert here, so I'm always confused on that area

@nreid260
Copy link
Contributor Author

nreid260 commented Apr 2, 2024

Within Google, google-java-format is built using JDK11, so I presume that's why the Marven artifact specifies it. I don't think there are currently any Java 11 features being used, but they may slip in as time passes.

@hick209
Copy link
Contributor

hick209 commented Apr 3, 2024

In the meantime do you want to change this to 1.21?

@nreid260
Copy link
Contributor Author

nreid260 commented Apr 3, 2024

In the meantime do you want to change this to 1.21?

The multiline fix I care about is in 1.22.0

This update adds support for multiline tokens, which fixes several bugs related to multiline strings.
@facebook-github-bot
Copy link
Contributor

@hick209 merged this pull request in 2364f16.

@nreid260
Copy link
Contributor Author

😀

@nreid260 nreid260 deleted the multiline branch April 23, 2024 06:10
facebook-github-bot pushed a commit that referenced this pull request Apr 23, 2024
Summary:
Changelog:
* Migrated to Google Java Format 1.22.0 (#440 and #452)
* Added support for RangUntil (`..<`) operator (#433)
* Trailing space issue on lambda blocks (#426)
* Fix empty enum parse error (#425)
* Preserving empty enums semicolons (#434)
* Always use UTF8 (#437)
* IntelliJI DEA plugin update (#420)
* Managing trailing commas in enums (#449)
* Badges on README (#446 and #453)
* Emit parsing error for calls with multiple trailing lambdas (#457)
* Removed duplicated line in editorconfig file (#456)

Reviewed By: cortinico

Differential Revision: D56467599

fbshipit-source-id: 10e90a34118267e36db80940f6a4e43aef89fbd3
github-merge-queue bot referenced this pull request in slackhq/foundry Apr 27, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [com.facebook:ktfmt](https://github.com/facebookincubator/ktfmt) |
dependencies | minor | `0.47` -> `0.49` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>facebookincubator/ktfmt (com.facebook:ktfmt)</summary>

### [`v0.49`](https://github.com/facebook/ktfmt/releases/tag/v0.49)

#### Changelog

- Stop emitting multiple trailing commas in enum entry lists with
multiline items
([https://github.com/facebook/ktfmt/pull/458](https://github.com/facebook/ktfmt/pull/458))
– [@&#8203;nreid260](https://github.com/nreid260)

**Full Changelog**:
facebook/ktfmt@v0.48...v0.49

### [`v0.48`](https://github.com/facebook/ktfmt/releases/tag/v0.48):
0.48

Changelog:

- Migrated to Google Java Format 1.22.0
([https://github.com/facebook/ktfmt/pull/440](https://github.com/facebook/ktfmt/pull/440),
[https://github.com/facebook/ktfmt/pull/452](https://github.com/facebook/ktfmt/pull/452))
– [@&#8203;j-bahr](https://github.com/j-bahr),
[@&#8203;nreid260](https://github.com/nreid260)
- Added support for RangUntil (`..<`) operator
([https://github.com/facebook/ktfmt/pull/433](https://github.com/facebook/ktfmt/pull/433))
– [@&#8203;ArchdukeTim](https://github.com/ArchdukeTim)
- Trailing space issue on lambda blocks
([https://github.com/facebook/ktfmt/pull/426](https://github.com/facebook/ktfmt/pull/426))
– [@&#8203;fredyw](https://github.com/fredyw),
[@&#8203;hick209](https://github.com/hick209)
- Fix empty enum parse error
([https://github.com/facebook/ktfmt/pull/425](https://github.com/facebook/ktfmt/pull/425))
– [@&#8203;fredyw](https://github.com/fredyw)
- Preserving empty enums semicolons
([https://github.com/facebook/ktfmt/pull/434](https://github.com/facebook/ktfmt/pull/434))
– [@&#8203;nreid260](https://github.com/nreid260)
- Always use UTF8
([https://github.com/facebook/ktfmt/pull/437](https://github.com/facebook/ktfmt/pull/437))
– [@&#8203;nreid260](https://github.com/nreid260)
- IntelliJI DEA plugin update
([https://github.com/facebook/ktfmt/pull/420](https://github.com/facebook/ktfmt/pull/420))
– [@&#8203;greyhairredbear](https://github.com/greyhairredbear)
- Managing trailing commas in enums
([https://github.com/facebook/ktfmt/pull/449](https://github.com/facebook/ktfmt/pull/449))
– [@&#8203;nreid260](https://github.com/nreid260)
- Badges on README
([https://github.com/facebook/ktfmt/pull/448](https://github.com/facebook/ktfmt/pull/448),
[https://github.com/facebook/ktfmt/pull/453](https://github.com/facebook/ktfmt/pull/453))
–
[@&#8203;JavierSegoviaCordoba](https://github.com/JavierSegoviaCordoba),
[@&#8203;hick209](https://github.com/hick209)
- Emit parsing error for calls with multiple trailing lambdas
([https://github.com/facebook/ktfmt/pull/457](https://github.com/facebook/ktfmt/pull/457))
– [@&#8203;nreid260](https://github.com/nreid260)
- Removed duplicated line in editorconfig file
([https://github.com/facebook/ktfmt/pull/456](https://github.com/facebook/ktfmt/pull/456))
– [@&#8203;sabufung30](https://github.com/sabufung30)

Big thanks to all the contributors!

**Full Changelog**:
facebook/ktfmt@v0.47...v0.48

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://github.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMjUuMSIsInVwZGF0ZWRJblZlciI6IjM3LjMyNS4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

---------

Co-authored-by: Zac Sweers <[email protected]>
github-merge-queue bot referenced this pull request in slackhq/circuit Apr 28, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [com.facebook:ktfmt](https://github.com/facebook/ktfmt) |
dependencies | minor | `0.47` -> `0.49` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>facebook/ktfmt (com.facebook:ktfmt)</summary>

### [`v0.49`](https://github.com/facebook/ktfmt/releases/tag/v0.49)

#### Changelog

- Stop emitting multiple trailing commas in enum entry lists with
multiline items
([https://github.com/facebook/ktfmt/pull/458](https://github.com/facebook/ktfmt/pull/458))
– [@&#8203;nreid260](https://github.com/nreid260)

**Full Changelog**:
facebook/ktfmt@v0.48...v0.49

### [`v0.48`](https://github.com/facebook/ktfmt/releases/tag/v0.48):
0.48

Changelog:

- Migrated to Google Java Format 1.22.0
([https://github.com/facebook/ktfmt/pull/440](https://github.com/facebook/ktfmt/pull/440),
[https://github.com/facebook/ktfmt/pull/452](https://github.com/facebook/ktfmt/pull/452))
– [@&#8203;j-bahr](https://github.com/j-bahr),
[@&#8203;nreid260](https://github.com/nreid260)
- Added support for RangUntil (`..<`) operator
([https://github.com/facebook/ktfmt/pull/433](https://github.com/facebook/ktfmt/pull/433))
– [@&#8203;ArchdukeTim](https://github.com/ArchdukeTim)
- Trailing space issue on lambda blocks
([https://github.com/facebook/ktfmt/pull/426](https://github.com/facebook/ktfmt/pull/426))
– [@&#8203;fredyw](https://github.com/fredyw),
[@&#8203;hick209](https://github.com/hick209)
- Fix empty enum parse error
([https://github.com/facebook/ktfmt/pull/425](https://github.com/facebook/ktfmt/pull/425))
– [@&#8203;fredyw](https://github.com/fredyw)
- Preserving empty enums semicolons
([https://github.com/facebook/ktfmt/pull/434](https://github.com/facebook/ktfmt/pull/434))
– [@&#8203;nreid260](https://github.com/nreid260)
- Always use UTF8
([https://github.com/facebook/ktfmt/pull/437](https://github.com/facebook/ktfmt/pull/437))
– [@&#8203;nreid260](https://github.com/nreid260)
- IntelliJI DEA plugin update
([https://github.com/facebook/ktfmt/pull/420](https://github.com/facebook/ktfmt/pull/420))
– [@&#8203;greyhairredbear](https://github.com/greyhairredbear)
- Managing trailing commas in enums
([https://github.com/facebook/ktfmt/pull/449](https://github.com/facebook/ktfmt/pull/449))
– [@&#8203;nreid260](https://github.com/nreid260)
- Badges on README
([https://github.com/facebook/ktfmt/pull/448](https://github.com/facebook/ktfmt/pull/448),
[https://github.com/facebook/ktfmt/pull/453](https://github.com/facebook/ktfmt/pull/453))
–
[@&#8203;JavierSegoviaCordoba](https://github.com/JavierSegoviaCordoba),
[@&#8203;hick209](https://github.com/hick209)
- Emit parsing error for calls with multiple trailing lambdas
([https://github.com/facebook/ktfmt/pull/457](https://github.com/facebook/ktfmt/pull/457))
– [@&#8203;nreid260](https://github.com/nreid260)
- Removed duplicated line in editorconfig file
([https://github.com/facebook/ktfmt/pull/456](https://github.com/facebook/ktfmt/pull/456))
– [@&#8203;sabufung30](https://github.com/sabufung30)

Big thanks to all the contributors!

**Full Changelog**:
facebook/ktfmt@v0.47...v0.48

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://github.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMjYuMCIsInVwZGF0ZWRJblZlciI6IjM3LjMyNi4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

---------

Co-authored-by: Zac Sweers <[email protected]>
ZacSweers referenced this pull request in ZacSweers/CatchUp Apr 29, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.facebook:ktfmt](https://github.com/facebook/ktfmt) | `0.47` ->
`0.49` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/com.facebook:ktfmt/0.49?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.facebook:ktfmt/0.49?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.facebook:ktfmt/0.47/0.49?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.facebook:ktfmt/0.47/0.49?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>facebook/ktfmt (com.facebook:ktfmt)</summary>

### [`v0.49`](https://github.com/facebook/ktfmt/releases/tag/v0.49)

#### Changelog

- Stop emitting multiple trailing commas in enum entry lists with
multiline items
([https://github.com/facebook/ktfmt/pull/458](https://github.com/facebook/ktfmt/pull/458))
– [@&#8203;nreid260](https://github.com/nreid260)

**Full Changelog**:
facebook/ktfmt@v0.48...v0.49

### [`v0.48`](https://github.com/facebook/ktfmt/releases/tag/v0.48):
0.48

Changelog:

- Migrated to Google Java Format 1.22.0
([https://github.com/facebook/ktfmt/pull/440](https://github.com/facebook/ktfmt/pull/440),
[https://github.com/facebook/ktfmt/pull/452](https://github.com/facebook/ktfmt/pull/452))
– [@&#8203;j-bahr](https://github.com/j-bahr),
[@&#8203;nreid260](https://github.com/nreid260)
- Added support for RangUntil (`..<`) operator
([https://github.com/facebook/ktfmt/pull/433](https://github.com/facebook/ktfmt/pull/433))
– [@&#8203;ArchdukeTim](https://github.com/ArchdukeTim)
- Trailing space issue on lambda blocks
([https://github.com/facebook/ktfmt/pull/426](https://github.com/facebook/ktfmt/pull/426))
– [@&#8203;fredyw](https://github.com/fredyw),
[@&#8203;hick209](https://github.com/hick209)
- Fix empty enum parse error
([https://github.com/facebook/ktfmt/pull/425](https://github.com/facebook/ktfmt/pull/425))
– [@&#8203;fredyw](https://github.com/fredyw)
- Preserving empty enums semicolons
([https://github.com/facebook/ktfmt/pull/434](https://github.com/facebook/ktfmt/pull/434))
– [@&#8203;nreid260](https://github.com/nreid260)
- Always use UTF8
([https://github.com/facebook/ktfmt/pull/437](https://github.com/facebook/ktfmt/pull/437))
– [@&#8203;nreid260](https://github.com/nreid260)
- IntelliJI DEA plugin update
([https://github.com/facebook/ktfmt/pull/420](https://github.com/facebook/ktfmt/pull/420))
– [@&#8203;greyhairredbear](https://github.com/greyhairredbear)
- Managing trailing commas in enums
([https://github.com/facebook/ktfmt/pull/449](https://github.com/facebook/ktfmt/pull/449))
– [@&#8203;nreid260](https://github.com/nreid260)
- Badges on README
([https://github.com/facebook/ktfmt/pull/448](https://github.com/facebook/ktfmt/pull/448),
[https://github.com/facebook/ktfmt/pull/453](https://github.com/facebook/ktfmt/pull/453))
–
[@&#8203;JavierSegoviaCordoba](https://github.com/JavierSegoviaCordoba),
[@&#8203;hick209](https://github.com/hick209)
- Emit parsing error for calls with multiple trailing lambdas
([https://github.com/facebook/ktfmt/pull/457](https://github.com/facebook/ktfmt/pull/457))
– [@&#8203;nreid260](https://github.com/nreid260)
- Removed duplicated line in editorconfig file
([https://github.com/facebook/ktfmt/pull/456](https://github.com/facebook/ktfmt/pull/456))
– [@&#8203;sabufung30](https://github.com/sabufung30)

Big thanks to all the contributors!

**Full Changelog**:
facebook/ktfmt@v0.47...v0.48

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/ZacSweers/CatchUp).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMjEuMiIsInVwZGF0ZWRJblZlciI6IjM3LjMyMS4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zac Sweers <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. Merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants