Skip to content

Commit 18870ad

Browse files
bzbarsky-applej-ororke
authored andcommitted
Update Darwin availability annotations. (project-chip#34292)
1 parent c047e54 commit 18870ad

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/darwin/Framework/CHIP/MTRDevice.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
114114
*
115115
* The delegate will be called on the provided queue, for attribute reports, event reports, and device state changes.
116116
*/
117-
- (void)setDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queue MTR_NEWLY_DEPRECATED("Please use addDelegate:queue:interestedPaths:");
117+
- (void)setDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queue MTR_DEPRECATED("Please use addDelegate:queue:interestedPaths:", ios(16.1, 18.0), macos(13.0, 15.0), watchos(9.1, 11.0), tvos(16.1, 18.0));
118118

119119
/**
120120
* Adds a delegate to receive asynchronous callbacks about the device.
@@ -123,7 +123,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
123123
*
124124
* MTRDevice holds a weak reference to the delegate object.
125125
*/
126-
- (void)addDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queue MTR_NEWLY_AVAILABLE;
126+
- (void)addDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queue MTR_AVAILABLE(ios(18.0), macos(15.0), watchos(11.0), tvos(18.0));
127127

128128
/**
129129
* Adds a delegate to receive asynchronous callbacks about the device, and limit attribute and/or event reports to a specific set of paths.
@@ -138,12 +138,12 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
138138
*
139139
* MTRDevice holds a weak reference to the delegate object.
140140
*/
141-
- (void)addDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queue interestedPathsForAttributes:(NSArray * _Nullable)interestedPathsForAttributes interestedPathsForEvents:(NSArray * _Nullable)interestedPathsForEvents MTR_NEWLY_AVAILABLE;
141+
- (void)addDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queue interestedPathsForAttributes:(NSArray * _Nullable)interestedPathsForAttributes interestedPathsForEvents:(NSArray * _Nullable)interestedPathsForEvents MTR_AVAILABLE(ios(18.0), macos(15.0), watchos(11.0), tvos(18.0));
142142

143143
/**
144144
* Removes the delegate from receiving callbacks about the device.
145145
*/
146-
- (void)removeDelegate:(id<MTRDeviceDelegate>)delegate MTR_NEWLY_AVAILABLE;
146+
- (void)removeDelegate:(id<MTRDeviceDelegate>)delegate MTR_AVAILABLE(ios(18.0), macos(15.0), watchos(11.0), tvos(18.0));
147147

148148
/**
149149
* Read attribute in a designated attribute path. If there is no value available

src/darwin/Framework/CHIP/MTRDevice.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ - (void)addDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queu
802802
[self _addDelegate:delegate queue:queue interestedPathsForAttributes:nil interestedPathsForEvents:nil];
803803
}
804804

805-
- (void)addDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queue interestedPathsForAttributes:(NSArray * _Nullable)interestedPathsForAttributes interestedPathsForEvents:(NSArray * _Nullable)interestedPathsForEvents MTR_NEWLY_AVAILABLE;
805+
- (void)addDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queue interestedPathsForAttributes:(NSArray * _Nullable)interestedPathsForAttributes interestedPathsForEvents:(NSArray * _Nullable)interestedPathsForEvents
806806
{
807807
MTR_LOG("%@ addDelegate %@ with interested attribute paths %@ event paths %@", self, delegate, interestedPathsForAttributes, interestedPathsForEvents);
808808
[self _addDelegate:delegate queue:queue interestedPathsForAttributes:interestedPathsForAttributes interestedPathsForEvents:interestedPathsForEvents];

src/darwin/Framework/CHIP/templates/availability.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -9689,10 +9689,12 @@
96899689
versions: "future"
96909690
provisional:
96919691
clusters:
9692-
# Targeting Fall 2024
9692+
# Targeting 1.4
9693+
- CommissionerControl
96939694
- ServiceArea
96949695
- ThreadBorderRouterManagement
96959696
- ThreadNetworkDirectory
9697+
- WaterHeaterManagement
96969698
- WiFiNetworkManagement
96979699
attributes:
96989700
OccupancySensing:
@@ -9711,10 +9713,10 @@
97119713
- HoldTimeLimitsStruct
97129714
bitmaps:
97139715
OccupancySensing:
9714-
# Targeting Fall 1.4
9716+
# Targeting 1.4
97159717
- Feature
97169718
bitmap values:
97179719
Switch:
97189720
Feature:
9719-
# Targeting Fall 2024
9721+
# Targeting 1.4
97209722
- ActionSwitch

0 commit comments

Comments
 (0)