HomeKit watchOS xcode13.0 beta1

#HomeKit.framework https://github.com/xamarin/xamarin-macios/pull/12092

diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategory.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategory.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategory.h	2021-03-16 05:20:43.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategory.h	2021-06-02 07:36:23.000000000 -0400
@@ -20,12 +20,12 @@
 /*!
  * @brief A type identifier that represents the category.
  */
-@property(readonly, copy, nonatomic) NSString *categoryType;
+@property(readonly, copy) NSString *categoryType;
 
 /*!
  * @brief The localized description of the category.
  */
-@property(readonly, copy, nonatomic) NSString *localizedDescription;
+@property(readonly, copy) NSString *localizedDescription;
 
 @end
 
diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h	1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h	2021-06-02 07:36:21.000000000 -0400
@@ -0,0 +1,30 @@
+//
+//  HMAccessorySetupManager.h
+//  HomeKit
+//
+//  Copyright © 2021 Apple Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HomeKit/HMDefines.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class HMCHIPServiceTopology;
+
+HM_EXTERN API_AVAILABLE(ios(15.0))
+@interface HMAccessorySetupManager : NSObject
+
+/*!
+ * @abstract Add and set up CHIP accessories with a CHIP Partner Ecosystem App. This flow is unique among the
+ *           "Add Accessory" flows in that it primarily targets the originating (i.e. non-HomeKit) ecosystem
+ *           to add accessories to. "Add to Apple Home?" is presented as a final, optional step after the user
+ *           has completed pairing and configuration with the Partner Ecosystem App
+ *
+ * @param topology  A configuration object representing the topology of the initiating ecosystem
+ */
+- (void)addAndSetUpAccessoriesForTopology:(HMCHIPServiceTopology *)topology completionHandler:(HMErrorBlock)completion API_AVAILABLE(ios(15.0)) API_UNAVAILABLE(macos);
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceHome.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceHome.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceHome.h	1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceHome.h	2021-06-02 07:36:22.000000000 -0400
@@ -0,0 +1,38 @@
+//
+//  HMCHIPServiceHome.h
+//  HomeKit
+//
+//  Copyright © 2021 Apple Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HomeKit/HMDefines.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ * @abstract A simple home  representation that can be passed back and forth between Partner Ecosystem App extensions and iOS for the purposes of CHIP accessory setup.
+ */
+HM_EXTERN API_AVAILABLE(ios(15.0))
+@interface HMCHIPServiceHome : NSObject <NSCopying, NSSecureCoding>
+
+/*!
+ *  @abstract   The UUID of the receiver
+ */
+@property (nonatomic, strong, readonly) NSUUID *uuid;
+
+/*!
+ *  @abstract   The name of the receiver
+ */
+@property (nonatomic, strong, readonly) NSString *name;
+
+/*!
+ *  @abstract   Initializes a new instance
+ */
+- (instancetype)initWithUUID:(NSUUID *)uuid name:(NSString *)name NS_DESIGNATED_INITIALIZER;
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRequestHandler.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRequestHandler.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRequestHandler.h	1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRequestHandler.h	2021-06-02 07:36:24.000000000 -0400
@@ -0,0 +1,43 @@
+//
+//  HMCHIPServiceRequestHandler.h
+//  HomeKit
+//
+//  Copyright © 2021 Apple Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HomeKit/HMDefines.h>
+
+@class HMCHIPServiceHome;
+@class HMCHIPServiceRoom;
+
+NS_ASSUME_NONNULL_BEGIN
+
+HM_EXTERN API_AVAILABLE(ios(15.0))
+@interface HMCHIPServiceRequestHandler : NSObject <NSExtensionRequestHandling>
+
+/**
+ * @abstract Use this method to vend the rooms that correspond to a given home to accessory setup. iOS will issue this request before presenting the "Select Room" card.
+ * @param home The home for which iOS is requesting rooms
+ * @param completion Invoke the completion block with the requested rooms or an optional error
+ */
+- (void)fetchRoomsInHome:(HMCHIPServiceHome *)home completion:(void (^)(NSArray<HMCHIPServiceRoom *> * _Nullable, NSError * _Nullable))completion NS_SWIFT_ASYNC_NAME(rooms(in:));
+
+/*!
+ * @abstract When this method is invoked, pair with the given accessory payload
+ * @param pairingIdentifier The CHIP pairing identifier to pair with. Can be parsed as a manual entered string
+ * @param completion Invoke the completion handler with an optional error after pairing
+ */
+- (void)pairAccessoryInHome:(HMCHIPServiceHome *)home pairingIdentifier:(NSString *)pairingIdentifier completion:(void(^)( NSError * _Nullable ))completion;
+
+/*!
+ * @abstract When this method is invoked, configure the accessory with user selected attributes.
+ * @param accessoryName The user given name for the accessory
+ * @param accessoryRoom The user selected room for the accessory
+ * @param completion Invoke the completion handler with an optional error after configuration
+ */
+- (void)configureAccessoryWithName:(NSString *)accessoryName room:(HMCHIPServiceRoom *)accessoryRoom completion:(void(^)( NSError * _Nullable ))completion NS_SWIFT_NAME(configureAccessory(named:room:completion:));
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRoom.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRoom.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRoom.h	1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRoom.h	2021-06-02 07:36:21.000000000 -0400
@@ -0,0 +1,37 @@
+//
+//  HMCHIPServiceRoom.h
+//  HomeKit
+//
+//  Copyright © 2021 Apple Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HomeKit/HMDefines.h>
+
+NS_ASSUME_NONNULL_BEGIN
+/*!
+ * @abstract A simple room representation that can be passed back and forth between Partner Ecosystem App extensions and iOS for the purposes of CHIP accessory setup.
+ */
+HM_EXTERN API_AVAILABLE(ios(15.0))
+@interface HMCHIPServiceRoom : NSObject <NSCopying, NSSecureCoding>
+
+/*!
+ *  @abstract   The UUID of the receiver
+ */
+@property (nonatomic, strong, readonly) NSUUID *uuid;
+
+/*!
+ *  @abstract   The name of the receiver
+ */
+@property (nonatomic, strong, readonly) NSString *name;
+
+/*!
+ *  @abstract   Initializes a new instance
+ */
+- (instancetype)initWithUUID:(NSUUID *)uuid name:(NSString *)name NS_DESIGNATED_INITIALIZER;
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceTopology.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceTopology.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceTopology.h	1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceTopology.h	2021-06-02 07:36:20.000000000 -0400
@@ -0,0 +1,38 @@
+//
+//  HMCHIPServiceTopology.h
+//  HomeKit
+//
+//  Copyright © 2020 Apple Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HomeKit/HMDefines.h>
+
+@class HMCHIPServiceHome;
+@class HMCHIPServiceRoom;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ * @abstract Wraps the information a CHIP Ecosystem Partner is expected to pass when initiating setup. The number of homes vended to HomeKit by this class dictate whether a home selection step will be presented as part of setup. If so, these homes will be represented in system UI for user selection.
+ */
+HM_EXTERN API_AVAILABLE(ios(15.0))
+@interface HMCHIPServiceTopology: NSObject <NSCopying, NSSecureCoding>
+
+/*!
+ * @abstract HMCHIPServiceTopology initializer.
+ * @param homes count must be greater than 0.  If count is greater than 1, setup will present a home selection card.
+ */
+- (instancetype)initWithHomes:(NSArray<HMCHIPServiceHome *> *)homes;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+/*!
+ * @abstract Homes  provided by the partner ecosystem app for selection in iOS system UI.
+ */
+@property (nonatomic, copy, readonly) NSArray<HMCHIPServiceHome *> *homes;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicTypes.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicTypes.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicTypes.h	2021-03-16 08:45:35.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicTypes.h	2021-06-02 07:36:21.000000000 -0400
@@ -45,26 +45,6 @@
 HM_EXTERN NSString * const HMCharacteristicTypeTargetRelativeHumidity API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
