Revert, for now, Darwin API changes that did not happen early enough. #23155
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR was generated by doing the following: 1. Revert the following commits, in order, resolving minor conflicts in generated code along the way: * af09de0 * b829121 * a7475d3 * 7301ecf * 2060105 * 8e2c926 * f72807b * 5d140df * 2aaf589 * 46b4649 * 2466360 * 7862371 * 9989fc1 (only the parts in the Darwin framework and darwin-framework-tool, so not via git revert) * e3160eb * e62b0f1 * bae0bc7 * 8e1c833 * 1e66f4b * 5757068 * 6527ae3 * 8c4675f * 91db05d * 72d838a * bad4408 * 9c131da * 5caec5a * cdb4969 * 9ababd1 * 6a45e43 * 81f7284 * 43d7fd2 * b89aa66 2. Pick up the ZAP change to undo the Darwin casing changes in ZAP. 3. Rerun ZAP codegen to pick up some changes to the generated code for some of the commits that were not reverted. 4. Cherry-pick the following commits (which were reverted above, to reduce potential conflicts), in order, resolving conflicts as needed: * 81f7284 * 2466360 * 46b4649 * f72807b * 8e2c926 * 2060105 * 7301ecf * a7475d3 * b829121 * af09de0 5. Make computePaseVerifier an instance method on MTRDeviceController again. 6. Make manual changes to the MTRClusters, MTRBaseClusters, MTRClusterConstants, MTRStructsObjc zapt files to keep the "DeviceList" naming in the APIs for reading and subscribing to "DeviceTypeList" and the "DeviceType" naming for "DeviceTypeStruct". Make corresponding changes to darwin-framework-tool codegen as well. 7. Manually re-mark the attributes in MTROptionalQRCodeInfo and MTRSetupPayload that can be nil as nullable. 8. Manually add back documentation for MTROTAHeader and mark the properties on it that can be nil as nullable. 9. Manually add back the leak fix from 6527ae3.
pullapprove
bot
requested review from
andy31415,
anush-apple,
arkq,
Byungjoo-Lee,
carol-apple,
chrisdecenzo,
chshu,
chulspro,
Damian-Nordic,
dhrishi,
electrocucaracha,
franck-apple,
gjc13,
harimau-qirex,
harsha-rajendran,
hawk248,
isiu-apple,
jelderton,
jepenven-silabs,
jmartinez-silabs,
jtung-apple,
lazarkov,
LuDuda,
mlepage-google and
msandstedt
pullapprove
bot
requested review from
robszewczyk,
saurabhst,
selissia,
tcarmelveilleux,
tecimovic,
tehampson,
turon,
vijs,
vivien-apple,
wbschiller,
woody-apple,
xylophone21 and
yunhanw-google
|
PR #23155: Size comparison from 26dab6c to be883f5 Increases (9 builds for cc13x2_26x2, psoc6, telink)
Decreases (7 builds for bl602, bl702, cc13x2_26x2, esp32, telink)
Full report (36 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, psoc6, qpg, telink)
|
anush-apple
approved these changes
Oct 12, 2022
jtung-apple
approved these changes
Oct 13, 2022
|
Fast-tracking platform-specific changes approved by platform owner. |
bzbarsky-apple
added a commit
to bzbarsky-apple/connectedhomeip
that referenced
this pull request
Oct 13, 2022
… and MTRBaseDevice. This is a re-landing of the API addition parts of project-chip#22521, without including any of the API changes/removals. The code is identical to what was on master before Darwin framework changes were reverted in project-chip#23155.
bzbarsky-apple
added a commit
to bzbarsky-apple/connectedhomeip
that referenced
this pull request
Oct 13, 2022
…oller. This is a re-landing of some of the API addition parts of project-chip#22596 and project-chip#22566, without including any of the API changes/removals. The code is nearly identical to what was on master before Darwin framework changes were reverted in project-chip#23155; the differences have to do with the different type and name of MTRSetupPayload's rendezvousInformation.
bzbarsky-apple
added a commit
to bzbarsky-apple/connectedhomeip
that referenced
this pull request
Oct 13, 2022
…oller. This is a re-landing of some of the API addition parts of project-chip#22596 and project-chip#22566, without including any of the API changes/removals. The code is nearly identical to what was on master before Darwin framework changes were reverted in project-chip#23155; the differences have to do with the different type and name of MTRSetupPayload's rendezvousInformation.
bzbarsky-apple
added a commit
that referenced
this pull request
Oct 13, 2022
…oller. (#23159) This is a re-landing of some of the API addition parts of #22596 and #22566, without including any of the API changes/removals. The code is nearly identical to what was on master before Darwin framework changes were reverted in #23155; the differences have to do with the different type and name of MTRSetupPayload's rendezvousInformation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR was generated by doing the following:
Pick up the ZAP change to undo the Darwin casing changes in ZAP.
Rerun ZAP codegen to pick up some changes to the generated code for some of the commits that were not reverted.
Cherry-pick the following commits (which were reverted above, to reduce potential conflicts), in order, resolving conflicts as needed:
Make computePaseVerifier an instance method on MTRDeviceController again.
Make manual changes to the MTRClusters, MTRBaseClusters, MTRClusterConstants, MTRStructsObjc zapt files to keep the "DeviceList" naming in the APIs for reading and subscribing to "DeviceTypeList" and the "DeviceType" naming for "DeviceTypeStruct". Make corresponding changes to darwin-framework-tool codegen as well.
Manually re-mark the attributes in MTROptionalQRCodeInfo and MTRSetupPayload that can be nil as nullable.
Manually add back documentation for MTROTAHeader and mark the properties on it that can be nil as nullable.
Manually add back the leak fix from 6527ae3.