From 86863dd0707d53fca1107dec2cd767c2ac1de406 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Wed, 31 May 2023 18:55:21 -0400
Subject: [PATCH] Update Darwin availability annotations for Illuminance
 Measurement enum renaming. (#26984)

---
 src/darwin/Framework/CHIP/templates/availability.yaml     | 7 +++++--
 src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index e79613de9a292c..189ba87be9a9e5 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -3216,7 +3216,10 @@
               - SaturationMoveMode
               - SaturationStepMode
           IlluminanceMeasurement:
-              - LightSensorType
+              # LightSensorTypeEnum was originally named LightSensorType, but we
+              # generate the same API for the names with/without "Enum" at the
+              # end, so the name can just change here.
+              - LightSensorTypeEnum
           Channel:
               - ChannelStatusEnum
               - LineupInfoTypeEnum
@@ -3940,7 +3943,7 @@
                   - Up
                   - Down
           IlluminanceMeasurement:
-              LightSensorType:
+              LightSensorTypeEnum:
                   - Photodiode
                   - CMOS
           Channel:
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index c9e63c2a757c4a..a215e2e4eddee0 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -32999,9 +32999,9 @@ typedef NS_OPTIONS(uint32_t, MTRColorControlFeature) {
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_ENUM(uint8_t, MTRIlluminanceMeasurementLightSensorType) {
-    MTRIlluminanceMeasurementLightSensorTypePhotodiode MTR_NEWLY_AVAILABLE = 0x00,
-    MTRIlluminanceMeasurementLightSensorTypeCMOS MTR_NEWLY_AVAILABLE = 0x01,
-} MTR_NEWLY_AVAILABLE;
+    MTRIlluminanceMeasurementLightSensorTypePhotodiode API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
+    MTRIlluminanceMeasurementLightSensorTypeCMOS API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_OPTIONS(uint32_t, MTRPressureMeasurementFeature) {
     MTRPressureMeasurementFeatureExtended MTR_NEWLY_AVAILABLE = 0x1,