- * @brief Characteristic type for manufacturer. The value of the characteristic is a string.
- */
-HM_EXTERN NSString * const HMCharacteristicTypeManufacturer API_DEPRECATED_WITH_REPLACEMENT("Use -[HMAccessory manufacturer] instead", ios(8.0, 11.0), watchos(2.0, 4.0), tvos(10.0, 11.0)) API_UNAVAILABLE(macos, macCatalyst);
-
-/*!
- * @brief Characteristic type for model. The value of the characteristic is a string.
- */
-HM_EXTERN NSString * const HMCharacteristicTypeModel API_DEPRECATED_WITH_REPLACEMENT("Use -[HMAccessory model] instead", ios(8.0, 11.0), watchos(2.0, 4.0), tvos(10.0, 11.0)) API_UNAVAILABLE(macos, macCatalyst);
-
-/*!
- * @brief Characteristic type for serial number. The value of the characteristic is a string.
- */
-HM_EXTERN NSString * const HMCharacteristicTypeSerialNumber API_DEPRECATED("No longer supported", ios(8.0, 11.0), watchos(2.0, 4.0), tvos(10.0, 11.0)) API_UNAVAILABLE(macos, macCatalyst);
-
-/*!
- * @brief Characteristic type for identify. The characteristic is write-only that takes a boolean.
- */
-HM_EXTERN NSString * const HMCharacteristicTypeIdentify API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
-
-/*!
  * @brief Characteristic type for outlet in use. The value of the characteristic is a boolean, which is true
  *        if the outlet is in use.
  */
@@ -198,18 +178,6 @@
 HM_EXTERN NSString * const HMCharacteristicTypeCurrentVerticalTilt API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
- * @brief Characteristic type for firmware version. The value of the characteristic is a string value
- *        describing the firmware version of the accessory.
- */
-HM_EXTERN NSString * const HMCharacteristicTypeFirmwareVersion API_DEPRECATED_WITH_REPLACEMENT("Use -[HMAccessory firmwareVersion] instead", ios(8.0, 11.0), watchos(2.0, 4.0), tvos(10.0, 11.0)) API_UNAVAILABLE(macos, macCatalyst);
-
-/*!
- * @brief Characteristic type for hardware version. The value of the characteristic is a string value
- *        describing the hardware version of the accessory.
- */
-HM_EXTERN NSString * const HMCharacteristicTypeHardwareVersion API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
-
-/*!
  * @brief Characteristic type for Hold Position. The value of the characteristic is a boolean
  *        indicating that the current position should be held/maintained.
  */
@@ -240,12 +208,6 @@
 HM_EXTERN NSString * const HMCharacteristicTypePositionState API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
- * @brief Characteristic type for software version. The value of the characteristic is a string value
- *        describing the software version of the accessory.
- */
-HM_EXTERN NSString * const HMCharacteristicTypeSoftwareVersion API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
-
-/*!
  * @brief Characteristic type to indicate status of a service is active. The value of the characteristic is a boolean.
  */
 HM_EXTERN NSString * const HMCharacteristicTypeStatusActive API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
@@ -511,6 +473,11 @@
 HM_EXTERN NSString * const HMCharacteristicTypeHue API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
+ * @brief Characteristic type for identify. The value of the characteristic is a boolean.
+ */
+HM_EXTERN NSString * const HMCharacteristicTypeIdentify API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+
+/*!
  * @brief Characteristic type for current lock mechanism state. The value of the characteristic is one of the values defined for HMCharacteristicValueLockMechanismState.
  */
 HM_EXTERN NSString * const HMCharacteristicTypeCurrentLockMechanismState API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
@@ -521,6 +488,16 @@
 HM_EXTERN NSString * const HMCharacteristicTypeTargetLockMechanismState API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
+ * @brief Characteristic type for manufacturer. The value of the characteristic is a string.
+ */
+HM_EXTERN NSString * const HMCharacteristicTypeManufacturer API_DEPRECATED_WITH_REPLACEMENT("Use -[HMAccessory manufacturer] instead", ios(8.0, 11.0), watchos(2.0, 4.0), tvos(10.0, 11.0), macCatalyst(14.0, 14.0)) API_UNAVAILABLE(macos);
+
+/*!
+ * @brief Characteristic type for model. The value of the characteristic is a string.
+ */
+HM_EXTERN NSString * const HMCharacteristicTypeModel API_DEPRECATED_WITH_REPLACEMENT("Use -[HMAccessory model] instead", ios(8.0, 11.0), watchos(2.0, 4.0), tvos(10.0, 11.0), macCatalyst(14.0, 14.0)) API_UNAVAILABLE(macos);
+
+/*!
  * @brief Characteristic type for name. The value of the characteristic is a string.
  */
 HM_EXTERN NSString * const HMCharacteristicTypeName API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
@@ -551,6 +528,11 @@
 HM_EXTERN NSString * const HMCharacteristicTypeSaturation API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
