Revert JSON format change and fix bug introduced by #3696 #3793
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation: The larger refactoring changed the destination JSON format and introduced a bug in passing flags.
Changes: Use a CodingKeys enum to go back to the old format and correct the flag error.
I had to modify the destination JSON format that I use on my Android CI because of this format change, and the flag bug broke using trunk SPM with a destination JSON for NIO SSL, so I had to roll back to 5.5 SPM instead.
There is currently no test that would catch these JSON issues, so I will submit one separately in a subsequent pull, but I'd like to quickly get these fixes in in the meantime. It will take longer for me to learn the testing infrastructure enough to add that test.