From 33050274b89c125430356f6cad8c5a69e0da1d1c Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Tue, 31 Oct 2023 15:38:13 -0400
Subject: [PATCH] Update availability annotations for Darwin. (#30129)

* Administrator Commissioning feature map has been around for a while, but
  finally got added to the SDK, so that's not marked provisional.
* Various things targeting Spring 2024 Matter release are explicitly marked
  provisional.
---
 .../CHIP/templates/availability.yaml          | 22 +++++++++++++++++++
 .../CHIP/zap-generated/MTRBaseClusters.h      |  4 ++--
 .../zap-generated/cluster/Commands.h          |  5 +++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index 50dd02c4952444..abe0c77d9ec5b7 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -7729,6 +7729,9 @@
 - release: "Future"
   versions: "future"
   introduced:
+      bitmaps:
+          AdministratorCommissioning:
+              - Feature
       bitmap values:
           PumpConfigurationAndControl:
               PumpStatusBitmap:
@@ -7736,6 +7739,9 @@
           SoftwareDiagnostics:
               Feature:
                   - Watermarks
+          AdministratorCommissioning:
+              Feature:
+                  - Basic
   deprecated:
       bitmap values:
           PumpConfigurationAndControl:
@@ -7744,6 +7750,22 @@
           SoftwareDiagnostics:
               Feature:
                   - WaterMarks
+  provisional:
+      attributes:
+          NetworkCommissioning:
+              # Targeting Spring 2024 Matter release
+              - SupportedWiFiBands
+              - SupportedThreadFeatures
+              - ThreadVersion
+      commands:
+          GeneralDiagnostics:
+              # Targeting Spring 2024 Matter release
+              - TimeSnapshot
+              - TimeSnapshotResponse
+      bitmaps:
+          NetworkCommissioning:
+              # Targeting Spring 2024 Matter release
+              - ThreadCapabilitiesBitmap
   renames:
       bitmap values:
           PumpConfigurationAndControl:
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 9a05da483a248f..56a27d8ae18e8c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -14230,8 +14230,8 @@ typedef NS_ENUM(uint8_t, MTRAdministratorCommissioningStatusCode) {
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_OPTIONS(uint32_t, MTRAdministratorCommissioningFeature) {
-    MTRAdministratorCommissioningFeatureBasic MTR_PROVISIONALLY_AVAILABLE = 0x1,
-} MTR_PROVISIONALLY_AVAILABLE;
+    MTRAdministratorCommissioningFeatureBasic MTR_NEWLY_AVAILABLE = 0x1,
+} MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTROperationalCredentialsCertificateChainType) {
     MTROperationalCredentialsCertificateChainTypeDACCertificate MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01,
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 31c1d5a6e5bbb9..6fa4deb1bb9bbd 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -28016,6 +28016,7 @@ class GeneralDiagnosticsTestEventTrigger : public ClusterCommand {
     chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type mRequest;
 };
 
+#if MTR_ENABLE_PROVISIONAL
 /*
  * Command TimeSnapshot
  */
@@ -28066,6 +28067,8 @@ class GeneralDiagnosticsTimeSnapshot : public ClusterCommand {
 private:
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+
 /*
  * Attribute NetworkInterfaces
  */
@@ -154644,7 +154647,9 @@ void registerClusterGeneralDiagnostics(Commands & commands)
     commands_list clusterCommands = {
         make_unique<ClusterCommand>(Id), //
         make_unique<GeneralDiagnosticsTestEventTrigger>(), //
+#if MTR_ENABLE_PROVISIONAL
         make_unique<GeneralDiagnosticsTimeSnapshot>(), //
+#endif // MTR_ENABLE_PROVISIONAL
         make_unique<ReadAttribute>(Id), //
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //