Fix signatures of string-attribute getters in Accessors.h/cpp.

The old signature did not propagate the update length of the span to the caller. This is a manual backport of #29024. The ZAP update is needed to get the right output. This modifies a few things, which were included in the PR so that the ZAP job would pass. The Darwin bits might not compile in this state, but that's OK.
project-chip · Sep 1, 2023 · a7edf4a · a7edf4a
1 parent eb23187
commit a7edf4a
Show file tree

Hide file tree

Showing 28 changed files with 58,638 additions and 29,184 deletions.
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -2102,7 +2102,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type extendedcolorlight = 269, version 1;
+  device type extendedcolorlight = 257, version 1;
 
   server cluster Identify {
     ram      attribute identifyTime default = 0x0000;

diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -1963,7 +1963,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type extendedcolorlight = 269, version 1;
+  device type extendedcolorlight = 257, version 1;
 
   server cluster Identify {
     ram      attribute identifyTime default = 0x0000;

diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter
@@ -475,6 +475,7 @@ server cluster OperationalCredentials = 62 {
 }
 
 endpoint 0 {
+  device type anonymousEndpointType = 0, version 1;
   binding cluster DiagnosticLogs;
 
   server cluster AccessControl {

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -3391,7 +3391,6 @@ server cluster ApplicationBasic = 1293 {
 }
 
 endpoint 0 {
-  device type anonymousEndpointType = 65280, version 1;
   binding cluster OnOff;
   binding cluster GeneralCommissioning;
   binding cluster Switch;

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -3352,7 +3352,6 @@ server cluster ApplicationBasic = 1293 {
 }
 
 endpoint 0 {
-  device type anonymousEndpointType = 65280, version 1;
   binding cluster OnOff;
   binding cluster GeneralCommissioning;
   binding cluster Switch;

diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -7,7 +7,7 @@ ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb
 # ZAP Development install, so that it runs on both x64 and arm64
 # Generally this should match with the ZAP version that is used for codegen within the
 # specified SHA
-ARG ZAP_VERSION=v2023.04.27-nightly
+ARG ZAP_VERSION=v2023.09.01-nightly
 
 # Ensure TARGETPLATFORM is set
 RUN case ${TARGETPLATFORM} in \

diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json
@@ -8,7 +8,7 @@
                 "mac-arm64",
                 "windows-amd64"
             ],
-            "tags": ["version:2@v2023.04.27-nightly.1"]
+            "tags": ["version:2@v2023.09.01-nightly.1"]
         }
     ]
 }
diff --git 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.4.27'
+MIN_ZAP_VERSION = '2023.9.1'
 
 
 class ZapTool:

diff --git a/src/darwin/Framework/CHIP/MTRDefines.h b/src/darwin/Framework/CHIP/MTRDefines.h
@@ -51,6 +51,12 @@
 #define MTR_NEWLY_AVAILABLE
 #endif
 
+#if defined(MTR_ENABLE_PROVISIONAL) && MTR_ENABLE_PROVISIONAL
+#define MTR_PROVISIONALLY_AVAILABLE MTR_NEWLY_AVAILABLE
+#else
+#define MTR_PROVISIONALLY_AVAILABLE NS_UNAVAILABLE MTR_HIDDEN
+#endif
+
 #pragma mark - Types
 
 typedef NSData * MTRTLVBytes;