+ * @brief Characteristic type for serial number. The value of the characteristic is a string.
+ */
+HM_EXTERN NSString * const HMCharacteristicTypeSerialNumber API_DEPRECATED("No longer supported", ios(8.0, 11.0), watchos(2.0, 4.0), tvos(10.0, 11.0), macCatalyst(14.0, 14.0)) API_UNAVAILABLE(macos);
+
+/*!
  * @brief Characteristic type for target door state. The value of the characteristic is one of the values defined for HMCharacteristicValueTargetDoorState.
  */
 HM_EXTERN NSString * const HMCharacteristicTypeTargetDoorState API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
@@ -576,6 +558,21 @@
 HM_EXTERN NSString * const HMCharacteristicTypeVersion API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
+ * @brief Characteristic type for firmware version. The value of the characteristic is a string.
+ */
+HM_EXTERN NSString * const HMCharacteristicTypeFirmwareVersion API_DEPRECATED_WITH_REPLACEMENT("Use -[HMAccessory firmwareVersion] instead", ios(8.0, 11.0), watchos(2.0, 4.0), tvos(10.0, 11.0), macCatalyst(14.0, 14.0)) API_UNAVAILABLE(macos);
+
+/*!
+ * @brief Characteristic type for hardware version. The value of the characteristic is a string.
+ */
+HM_EXTERN NSString * const HMCharacteristicTypeHardwareVersion API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+
+/*!
+ * @brief Characteristic type for software version. The value of the characteristic is a string.
+ */
+HM_EXTERN NSString * const HMCharacteristicTypeSoftwareVersion API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+
+/*!
  * @brief Characteristic type for battery level. The value of the characteristic is a uint8 value in percent.
  */
 HM_EXTERN NSString * const HMCharacteristicTypeBatteryLevel API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMError.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMError.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMError.h	2021-03-16 13:59:28.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMError.h	2021-06-02 05:36:17.000000000 -0400
@@ -120,6 +120,7 @@
     HMErrorCodeTimedOutWaitingForAccessory             API_AVAILABLE(ios(14.0)) = 100,
     HMErrorCodeAccessoryCommunicationFailure           API_AVAILABLE(ios(14.0)) = 101,
     HMErrorCodeFailedToJoinNetwork                     API_AVAILABLE(ios(14.0)) = 102,
+    HMErrorCodeAccessoryIsSuspended                    API_AVAILABLE(ios(15.0)) = 103,
 } API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHome.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHome.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHome.h	2021-03-16 13:57:15.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHome.h	2021-06-02 12:45:06.000000000 -0400
@@ -172,7 +172,7 @@
 
 /*!
  * @brief Add accessory with the given setup payload to the home.
- * @note  This SPI requires entitlement: com.apple.homekit.developer.allow-setup-payload
+ * @note  This SPI requires entitlement: com.apple.developer.homekit.allow-setup-payload
  *
  * @param completion Block that is invoked once the request is processed.
  *                   Accessories provides the list of added accessories.
diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMServiceTypes.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMServiceTypes.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMServiceTypes.h	2021-03-16 08:48:29.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMServiceTypes.h	2021-06-02 11:09:08.000000000 -0400
@@ -27,11 +27,6 @@
 HM_EXTERN NSString * const HMServiceTypeThermostat API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
- * @brief Service type for accessory information.
- */
-HM_EXTERN NSString * const HMServiceTypeAccessoryInformation API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
-
-/*!
  * @brief Service type for outlet.
  */
 HM_EXTERN NSString * const HMServiceTypeOutlet API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
@@ -183,6 +178,11 @@
 
 
 /*!
+ * @brief Service type for accessory information.
+ */
+HM_EXTERN NSString * const HMServiceTypeAccessoryInformation API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+
+/*!
  * @brief Service type for fan.
  */
 HM_EXTERN NSString * const HMServiceTypeFan API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
diff -ruN /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h
--- /Applications/Xcode_12.5.0.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h	2021-03-16 05:15:47.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h	2021-06-01 22:33:28.000000000 -0400
@@ -60,3 +60,9 @@
 
 #import <HomeKit/HMCameraSettingsControl.h>
 #import <HomeKit/HMCameraAudioControl.h>
+
+#import <HomeKit/HMAccessorySetupManager.h>
+#import <HomeKit/HMCHIPServiceHome.h>
+#import <HomeKit/HMCHIPServiceRoom.h>
+#import <HomeKit/HMCHIPServiceTopology.h>
+#import <HomeKit/HMCHIPServiceRequestHandler.h>