From 3742211a1067186107f9d27b7524b1e2d415f277 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 8 Sep 2023 00:10:45 -0400 Subject: [PATCH] Update ZAP to v2023.09.05-nightly. (#29095) This should fix UI issues around enabling/disabling events. The .zap changes are from ZAP files that were last edited/generated with a too-old version of ZAP (from before v2023.08.30-nightly). --- .../rootnode_dishwasher_cc105034fe.zap | 3 +- .../rootnode_laundrywasher_fb10d238c8.zap | 3 +- .../chef/devices/rootnode_pump_5f904818cc.zap | 39 +++++++------------ ...emperaturecontrolledcabinet_ffdb696680.zap | 3 +- .../refrigerator-common/refrigerator-app.zap | 33 +++------------- .../resource-monitoring-app.zap | 15 ++++--- scripts/setup/zap.json | 4 +- scripts/setup/zap.version | 2 +- scripts/tools/zap/zap_execution.py | 2 +- 9 files changed, 34 insertions(+), 70 deletions(-) diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap index bdd388535f5020..df18b2b1ff5e45 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap @@ -10833,6 +10833,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap index 185729bcbfc1e3..85c94b1a55186b 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap @@ -11081,6 +11081,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap index bd00cd5534b9fa..6966139ba33d50 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.zap +++ b/examples/chef/devices/rootnode_pump_5f904818cc.zap @@ -1,5 +1,5 @@ { - "featureLevel": 97, + "featureLevel": 98, "creator": "zap", "keyValuePairs": [ { @@ -36,7 +36,6 @@ "id": 1, "name": "MA-rootdevice", "deviceTypeRef": { - "id": 2, "code": 22, "profileId": 259, "label": "MA-rootdevice", @@ -44,16 +43,12 @@ }, "deviceTypes": [ { - "id": 2, "code": 22, "profileId": 259, "label": "MA-rootdevice", "name": "MA-rootdevice" } ], - "deviceTypeRefs": [ - 2 - ], "deviceVersions": [ 1 ], @@ -6244,7 +6239,6 @@ "id": 2, "name": "Anonymous Endpoint Type", "deviceTypeRef": { - "id": 14, "code": 771, "profileId": 2457, "label": "MA-pump", @@ -6252,16 +6246,12 @@ }, "deviceTypes": [ { - "id": 14, "code": 771, "profileId": 2457, "label": "MA-pump", "name": "MA-pump" } ], - "deviceTypeRefs": [ - 14 - ], "deviceVersions": [ 1 ], @@ -7689,7 +7679,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -7705,7 +7695,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -7721,7 +7711,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -7737,7 +7727,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -7981,7 +7971,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -7997,7 +7987,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8013,7 +8003,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8029,7 +8019,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8193,7 +8183,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8209,7 +8199,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8225,7 +8215,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8241,7 +8231,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8302,6 +8292,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap index c41e00c3ca48d6..449ce9ef3cd474 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap @@ -12727,6 +12727,5 @@ "endpointId": 3, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap index feb4bcca1dda01..5752fd943abbd9 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 97, + "featureLevel": 98, "creator": "zap", "keyValuePairs": [ { @@ -33,10 +33,9 @@ ], "endpointTypes": [ { - "id": 8, + "id": 1, "name": "MA-rootdevice", "deviceTypeRef": { - "id": 2, "code": 22, "profileId": 259, "label": "MA-rootdevice", @@ -44,16 +43,12 @@ }, "deviceTypes": [ { - "id": 2, "code": 22, "profileId": 259, "label": "MA-rootdevice", "name": "MA-rootdevice" } ], - "deviceTypeRefs": [ - 2 - ], "deviceVersions": [ 1 ], @@ -6252,10 +6247,9 @@ ] }, { - "id": 7, + "id": 2, "name": "MA-refrigerator", "deviceTypeRef": { - "id": 48, "code": 112, "profileId": 259, "label": "MA-refrigerator", @@ -6263,16 +6257,12 @@ }, "deviceTypes": [ { - "id": 48, "code": 112, "profileId": 259, "label": "MA-refrigerator", "name": "MA-refrigerator" } ], - "deviceTypeRefs": [ - 48 - ], "deviceVersions": [ 1 ], @@ -11686,10 +11676,9 @@ ] }, { - "id": 5, + "id": 3, "name": "Anonymous Endpoint Type", "deviceTypeRef": { - "id": 51, "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", @@ -11697,16 +11686,12 @@ }, "deviceTypes": [ { - "id": 51, "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", "name": "MA-temperature-controlled-cabinet" } ], - "deviceTypeRefs": [ - 51 - ], "deviceVersions": [ 1 ], @@ -12202,10 +12187,9 @@ ] }, { - "id": 6, + "id": 4, "name": "Anonymous Endpoint Type", "deviceTypeRef": { - "id": 51, "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", @@ -12213,16 +12197,12 @@ }, "deviceTypes": [ { - "id": 51, "code": 113, "profileId": 259, "label": "MA-temperature-controlled-cabinet", "name": "MA-temperature-controlled-cabinet" } ], - "deviceTypeRefs": [ - 51 - ], "deviceVersions": [ 1 ], @@ -12747,6 +12727,5 @@ "endpointId": 3, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap index 60857f16ab28e3..1124e42b5cc5f2 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap @@ -16,12 +16,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", @@ -29,6 +23,12 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" } ], "endpointTypes": [ @@ -6993,6 +6993,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json index d763e123ff712b..3b1253b9ee0045 100644 --- a/scripts/setup/zap.json +++ b/scripts/setup/zap.json @@ -8,13 +8,13 @@ "mac-amd64", "windows-amd64" ], - "tags": ["version:2@v2023.09.01-nightly.1"] + "tags": ["version:2@v2023.09.05-nightly.1"] }, { "_comment": "Always get the amd64 version on mac until usable arm64 zap build is available", "path": "fuchsia/third_party/zap/mac-amd64", "platforms": ["mac-arm64"], - "tags": ["version:2@v2023.09.01-nightly.1"] + "tags": ["version:2@v2023.09.05-nightly.1"] } ] } diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version index 5af16d0daf37f9..f3a4acca4e93d2 100644 --- a/scripts/setup/zap.version +++ b/scripts/setup/zap.version @@ -1 +1 @@ -v2023.09.01-nightly +v2023.09.05-nightly diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py index 5dbff86656cd17..bd5f609d4164d5 100644 --- a/scripts/tools/zap/zap_execution.py +++ b/scripts/tools/zap/zap_execution.py @@ -23,7 +23,7 @@ # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many # files may need updating for versions # -MIN_ZAP_VERSION = '2023.9.1' +MIN_ZAP_VERSION = '2023.9.5' class ZapTool: