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

refactor: replace use of deprecated base::JSONWriter::WriteJson() #41224

Conversation

trop[bot]
Copy link
Contributor

@trop trop bot commented Feb 2, 2024

Backport of #41215

See that PR for details.

Notes: none

trop bot and others added 4 commits February 2, 2024 18:26
refactor: use base::WriteJson() in DictionaryValueToNSDictionary()

Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
@trop trop bot requested a review from ckerr February 2, 2024 18:26
@trop trop bot added 28-x-y backport This is a backport PR semver/patch backwards-compatible bug fixes labels Feb 2, 2024
@trop trop bot requested a review from a team as a code owner February 2, 2024 18:42
@ckerr ckerr force-pushed the trop/28-x-y-bp-refactor-replace-use-of-deprecated-base-jsonwriter-writejson--1706898373642 branch from 767044e to 22339a1 Compare February 2, 2024 23:25
Copy link
Member

@ckerr ckerr left a comment

Choose a reason for hiding this comment

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

trop got this one wrong. I'll rebase it.

@ckerr ckerr force-pushed the trop/28-x-y-bp-refactor-replace-use-of-deprecated-base-jsonwriter-writejson--1706898373642 branch from 83a73cc to 22339a1 Compare February 5, 2024 16:13
@ckerr
Copy link
Member

ckerr commented Feb 5, 2024

YAozK

@ckerr
Copy link
Member

ckerr commented Feb 5, 2024

Looks like these are coming back during a 3-way merge for some reason 🤔

@ckerr ckerr marked this pull request as draft February 5, 2024 17:07
@ckerr ckerr marked this pull request as ready for review February 5, 2024 17:36
@ckerr
Copy link
Member

ckerr commented Feb 5, 2024

Apparently the bots are doing the right thing? Looks like #41178 wasn't rebased on 28 for #41195, so those four commits are now upstream and the bots are correct to remove the patches.

Thanks to @codebytere for spotting this; I didn't see it 😸

@ckerr ckerr merged commit b96b402 into 28-x-y Feb 6, 2024
13 checks passed
@ckerr ckerr deleted the trop/28-x-y-bp-refactor-replace-use-of-deprecated-base-jsonwriter-writejson--1706898373642 branch February 6, 2024 20:36
Copy link

release-clerk bot commented Feb 6, 2024

No Release Notes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
28-x-y backport This is a backport PR semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants