Merge branch 'master' into refactor/siwx917-trng-impl

project-chip · Jun 8, 2024 · 8622f22 · 8622f22
2 parents 73b8ffe + c1a6391
commit 8622f22
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDevice.h b/src/darwin/Framework/CHIP/MTRDevice.h
@@ -107,7 +107,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  *
  * nil if no such estimate is available.  Otherwise, the NSNumber stores an NSTimeInterval.
  */
-@property (nonatomic, readonly, nullable, copy) NSNumber * estimatedSubscriptionLatency MTR_NEWLY_AVAILABLE;
+@property (nonatomic, readonly, nullable, copy) NSNumber * estimatedSubscriptionLatency MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6));
 
 /**
  * Set the delegate to receive asynchronous callbacks about the device.

diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h b/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h
@@ -84,7 +84,7 @@ MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6))
  *
  * If this value is 0, the maximum subscription establishments allowed at a time will be set to 1.
  */
-@property (nonatomic, assign) NSUInteger concurrentSubscriptionEstablishmentsAllowedOnThread MTR_NEWLY_AVAILABLE;
+@property (nonatomic, assign) NSUInteger concurrentSubscriptionEstablishmentsAllowedOnThread MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6));
 
 /**
  * Sets the storage behavior configuration - see MTRDeviceStorageBehaviorConfiguration.h for details

diff --git a/src/darwin/Framework/CHIP/MTRDeviceStorageBehaviorConfiguration.h b/src/darwin/Framework/CHIP/MTRDeviceStorageBehaviorConfiguration.h
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Class that configures how MTRDevice objects persist its attributes to storage, so as to not
  * overwhelm the underlying storage system.
  */
-MTR_NEWLY_AVAILABLE
+MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6))
 @interface MTRDeviceStorageBehaviorConfiguration : NSObject <NSCopying>
 
 /**