Skip to content

Commit ff2b0e4

Browse files
Fix availability annotations for XPC protocols in Matter.framework. (project-chip#37211)
There were backwards-incompatible changes to MTRXPCServerProtocol_MTRDeviceController and MTRXPCServerProtocol, so mark those as not available before those changes, to avoid problems with people trying to use them before the change happened. controllerConfigurationUpdated and updateControllerConfiguration were added later than the protocol they are part of, and need to be annotated accordingly.
1 parent 0c1a606 commit ff2b0e4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/darwin/Framework/CHIP/XPC Protocol/MTRXPCClientProtocol.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2))
3838
//- (oneway void)controller:(NSUUID *)controller commissioningComplete:(NSError * _Nullable)error nodeID:(NSNumber * _Nullable)nodeID metrics:(MTRMetrics * _Nullable)metrics;
3939
//- (oneway void)controller:(NSUUID *)controller readCommissioningInfo:(MTRProductIdentity *)info;
4040
@optional
41-
- (oneway void)controller:(NSUUID *)controller controllerConfigurationUpdated:(NSDictionary *)configuration;
41+
- (oneway void)controller:(NSUUID *)controller controllerConfigurationUpdated:(NSDictionary *)configuration MTR_AVAILABLE(ios(18.3), macos(15.3), watchos(11.3), tvos(18.3));
4242
@end
4343

4444
MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2))

src/darwin/Framework/CHIP/XPC Protocol/MTRXPCServerProtocol.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2))
5454

5555
@end
5656

57-
MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2))
57+
MTR_AVAILABLE(ios(18.3), macos(15.3), watchos(11.3), tvos(18.3))
5858
@protocol MTRXPCServerProtocol_MTRDeviceController <NSObject>
5959

6060
@optional
@@ -75,11 +75,11 @@ MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2))
7575

7676
- (oneway void)deviceController:(NSUUID *)controller registerNodeID:(NSNumber *)nodeID;
7777
- (oneway void)deviceController:(NSUUID *)controller unregisterNodeID:(NSNumber *)nodeID;
78-
- (oneway void)deviceController:(NSUUID *)controller updateControllerConfiguration:(NSDictionary *)controllerState;
78+
- (oneway void)deviceController:(NSUUID *)controller updateControllerConfiguration:(NSDictionary *)controllerState MTR_AVAILABLE(ios(18.3), macos(15.3), watchos(11.3), tvos(18.3));
7979

8080
@end
8181

82-
MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2))
82+
MTR_AVAILABLE(ios(18.3), macos(15.3), watchos(11.3), tvos(18.3))
8383
@protocol MTRXPCServerProtocol <NSObject, MTRXPCServerProtocol_MTRDevice, MTRXPCServerProtocol_MTRDeviceController>
8484
@optional
8585
- (oneway void)deviceController:(NSUUID *)controller checkInWithContext:(NSDictionary *)context;

0 commit comments

Comments
 (0)