Skip to content

Comments

json: switch to yyjson#272

Merged
soreau merged 7 commits intoWayfireWM:masterfrom
allomanta:master
Mar 27, 2025
Merged

json: switch to yyjson#272
soreau merged 7 commits intoWayfireWM:masterfrom
allomanta:master

Conversation

@allomanta
Copy link
Contributor

This should update the plugins relying on json to match the switch to yyjson from the wayfire master branch. I also have changes for the filters submodule locally, but I can't figure out how to include them.
I called the variables for the optionals maybe_x and maybe_y, but maybe there's a nicer way to fix this.

Copy link
Member

@soreau soreau left a comment

Choose a reason for hiding this comment

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

Overall your patch seems pretty straightforward. To pass CI, you will need to change json packages as in this commit and apply the diff from the uncrustify check. Aside from minor changes needed, it looks good to me. 👍

@allomanta
Copy link
Contributor Author

allomanta commented Mar 26, 2025

I think uncrustify should be happy with the style now. I haven't been able to run it myself, but it seems like it just wanted the = signs to align. I also changed the json package in the CI, so that should work now I think.

@soreau
Copy link
Member

soreau commented Mar 27, 2025

Thanks!

@soreau soreau merged commit a0ea60b into WayfireWM:master Mar 27, 2025
3 checks passed
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.

2 participants