Skip to content

Commit 572a799

Browse files
Update Darwin availability annotations. (#36807)
1 parent 41a9dea commit 572a799

9 files changed

+910
-902
lines changed

src/darwin/Framework/CHIP/MTRAttributeValueWaiter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ MTR_AVAILABLE(ios(18.3), macos(15.3), watchos(11.3), tvos(18.3))
3131
*/
3232
- (void)cancel;
3333

34-
@property (readonly, nonatomic) NSUUID * UUID MTR_NEWLY_AVAILABLE;
34+
@property (readonly, nonatomic) NSUUID * UUID MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
3535

3636
@end
3737

src/darwin/Framework/CHIP/MTRDevice.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
126126
/**
127127
* Network commissioning features supported by the device.
128128
*/
129-
@property (nonatomic, readonly) MTRNetworkCommissioningFeature networkCommissioningFeatures MTR_NEWLY_AVAILABLE;
129+
@property (nonatomic, readonly) MTRNetworkCommissioningFeature networkCommissioningFeatures MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
130130

131131
/**
132132
* Set the delegate to receive asynchronous callbacks about the device.
@@ -228,7 +228,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
228228
* data-values (as described in the documentation for
229229
* MTRDeviceResponseHandler) as values.
230230
*/
231-
- (NSDictionary<MTRAttributePath *, NSDictionary<NSString *, id> *> *)descriptorClusters MTR_NEWLY_AVAILABLE;
231+
- (NSDictionary<MTRAttributePath *, NSDictionary<NSString *, id> *> *)descriptorClusters MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
232232

233233
/**
234234
* Invoke a command with a designated command path

src/darwin/Framework/CHIP/MTRKeypair.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,19 @@ NS_ASSUME_NONNULL_BEGIN
3131
* Implementations of the keypair methods must not call into any Matter
3232
* framework APIs.
3333
*/
34+
MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
3435
@protocol MTRKeypair <NSObject>
3536

3637
@optional
3738
/**
3839
* @brief Returns a copy of the public key for the keypair.
3940
*/
40-
- (SecKeyRef)copyPublicKey MTR_NEWLY_AVAILABLE;
41+
- (SecKeyRef)copyPublicKey MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
4142

4243
/**
4344
* @brief Returns public key for the keypair without adding a reference. DEPRECATED - please use copyPublicKey, otherwise this will leak.
4445
*/
45-
- (SecKeyRef)publicKey MTR_NEWLY_DEPRECATED("Please implement copyPublicKey, this will leak otherwise");
46+
- (SecKeyRef)publicKey MTR_DEPRECATED("Please implement copyPublicKey, this will leak otherwise", ios(16.1, 18.4), macos(13.0, 15.4), watchos(9.1, 11.4), tvos(16.1, 18.4));
4647

4748
/**
4849
* @brief A function to sign a message using ECDSA

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

+9-2
Original file line numberDiff line numberDiff line change
@@ -10008,8 +10008,12 @@
1000810008
- XY
1000910009
- ColorTemperature
1001010010

10011-
- release: "Future"
10012-
versions: "future"
10011+
- release: "8377F965-9A14-4120-AAC4-4F296BA64949"
10012+
versions:
10013+
iOS: "18.4"
10014+
macOS: "15.4"
10015+
watchOS: "11.4"
10016+
tvOS: "18.4"
1001310017
introduced:
1001410018
clusters:
1001510019
- DishwasherAlarm
@@ -10632,3 +10636,6 @@
1063210636
# The one bit in this bitmap is marked X in the spec, but we can't have
1063310637
# an empty bitmap.
1063410638
- Feature
10639+
10640+
- release: "Future"
10641+
versions: "future"

src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

+460-460
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h

+149-149
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTRClusters.h

+160-160
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h

+63-63
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h

+63-63
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)