Set the right versions for the initial Darwin API in availability.yam…

…l. (#24116) This should add availability annotations to all the code-generated APIs that did not have them yet.
project-chip · Jul 11, 2023 · 9940468 · 9940468
1 parent c39c6de
commit 9940468
Show file tree

Hide file tree

Showing 10 changed files with 16,943 additions and 10,390 deletions.
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.21
+            image: connectedhomeip/chip-build:0.6.22
         defaults:
             run:
                 shell: sh

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -29,7 +29,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.21
+            image: connectedhomeip/chip-build:0.6.22
         defaults:
             run:
                 shell: sh

diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * {{description}}
  */
-{{availability (asUpperCamelCase name preserveAcronyms=true)~}}
+{{availability (asUpperCamelCase name preserveAcronyms=true)}}
 @interface MTRBaseCluster{{asUpperCamelCase name preserveAcronyms=true}} : MTRCluster
 
 - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device

diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters.zapt
@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Cluster {{name}}
  *    {{description}}
  */
-{{availability (asUpperCamelCase name preserveAcronyms=true)~}}
+{{availability (asUpperCamelCase name preserveAcronyms=true)}}
 @interface MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} : MTRCluster
 
 - (instancetype _Nullable)initWithDevice:(MTRDevice *)device

diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -38,16 +38,16 @@
 #            introduced/deprecated, not the construct itself.
 #   * "global attributes": An array of names of global attributes.
 #   * "apis": An array of API labels that codegen can use.
+#   * "renames": Can contain clusters, attributes, etc as described above, with
+#                the one difference that instead of an array the value is a hash
+#                with new names as keys and old names as values.
 
 - release: "Initial release"
   versions:
-      ""
-      # For now initial versions are "" to minimize changes to generated code
-      # until after the initial landing.
-  #    ios: "16.1"
-  #    macos: "13.0"
-  #    watchos: "9.1"
-  #    tvos: "16.1"
+      ios: "16.1"
+      macos: "13.0"
+      watchos: "9.1"
+      tvos: "16.1"
   introduced:
       clusters:
           - Identify

diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h