Skip to content

HomeKit tvOS xcode14.0 beta4

Manuel de la Pena edited this page Aug 5, 2022 · 3 revisions

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

diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessControl.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessControl.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessControl.h	2022-06-30 09:29:55.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessControl.h	2022-07-22 10:04:49.000000000 -0400
@@ -14,7 +14,7 @@
  *  @abstract   The HMAccessControl class represents a generic access control.
  */
 HM_EXTERN API_AVAILABLE(ios(11.2), watchos(4.2), tvos(11.2), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMAccessControl : NSObject
+    @interface HMAccessControl : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessory+Camera.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessory+Camera.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessory+Camera.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessory+Camera.h	2022-07-22 10:04:51.000000000 -0400
@@ -6,8 +6,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <HomeKit/HMDefines.h>
 #import <HomeKit/HMAccessory.h>
+#import <HomeKit/HMDefines.h>
 
 @class HMCameraProfile;
 
@@ -16,7 +16,7 @@
 /*!
  * @abstract Category implementing methods related to camera profile.
  */
-@interface HMAccessory(Camera)
+@interface HMAccessory (Camera)
 
 /*!
  * @brief Returns array of camera profiles implemented by the accessory.
@@ -25,7 +25,7 @@
  *             an HMCameraProfile object. If the accessory does not contain a camera, this property
  *             will be nil.
  */
-@property(readonly, copy, nonatomic, nullable) NSArray<HMCameraProfile *> *cameraProfiles API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+@property (readonly, copy, nonatomic, nullable) NSArray<HMCameraProfile *> *cameraProfiles API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessory.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessory.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessory.h	2022-06-30 09:32:19.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessory.h	2022-07-25 15:34:34.000000000 -0400
@@ -26,7 +26,7 @@
  *             class. An accessory is composed of one or more services.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMAccessory : NSObject
+    @interface HMAccessory : NSObject
 
 /*!
  * @brief The name of the accessory.
@@ -34,29 +34,29 @@
  * @discussion Returns the accessory's name that is associated with HomeKit. The initial value is the name
  *             provided by the accessory information service of the accessory.
  */
-@property(readonly, copy, nonatomic) NSString *name;
+@property (readonly, copy, nonatomic) NSString *name;
 
 /*!
  * @brief A unique identifier for the accessory.
  *
  * @discussion Use uniqueIdentifier to obtain the identifier for this object.
  */
-@property(readonly, copy, nonatomic) NSUUID *identifier API_DEPRECATED("No longer supported.", ios(8.0, 9.0)) API_UNAVAILABLE(watchos, tvos);
+@property (readonly, copy, nonatomic) NSUUID *identifier API_DEPRECATED("No longer supported.", ios(8.0, 9.0)) API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief A unique identifier for the accessory.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief Delegate object that receives updates on the state of the accessory.
  */
-@property(weak, nonatomic, nullable) id<HMAccessoryDelegate> delegate;
+@property (weak, nonatomic, nullable) id<HMAccessoryDelegate> delegate;
 
 /*!
  * @brief TRUE if the accessory is currently reachable, FALSE otherwise.
  */
-@property(readonly, getter=isReachable, nonatomic) BOOL reachable;
+@property (readonly, getter=isReachable, nonatomic) BOOL reachable;
 
 /*!
  * @brief This property indicates whether this accessory is behind a bridge. If it is TRUE,
@@ -64,7 +64,7 @@
  *        this accessory can be removed and removing the bridge will remove this accessory
  *        from the home.
  */
-@property(readonly, getter=isBridged, nonatomic) BOOL bridged;
+@property (readonly, getter=isBridged, nonatomic) BOOL bridged;
 
 /*!
  * @brief If this accessory is a bridge, this property is an array of NSUUID objects that,
@@ -73,7 +73,7 @@
  * @discussion Use uniqueIdentifiersForBridgedAccessories to obtain the identifiers for the
  *             bridged accessories.
  */
-@property(readonly, copy, nonatomic, nullable) NSArray<NSUUID *> *identifiersForBridgedAccessories API_DEPRECATED("No longer supported.", ios(8.0, 9.0)) API_UNAVAILABLE(watchos, tvos);
+@property (readonly, copy, nonatomic, nullable) NSArray<NSUUID *> *identifiersForBridgedAccessories API_DEPRECATED("No longer supported.", ios(8.0, 9.0)) API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief If this accessory is a bridge, this property is an array of NSUUID objects that,
@@ -87,33 +87,33 @@
  *                  - An accessory behind a bridge would have its 'bridged' property set to TRUE and
  *                    its 'uniqueIdentifiersForBridgedAccessories' property set to nil.
  */
-@property(readonly, copy, nonatomic, nullable) NSArray<NSUUID *> *uniqueIdentifiersForBridgedAccessories API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic, nullable) NSArray<NSUUID *> *uniqueIdentifiersForBridgedAccessories API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief Category information for the accessory. 
  */
-@property(readonly, strong, nonatomic) HMAccessoryCategory *category API_AVAILABLE(ios(9.0));
+@property (readonly, strong, nonatomic) HMAccessoryCategory *category API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief Room containing the accessory.
  */
-@property(readonly, weak, nonatomic) HMRoom *room;
+@property (readonly, weak, nonatomic) HMRoom *room;
 
 /*!
  * @brief Array of HMService objects that represent all the services provided by the accessory.
  */
-@property(readonly, copy, nonatomic) NSArray<HMService *> *services;
+@property (readonly, copy, nonatomic) NSArray<HMService *> *services;
 
 /*!
  *  @abstract   Accessory profiles of the receiver.
  */
-@property(readonly, copy) NSArray<HMAccessoryProfile *> *profiles API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
+@property (readonly, copy) NSArray<HMAccessoryProfile *> *profiles API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
 
 /*!
  * @brief TRUE if the accessory is blocked, FALSE otherwise.
  */
 
-@property(readonly, getter=isBlocked, nonatomic) BOOL blocked;
+@property (readonly, getter=isBlocked, nonatomic) BOOL blocked;
 
 /*!
  *  @abstract   Model of the accessory.
@@ -146,7 +146,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief This method is used to have an accessory identify itself.
@@ -155,7 +155,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)identifyWithCompletionHandler:(void (^)(NSError * __nullable error))completion;
+- (void)identifyWithCompletionHandler:(void (^)(NSError *__nullable error))completion;
 
 @end
 
@@ -165,7 +165,7 @@
  *        different aspects of an accessory
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@protocol HMAccessoryDelegate <NSObject>
+    @protocol HMAccessoryDelegate<NSObject>
 
 @optional
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryBrowser.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryBrowser.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryBrowser.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryBrowser.h	2022-07-22 10:04:52.000000000 -0400
@@ -20,19 +20,19 @@
  *        that have never been paired with and therefore not part of the home.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0)) API_UNAVAILABLE(macos, watchos, tvos, macCatalyst)
-@interface HMAccessoryBrowser : NSObject
+    @interface HMAccessoryBrowser : NSObject
 
 /*!
  * @brief Delegate that receives updates on the state of the accessories discovered.
  */
-@property(weak, nonatomic, nullable) id<HMAccessoryBrowserDelegate> delegate;
+@property (weak, nonatomic, nullable) id<HMAccessoryBrowserDelegate> delegate;
 
 /*!
  * @brief This is the array of HMAccessory objects that represents new
  *        accessories that were discovered as part of a search session.
  *        This array is not updated when a search session is not in progress.
  */
-@property(readonly, copy, nonatomic) NSArray<HMAccessory *> *discoveredAccessories;
+@property (readonly, copy, nonatomic) NSArray<HMAccessory *> *discoveredAccessories;
 
 /*!
  * @brief Starts searching for accessories that are not associated to any home.
@@ -66,8 +66,8 @@
 /*!
  * @brief This delegate receives updates about new accessories in the home.
  */
-HM_EXTERN API_AVAILABLE(ios(8.0)) API_UNAVAILABLE(macos, watchos, tvos, macCatalyst) 
-@protocol HMAccessoryBrowserDelegate <NSObject>
+HM_EXTERN API_AVAILABLE(ios(8.0)) API_UNAVAILABLE(macos, watchos, tvos, macCatalyst)
+    @protocol HMAccessoryBrowserDelegate<NSObject>
 
 @optional
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategory.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategory.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategory.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategory.h	2022-07-22 10:04:51.000000000 -0400
@@ -15,17 +15,17 @@
  * @brief This class is used to represent an accessory category.
  */
 HM_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMAccessoryCategory : NSObject
+    @interface HMAccessoryCategory : NSObject
 
 /*!
  * @brief A type identifier that represents the category.
  */
-@property(readonly, copy) NSString *categoryType;
+@property (readonly, copy) NSString *categoryType;
 
 /*!
  * @brief The localized description of the category.
  */
-@property(readonly, copy) NSString *localizedDescription;
+@property (readonly, copy) NSString *localizedDescription;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategoryTypes.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategoryTypes.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategoryTypes.h	2022-06-30 09:29:55.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryCategoryTypes.h	2022-07-22 10:07:08.000000000 -0400
@@ -17,129 +17,129 @@
 /*!
  * @brief Category type for Other.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeOther API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeOther API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Security System.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeSecuritySystem API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeSecuritySystem API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Bridge.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeBridge API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeBridge API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Door.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeDoor API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeDoor API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Door Lock.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeDoorLock API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeDoorLock API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Fan.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeFan API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeFan API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Garage Door Opener.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeGarageDoorOpener API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeGarageDoorOpener API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*
 * @brief Category type for IP Camera.
 */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeIPCamera API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeIPCamera API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Lightbulb.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeLightbulb API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeLightbulb API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Outlet.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeOutlet API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeOutlet API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Programmable Switch.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeProgrammableSwitch API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeProgrammableSwitch API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Range Extender
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeRangeExtender API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeRangeExtender API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Sensor.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeSensor API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeSensor API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Switch.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeSwitch API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeSwitch API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Thermostat.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeThermostat API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeThermostat API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Video Doorbell.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeVideoDoorbell API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeVideoDoorbell API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Window.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeWindow API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeWindow API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Window Covering.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeWindowCovering API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeWindowCovering API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Air Purifier.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeAirPurifier API_AVAILABLE(ios(10.2), watchos(3.1.1), tvos(10.1), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeAirPurifier API_AVAILABLE(ios(10.2), watchos(3.1.1), tvos(10.1), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Air Heater.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeAirHeater API_AVAILABLE(ios(10.2), watchos(3.1.1), tvos(10.1), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeAirHeater API_AVAILABLE(ios(10.2), watchos(3.1.1), tvos(10.1), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Air Conditioner.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeAirConditioner API_AVAILABLE(ios(10.2), watchos(3.1.1), tvos(10.1), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeAirConditioner API_AVAILABLE(ios(10.2), watchos(3.1.1), tvos(10.1), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Air Humidifier.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeAirHumidifier API_AVAILABLE(ios(10.2), watchos(3.1.1), tvos(10.1), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeAirHumidifier API_AVAILABLE(ios(10.2), watchos(3.1.1), tvos(10.1), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Air Dehumidifier.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeAirDehumidifier API_AVAILABLE(ios(10.2), watchos(3.1.1), tvos(10.1), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeAirDehumidifier API_AVAILABLE(ios(10.2), watchos(3.1.1), tvos(10.1), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Sprinkler.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeSprinkler API_AVAILABLE(ios(11.2), watchos(4.2), tvos(11.2), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeSprinkler API_AVAILABLE(ios(11.2), watchos(4.2), tvos(11.2), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Faucet.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeFaucet API_AVAILABLE(ios(11.2), watchos(4.2), tvos(11.2), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeFaucet API_AVAILABLE(ios(11.2), watchos(4.2), tvos(11.2), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Category type for Shower Head.
  */
-HM_EXTERN NSString * const HMAccessoryCategoryTypeShowerHead API_AVAILABLE(ios(11.2), watchos(4.2), tvos(11.2), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMAccessoryCategoryTypeShowerHead API_AVAILABLE(ios(11.2), watchos(4.2), tvos(11.2), macCatalyst(14.0)) API_UNAVAILABLE(macos);
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryProfile.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryProfile.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryProfile.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessoryProfile.h	2022-07-22 10:04:50.000000000 -0400
@@ -17,24 +17,24 @@
  * @abstract Represents a profile implemented by an accessory.
  */
 HM_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMAccessoryProfile : NSObject
+    @interface HMAccessoryProfile : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief A unique identifier for the profile.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier;
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier;
 
 /*!
  * @brief Collection of services representing the profile.
  */
-@property(readonly, strong, nonatomic) NSArray<HMService *> *services;
+@property (readonly, strong, nonatomic) NSArray<HMService *> *services;
 
 /*!
  * @brief Accessory implementing the profile.
  */
-@property(readonly, weak, nonatomic) HMAccessory *accessory;
+@property (readonly, weak, nonatomic) HMAccessory *accessory;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h	2022-07-22 10:04:50.000000000 -0400
@@ -20,7 +20,7 @@
  *              These APIs do not require that the current app has home data authorization
  */
 HM_EXTERN API_AVAILABLE(ios(15.0)) API_UNAVAILABLE(watchos, tvos) API_UNAVAILABLE(macos, macCatalyst)
-@interface HMAccessorySetupManager : NSObject
+    @interface HMAccessorySetupManager : NSObject
 
 /*!
  *  @abstract   Launch system UI to perform the process of setting up accessories with the given request.
@@ -31,7 +31,7 @@
  *  @param completion A block that is invoked once the setup process finishes. On failure, the result will be
  *                    nil and the error will provide additional information
  */
-- (void)performAccessorySetupUsingRequest:(HMAccessorySetupRequest *)request completionHandler:(void(^)(HMAccessorySetupResult * _Nullable result, NSError * _Nullable error))completion API_AVAILABLE(ios(15.4)) API_UNAVAILABLE(watchos, tvos);
+- (void)performAccessorySetupUsingRequest:(HMAccessorySetupRequest *)request completionHandler:(void (^)(HMAccessorySetupResult *_Nullable result, NSError *_Nullable error))completion API_AVAILABLE(ios(15.4))API_UNAVAILABLE(watchos, tvos);
 
 /*!
  *  @abstract   Launch system UI to perform the process of setting up Matter accessories with a Matter Partner
@@ -47,7 +47,7 @@
  */
 - (void)performMatterEcosystemAccessorySetupUsingRequest:(HMAccessorySetupRequest *)request
                                                 topology:(HMMatterTopology *)topology
-                                       completionHandler:(HMErrorBlock)completion API_AVAILABLE(ios(15.4)) API_UNAVAILABLE(watchos, tvos);
+                                       completionHandler:(HMErrorBlock)completion API_AVAILABLE(ios(15.4))API_UNAVAILABLE(watchos, tvos);
 - (void)addAndSetUpAccessoriesForTopology:(HMMatterTopology *)topology completionHandler:(HMErrorBlock)completion API_DEPRECATED("Use -[HMAccessorySetupManager performAccessorySetupUsingRequest:topology:completionHandler:] instead", ios(15.0, 15.4));
 
 @end
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupPayload.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupPayload.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupPayload.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupPayload.h	2022-07-22 10:04:50.000000000 -0400
@@ -11,7 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 HM_EXTERN API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(macos, watchos, tvos, macCatalyst)
-@interface HMAccessoryOwnershipToken : NSObject
+    @interface HMAccessoryOwnershipToken : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
@@ -31,7 +31,7 @@
 @end
 
 HM_EXTERN API_AVAILABLE(ios(11.3)) API_UNAVAILABLE(macos, watchos, tvos, macCatalyst)
-@interface HMAccessorySetupPayload : NSObject
+    @interface HMAccessorySetupPayload : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
@@ -54,7 +54,7 @@
  *
  * @return Returns an accessory setup payload object if successful or nil on error.
  */
-- (nullable instancetype)initWithURL:(NSURL *)setupPayloadURL ownershipToken:(nullable HMAccessoryOwnershipToken *)ownershipToken API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(macos, watchos, tvos) NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithURL:(NSURL *)setupPayloadURL ownershipToken:(nullable HMAccessoryOwnershipToken *)ownershipToken API_AVAILABLE(ios(13.0))API_UNAVAILABLE(macos, watchos, tvos)NS_DESIGNATED_INITIALIZER;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupRequest.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupRequest.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupRequest.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupRequest.h	2022-07-22 10:04:50.000000000 -0400
@@ -11,9 +11,10 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @class HMAccessorySetupPayload;
+@class CHIPSetupPayload;
 
 HM_EXTERN API_AVAILABLE(ios(15.4)) API_UNAVAILABLE(watchos, tvos) API_UNAVAILABLE(macos, macCatalyst)
-@interface HMAccessorySetupRequest : NSObject <NSCopying>
+    @interface HMAccessorySetupRequest : NSObject<NSCopying>
 
 /*!
  *  @abstract   The payload to use for accessory setup
@@ -23,6 +24,13 @@
 @property (nullable, copy) HMAccessorySetupPayload *payload;
 
 /*!
+ *  @abstract   The payload to use for Matter accessory setup
+ *  @note       When this is non-nil, the following entitlement is required:
+ *                  com.apple.developer.matter.allow-setup-payload
+ */
+@property (nullable, strong) CHIPSetupPayload *matterPayload;
+
+/*!
  *  @abstract   The -[HMHome uniqueIdentifier] that corresponds to the HMHome that the accessory should be
  *              added to when being set up. If nil, then the user will be prompted to choose a home
  */
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupResult.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupResult.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupResult.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupResult.h	2022-07-22 10:04:52.000000000 -0400
@@ -12,7 +12,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 HM_EXTERN API_AVAILABLE(ios(15.4)) API_UNAVAILABLE(watchos, tvos) API_UNAVAILABLE(macos, macCatalyst)
-@interface HMAccessorySetupResult : NSObject <NSCopying>
+    @interface HMAccessorySetupResult : NSObject<NSCopying>
 
 /*!
  *  @abstract   The -[HMHome uniqueIdentifier] that the accessories were added to
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAction.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAction.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAction.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAction.h	2022-07-22 10:04:51.000000000 -0400
@@ -12,12 +12,12 @@
  * @brief This class is used to represent a generic action.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMAction : NSObject
+    @interface HMAction : NSObject
 
 /*!
  * @brief A unique identifier for the action.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMActionSet.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMActionSet.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMActionSet.h	2022-06-30 09:32:19.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMActionSet.h	2022-07-22 09:58:12.000000000 -0400
@@ -17,43 +17,43 @@
 /*!
  * @brief This class represents a collection of action objects that can be executed. 
  *        The order of execution of these actions is undefined.
- */             
+ */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMActionSet : NSObject
+    @interface HMActionSet : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief The name of the action set.
  */
-@property(readonly, copy, nonatomic) NSString *name;
+@property (readonly, copy, nonatomic) NSString *name;
 
 /*!
  * @brief Set of HMAction objects that represent the individual items of the action set.
  */
-@property(readonly, copy, nonatomic) NSSet<HMAction *> *actions;
+@property (readonly, copy, nonatomic) NSSet<HMAction *> *actions;
 
 /*!
  * @brief Specifies whether the action set is currently executing or not.
  */
-@property(readonly, getter=isExecuting, nonatomic) BOOL executing;
+@property (readonly, getter=isExecuting, nonatomic) BOOL executing;
 
 /*!
  * @brief Specifies the action set type - user-defined, trigger-owned or one of the builtin types.
  *        Builtin action sets cannot be removed from the home. trigger-owned action sets cannot
  *        be executed, renamed or associated with another trigger.
  */
-@property(readonly, copy, nonatomic) NSString * actionSetType API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSString *actionSetType API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief A unique identifier for the action set.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief Specifies the last execution date for the action set.
  */
-@property(readonly, copy, nonatomic, nullable) NSDate *lastExecutionDate API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0));
+@property (readonly, copy, nonatomic, nullable) NSDate *lastExecutionDate API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0));
 
 /*!
  * @brief This method is used to change the name of the action set.
@@ -94,27 +94,27 @@
  * @brief Builtin action set type for WakeUp.
  */
 
-HM_EXTERN NSString * const HMActionSetTypeWakeUp API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMActionSetTypeWakeUp API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Type for builtin action set Sleep.
  */
-HM_EXTERN NSString * const HMActionSetTypeSleep API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMActionSetTypeSleep API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Type for builtin action set HomeDeparture.
  */
-HM_EXTERN NSString * const HMActionSetTypeHomeDeparture API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMActionSetTypeHomeDeparture API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Type for builtin action set HomeArrival.
  */
-HM_EXTERN NSString * const HMActionSetTypeHomeArrival API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMActionSetTypeHomeArrival API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Type for user-defined action sets.
  */
-HM_EXTERN NSString * const HMActionSetTypeUserDefined API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMActionSetTypeUserDefined API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Type for trigger-owned action sets.
@@ -123,6 +123,6 @@
  *             as part of the home. An action set of this type cannot be executed,
  *             renamed, or associated with a different trigger.
  */
-HM_EXTERN NSString * const HMActionSetTypeTriggerOwned API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMActionSetTypeTriggerOwned API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAddAccessoryRequest.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAddAccessoryRequest.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAddAccessoryRequest.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAddAccessoryRequest.h	2022-07-22 10:04:51.000000000 -0400
@@ -17,7 +17,7 @@
 @class HMHome;
 
 HM_EXTERN API_DEPRECATED("No longer supported", ios(13.0, 15.0)) API_UNAVAILABLE(ios, macos, watchos, tvos, macCatalyst)
-@interface HMAddAccessoryRequest : NSObject
+    @interface HMAddAccessoryRequest : NSObject
 
 /*!
  * @brief Home that the accessory is to be added to.
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCalendarEvent.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCalendarEvent.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCalendarEvent.h	2022-06-30 09:29:55.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCalendarEvent.h	2022-07-22 10:04:49.000000000 -0400
@@ -17,7 +17,7 @@
  *       If its expected to fire on the same day, it should be at least 1 minute ahead or it could get scheduled for the next recurrent day.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCalendarEvent : HMTimeEvent <NSCopying, NSMutableCopying>
+    @interface HMCalendarEvent : HMTimeEvent<NSCopying, NSMutableCopying>
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -42,7 +42,7 @@
  *       year, weekday, quarter, week of the year / month are not used in calculation for next fire date.
  *       If its expected to fire on the same day, it should be at least 1 minute ahead or it could get scheduled for the next recurrent day.
  */
-@property(readonly, strong, nonatomic) NSDateComponents *fireDateComponents;
+@property (readonly, strong, nonatomic) NSDateComponents *fireDateComponents;
 
 @end
 
@@ -50,14 +50,14 @@
  * @brief This class is used to represent a calendar event.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMMutableCalendarEvent : HMCalendarEvent
+    @interface HMMutableCalendarEvent : HMCalendarEvent
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief The date component that specifies the time when the event is fired
  */
-@property(readwrite, strong, nonatomic) NSDateComponents *fireDateComponents;
+@property (readwrite, strong, nonatomic) NSDateComponents *fireDateComponents;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraAudioControl.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraAudioControl.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraAudioControl.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraAudioControl.h	2022-07-22 10:04:51.000000000 -0400
@@ -13,19 +13,19 @@
 NS_ASSUME_NONNULL_BEGIN
 
 HM_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCameraAudioControl : HMCameraControl
+    @interface HMCameraAudioControl : HMCameraControl
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * Characteristic corresponding to mute setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *mute;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *mute;
 
 /*!
  * Characteristic corresponding to volume setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *volume;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *volume;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraControl.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraControl.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraControl.h	2022-06-30 09:29:58.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraControl.h	2022-07-22 10:04:52.000000000 -0400
@@ -14,7 +14,7 @@
  * @abstract Represents a generic camera control.
  */
 HM_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCameraControl : NSObject
+    @interface HMCameraControl : NSObject
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraDefines.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraDefines.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraDefines.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraDefines.h	2022-07-22 10:04:51.000000000 -0400
@@ -11,9 +11,9 @@
 /*!
  * @abstract This enumeration describes the different states of a camera stream.
  */
-API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-typedef NS_ENUM(NSUInteger, HMCameraStreamState)
-{
+API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0))
+API_UNAVAILABLE(macos)
+typedef NS_ENUM(NSUInteger, HMCameraStreamState) {
     /*!
      * Start stream request is in progress.
      */
@@ -38,9 +38,9 @@
 /*!
  * @abstract This enumeration describes the setting for audio on the recipient of the camera stream.
  */
-API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-typedef NS_ENUM(NSUInteger, HMCameraAudioStreamSetting)
-{
+API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0))
+API_UNAVAILABLE(macos)
+typedef NS_ENUM(NSUInteger, HMCameraAudioStreamSetting) {
     /*!
      * Muted for incoming and outgoing audio.
      */
@@ -56,5 +56,3 @@
      */
     HMCameraAudioStreamSettingBidirectionalAudioAllowed = 3,
 };
-
-
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraProfile.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraProfile.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraProfile.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraProfile.h	2022-07-22 10:04:51.000000000 -0400
@@ -23,37 +23,36 @@
  * @discussion Provides an interface to interact with a Camera in an Accessory.
  */
 HM_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCameraProfile : HMAccessoryProfile
+    @interface HMCameraProfile : HMAccessoryProfile
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief Object that can be used to control the camera stream.
  */
-@property(readonly, strong, nonatomic, nullable) HMCameraStreamControl *streamControl;
+@property (readonly, strong, nonatomic, nullable) HMCameraStreamControl *streamControl;
 
 /*!
  * @brief Object that can be used to take image snapshots from the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCameraSnapshotControl *snapshotControl;
+@property (readonly, strong, nonatomic, nullable) HMCameraSnapshotControl *snapshotControl;
 
 /*!
  * @brief Object that can be used to control the settings on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCameraSettingsControl *settingsControl;
+@property (readonly, strong, nonatomic, nullable) HMCameraSettingsControl *settingsControl;
 
 /*!
  * @brief Object that can be used to control the speaker settings on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCameraAudioControl *speakerControl;
+@property (readonly, strong, nonatomic, nullable) HMCameraAudioControl *speakerControl;
 
 /*!
  * @brief Object that can be used to control the microphone settings on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCameraAudioControl *microphoneControl;
+@property (readonly, strong, nonatomic, nullable) HMCameraAudioControl *microphoneControl;
 
 @end
 
 
 NS_ASSUME_NONNULL_END
-
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSettingsControl.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSettingsControl.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSettingsControl.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSettingsControl.h	2022-07-22 10:04:50.000000000 -0400
@@ -16,54 +16,54 @@
  * @abstract This class can be used to control the settings on a camera.
  */
 HM_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCameraSettingsControl : HMCameraControl
+    @interface HMCameraSettingsControl : HMCameraControl
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  *  Characteristic corresponding to night vision setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *nightVision;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *nightVision;
 
 /*!
  * Characteristic corresponding to current horizontal tilt setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *currentHorizontalTilt;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *currentHorizontalTilt;
 
 /*!
  * Characteristic corresponding to target horizontal tilt setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *targetHorizontalTilt;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *targetHorizontalTilt;
 
 /*!
  * Characteristic corresponding to current vertical tilt setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *currentVerticalTilt;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *currentVerticalTilt;
 
 /*!
  * Characteristic corresponding to target vertical tilt setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *targetVerticalTilt;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *targetVerticalTilt;
 
 /*!
  * Characteristic corresponding to optical zoom setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *opticalZoom;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *opticalZoom;
 
 /*!
  * Characteristic corresponding to digital zoom setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *digitalZoom;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *digitalZoom;
 
 /*!
  * Characteristic corresponding to image rotation setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *imageRotation;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *imageRotation;
 
 /*!
  * Characteristic corresponding to image mirroring setting on the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristic *imageMirroring;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristic *imageMirroring;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSnapshot.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSnapshot.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSnapshot.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSnapshot.h	2022-07-22 10:04:50.000000000 -0400
@@ -15,12 +15,12 @@
  * @abstract Represents a camera snapshot.
  */
 HM_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCameraSnapshot : HMCameraSource
+    @interface HMCameraSnapshot : HMCameraSource
 
 /*!
  * @brief Time corresponding to the snapshot request.
  */
-@property(readonly, copy, nonatomic) NSDate *captureDate;
+@property (readonly, copy, nonatomic) NSDate *captureDate;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSnapshotControl.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSnapshotControl.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSnapshotControl.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSnapshotControl.h	2022-07-22 10:04:51.000000000 -0400
@@ -18,17 +18,17 @@
  * @abstract This class can be used to take an image snapshot from a camera.
  */
 HM_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCameraSnapshotControl : HMCameraControl
+    @interface HMCameraSnapshotControl : HMCameraControl
 
 /*!
  * @brief Delegate that receives updates on the camera snapshot changes.
  */
-@property(weak, nonatomic) id<HMCameraSnapshotControlDelegate> delegate;
+@property (weak, nonatomic) id<HMCameraSnapshotControlDelegate> delegate;
 
 /*!
  * @brief Represents the most recent snapshot taken from the camera.
  */
-@property(readonly, strong, nonatomic, nullable) HMCameraSnapshot *mostRecentSnapshot;
+@property (readonly, strong, nonatomic, nullable) HMCameraSnapshot *mostRecentSnapshot;
 
 /*!
  * @brief Takes an image snapshot.
@@ -41,7 +41,8 @@
 /*!
  * @brief This delegate receives updates on the camera snapshot.
  */
-API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
+API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0))
+API_UNAVAILABLE(macos)
 @protocol HMCameraSnapshotControlDelegate <NSObject>
 
 @optional
@@ -69,4 +70,3 @@
 @end
 
 NS_ASSUME_NONNULL_END
-
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSource.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSource.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSource.h	2022-06-30 09:29:55.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraSource.h	2022-07-22 10:04:50.000000000 -0400
@@ -14,7 +14,7 @@
  * @brief Abstract class for source of data from a camera.
  */
 HM_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCameraSource : NSObject
+    @interface HMCameraSource : NSObject
 
 /*!
  * @brief Represents the aspect ratio of the camera source, defined as width over height.
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraStream.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraStream.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraStream.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraStream.h	2022-07-22 10:04:50.000000000 -0400
@@ -6,9 +6,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <HomeKit/HMDefines.h>
-#import <HomeKit/HMCameraSource.h>
 #import <HomeKit/HMCameraDefines.h>
+#import <HomeKit/HMCameraSource.h>
+#import <HomeKit/HMDefines.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -16,7 +16,7 @@
  * @abstract Represents a camera stream.
  */
 HM_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCameraStream : HMCameraSource
+    @interface HMCameraStream : HMCameraSource
 
 /*!
  * @brief Represents the audio setting for the current stream.
@@ -29,7 +29,7 @@
  * @param audioStreamSetting New audio stream setting.
  *
  */
-- (void)setAudioStreamSetting:(HMCameraAudioStreamSetting)audioStreamSetting  API_DEPRECATED_WITH_REPLACEMENT("updateAudioStreamSetting:completionHandler:", ios(10.0, 10.0), watchos(3.0, 3.0)) API_UNAVAILABLE(tvos);
+- (void)setAudioStreamSetting:(HMCameraAudioStreamSetting)audioStreamSetting API_DEPRECATED_WITH_REPLACEMENT("updateAudioStreamSetting:completionHandler:", ios(10.0, 10.0), watchos(3.0, 3.0))API_UNAVAILABLE(tvos);
 
 /*!
  * @brief Updates the settings of the audio stream.
@@ -40,7 +40,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateAudioStreamSetting:(HMCameraAudioStreamSetting)audioStreamSetting completionHandler:(void (^)(NSError * __nullable error))completion API_AVAILABLE(tvos(14.5));
+- (void)updateAudioStreamSetting:(HMCameraAudioStreamSetting)audioStreamSetting completionHandler:(void (^)(NSError *__nullable error))completion API_AVAILABLE(tvos(14.5));
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraStreamControl.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraStreamControl.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraStreamControl.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraStreamControl.h	2022-07-22 10:04:50.000000000 -0400
@@ -20,22 +20,22 @@
  * @abstract This class can be used to control the stream from a camera.
  */
 HM_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCameraStreamControl : HMCameraControl
+    @interface HMCameraStreamControl : HMCameraControl
 
 /*!
  * @brief Delegate that receives updates on the camera stream changes.
  */
-@property(weak, nonatomic) id<HMCameraStreamControlDelegate> delegate;
+@property (weak, nonatomic) id<HMCameraStreamControlDelegate> delegate;
 
 /*!
  * @brief Represents the current streaming state.
  */
-@property(readonly, assign, nonatomic) HMCameraStreamState streamState;
+@property (readonly, assign, nonatomic) HMCameraStreamState streamState;
 
 /*!
  * @brief Represents the current camera stream.
  */
-@property(readonly, strong, nonatomic, nullable) HMCameraStream *cameraStream;
+@property (readonly, strong, nonatomic, nullable) HMCameraStream *cameraStream;
 
 /*!
  * @brief Starts the camera stream. 'currentCameraStream' will be updated upon 
@@ -53,7 +53,8 @@
 /*!
  * @brief This delegate receives updates on the camera stream.
  */
-API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
+API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0))
+API_UNAVAILABLE(macos)
 @protocol HMCameraStreamControlDelegate <NSObject>
 
 @optional
@@ -77,4 +78,3 @@
 @end
 
 NS_ASSUME_NONNULL_END
-
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraView.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraView.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraView.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCameraView.h	2022-07-22 10:04:50.000000000 -0400
@@ -21,7 +21,7 @@
  */
 
 HM_EXTERN API_AVAILABLE(ios(10.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(watchos)
-@interface HMCameraView : UIView
+    @interface HMCameraView : UIView
 
 /*!
  * @brief Represents the camera source.
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristic.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristic.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristic.h	2022-06-30 22:08:45.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristic.h	2022-07-25 15:37:29.000000000 -0400
@@ -19,22 +19,22 @@
  * @brief Represent a characteristic on a service of an accessory.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCharacteristic : NSObject
+    @interface HMCharacteristic : NSObject
 
 /*!
  * @brief The type of the characteristic, e.g. HMCharacteristicTypePowerState.
  */
-@property(readonly, copy, nonatomic) NSString *characteristicType;
+@property (readonly, copy, nonatomic) NSString *characteristicType;
 
 /*!
  * @brief The localized description of the characteristic.
  */
-@property(readonly, copy, nonatomic) NSString *localizedDescription API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSString *localizedDescription API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief Service that contains this characteristic.
  */
-@property(weak, readonly, nonatomic) HMService *service;
+@property (weak, readonly, nonatomic) HMService *service;
 
 /*!
  * @brief Array that describes the properties of the characteristic.
@@ -42,12 +42,12 @@
  * @discussion This value corresponds to the properties associated with this characteristic.
  *             The contents of the array are one or more HMCharacteristicProperty constants.
  */
-@property(readonly, copy, nonatomic) NSArray<NSString *> *properties;
+@property (readonly, copy, nonatomic) NSArray<NSString *> *properties;
 
 /*!
  * @brief Meta data associated with the characteristic.
  */
-@property(readonly, strong, nonatomic, nullable) HMCharacteristicMetadata *metadata;
+@property (readonly, strong, nonatomic, nullable) HMCharacteristicMetadata *metadata;
 
 /*!
  * @brief The value of the characteristic.
@@ -55,19 +55,19 @@
  * @discussion The value is a cached value that may have been updated as a result of prior
  *             interaction with the accessory.
  */
-@property(readonly, copy, nonatomic, nullable) id value;
+@property (readonly, copy, nonatomic, nullable) id value;
 
 /*!
  * @brief Specifies whether the characteristic has been enabled to send notifications.
  *
  * @discussion This property is reset to NO if the reachability of the accessory is NO.
  */
-@property(readonly, getter=isNotificationEnabled, nonatomic) BOOL notificationEnabled;
+@property (readonly, getter=isNotificationEnabled, nonatomic) BOOL notificationEnabled;
 
 /*!
  * @brief A unique identifier for the characteristic.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 
 /*!
@@ -84,7 +84,7 @@
  *             float format. If validation fails, the error provided to the completion handler
  *             indicates the type of failure.
  */
-- (void)writeValue:(nullable id)value completionHandler:(void (^)(NSError * __nullable error))completion;
+- (void)writeValue:(nullable id)value completionHandler:(void (^)(NSError *__nullable error))completion;
 
 /*!
  * @brief Reads the value of the characteristic. The updated value can be read from the 'value' property of the characteristic.
@@ -93,7 +93,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)readValueWithCompletionHandler:(void (^)(NSError * __nullable error))completion;
+- (void)readValueWithCompletionHandler:(void (^)(NSError *__nullable error))completion;
 
 /*!
  * @brief Enables/disables notifications or indications for the value of a specified characteristic.
@@ -105,7 +105,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)enableNotification:(BOOL)enable completionHandler:(void (^)(NSError * __nullable error))completion;
+- (void)enableNotification:(BOOL)enable completionHandler:(void (^)(NSError *__nullable error))completion;
 
 /*!
  * @brief Sets/clears authorization data used when writing to the characteristic.
@@ -116,7 +116,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateAuthorizationData:(nullable NSData *)data completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateAuthorizationData:(nullable NSData *)data completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicEvent.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicEvent.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicEvent.h	2022-06-30 09:29:55.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicEvent.h	2022-07-22 10:04:49.000000000 -0400
@@ -18,7 +18,7 @@
  *        set to a particular value.
  */
 HM_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCharacteristicEvent<TriggerValueType : id<NSCopying>> : HMEvent <NSCopying, NSMutableCopying>
+    @interface HMCharacteristicEvent<TriggerValueType : id<NSCopying>> : HMEvent<NSCopying, NSMutableCopying>
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -40,13 +40,13 @@
 /*!
  * @brief The characteristic associated with the event.
  */
-@property(readonly, strong, nonatomic) HMCharacteristic *characteristic;
+@property (readonly, strong, nonatomic) HMCharacteristic *characteristic;
 
 /*!
  * @brief The value of the characteristic that triggers the event.
  *        A value of nil corresponds to any change in the value of the characteristic.
  */
-@property(readonly, copy, nonatomic, nullable) TriggerValueType triggerValue;
+@property (readonly, copy, nonatomic, nullable) TriggerValueType triggerValue;
 
 /*!
  * @brief This method is used to change trigger value for the characteristic.
@@ -59,7 +59,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateTriggerValue:(nullable TriggerValueType)triggerValue completionHandler:(void (^)(NSError * __nullable error))completion API_DEPRECATED("No longer supported.", ios(9.0, 11.0)) API_UNAVAILABLE(watchos, tvos);
+- (void)updateTriggerValue:(nullable TriggerValueType)triggerValue completionHandler:(void (^)(NSError *__nullable error))completion API_DEPRECATED("No longer supported.", ios(9.0, 11.0))API_UNAVAILABLE(watchos, tvos);
 
 @end
 
@@ -68,20 +68,20 @@
  *        set to a particular value.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMMutableCharacteristicEvent<TriggerValueType : id<NSCopying>> : HMCharacteristicEvent
+    @interface HMMutableCharacteristicEvent<TriggerValueType : id<NSCopying>> : HMCharacteristicEvent
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief The characteristic associated with the event.
  */
-@property(readwrite, strong, nonatomic) HMCharacteristic *characteristic;
+@property (readwrite, strong, nonatomic) HMCharacteristic *characteristic;
 
 /*!
  * @brief The value of the characteristic that triggers the event.
  *        A value of nil corresponds to any change in the value of the characteristic.
  */
-@property(readwrite, copy, nonatomic, nullable) TriggerValueType triggerValue;
+@property (readwrite, copy, nonatomic, nullable) TriggerValueType triggerValue;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicMetadata.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicMetadata.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicMetadata.h	2022-06-30 09:29:55.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicMetadata.h	2022-07-22 10:07:30.000000000 -0400
@@ -16,47 +16,47 @@
  * 		  for presentation purposes.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCharacteristicMetadata : NSObject
+    @interface HMCharacteristicMetadata : NSObject
 
 /*!
  * @brief The minimum value for the characteristic if it has a format of "int" or "float".
  */
-@property(readonly, nonatomic, nullable) NSNumber *minimumValue;
+@property (readonly, nonatomic, nullable) NSNumber *minimumValue;
 
 /*!
  * @brief The maximum value for the characteristic if it has a format of "int" or "float".
  */
-@property(readonly, nonatomic, nullable) NSNumber *maximumValue;
+@property (readonly, nonatomic, nullable) NSNumber *maximumValue;
 
 /*!
  * @brief Step value for the characteristic that indicates the minimum step value allowed if it has a format of "int" or "float".
  */
-@property(readonly, nonatomic, nullable) NSNumber *stepValue;
+@property (readonly, nonatomic, nullable) NSNumber *stepValue;
 
 /*!
  * @brief Max length value for the characteristic that indicates the maximum number of UTF-8 characters allowed if it has a format of "string".
  */
-@property(readonly, nonatomic, nullable) NSNumber *maxLength;
+@property (readonly, nonatomic, nullable) NSNumber *maxLength;
 
 /*!
  * @brief The format of the value. Refer to HMCharacteristicMetadataFormat constants for supported units.
  */
-@property(readonly, copy, nonatomic, nullable) NSString *format;
+@property (readonly, copy, nonatomic, nullable) NSString *format;
 
 /*!
  * @brief The units of the value. Refer to HMCharacteristicMetadataUnits constants for supported units.
  */
-@property(readonly, copy, nonatomic, nullable) NSString *units;
+@property (readonly, copy, nonatomic, nullable) NSString *units;
 
 /*!
  * @brief Manufacturer provided description for the characteristic to present to the user.
  */
-@property(readonly, copy, nonatomic, nullable) NSString *manufacturerDescription;
+@property (readonly, copy, nonatomic, nullable) NSString *manufacturerDescription;
 
 /*!
  * @brief The subset of valid values supported by the characteristic when the format is unsigned integral type.
  */
-@property(readonly, copy, nonatomic, nullable) NSArray<NSNumber *> *validValues API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0));
+@property (readonly, copy, nonatomic, nullable) NSArray<NSNumber *> *validValues API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0));
 
 @end
 
@@ -69,84 +69,84 @@
  *
  * @discussion The value is an NSNumber containing the boolean value.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatBool API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatBool API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is an integer.
  *
  * @discussion The value is an NSNumber containing a signed 32-bit integer with a range [-2147483648, 2147483647].
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatInt API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatInt API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is a float.
  *
  * @discussion The value is an NSNumber containing a 32-bit float.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatFloat API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatFloat API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is a string.
  *
  * @discussion The value is an NSString.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatString API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatString API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is an array.
  *
  * @discussion The value is an NSArray.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatArray API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatArray API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is a dictionary.
  *
  * @discussion The value is an NSDictionary.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatDictionary API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatDictionary API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is an unsigned 8-bit integer.
  *
  * @discussion The value is an NSNumber containing an unsigned 8-bit integer with a range [0, 255].
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatUInt8 API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatUInt8 API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is an unsigned 16-bit integer.
  *
  * @discussion The value is an NSNumber containing an unsigned 16-bit integer with a range [0, 65535].
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatUInt16 API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatUInt16 API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is an unsigned 32-bit integer.
  *
  * @discussion The value is an NSNumber containing an unsigned 32-bit integer with a range [0, 4294967295].
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatUInt32 API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatUInt32 API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is an unsigned 64-bit integer.
  *
  * @discussion The value is an NSNumber containing an unsigned 64-bit integer with a range [0, 18446744073709551615].
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatUInt64 API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatUInt64 API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is a data blob.
  *
  * @discussion The value is an NSData containing the bytes of data.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatData API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatData API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the value format is a TLV8.
  *
  * @discussion The value is an NSData containing a set of one or more TLV8's, which are packed type-length-value items with an 8-bit type, 8-bit length, and N-byte value.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataFormatTLV8 API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataFormatTLV8 API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 
 /*!
@@ -156,42 +156,42 @@
 /*!
  * @brief Describes that the unit of the characteristic is in Celsius.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataUnitsCelsius API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataUnitsCelsius API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the unit of the characteristic is in Fahrenheit.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataUnitsFahrenheit API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataUnitsFahrenheit API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the unit of the characteristic is a percentage.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataUnitsPercentage API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataUnitsPercentage API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the unit of the characteristic is arc degree.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataUnitsArcDegree API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataUnitsArcDegree API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the unit of the characteristic is seconds.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataUnitsSeconds API_AVAILABLE(ios(8.3), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataUnitsSeconds API_AVAILABLE(ios(8.3), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the unit of the characteristic is Lux (illuminance).
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataUnitsLux API_AVAILABLE(ios(9.3), watchos(2.2), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataUnitsLux API_AVAILABLE(ios(9.3), watchos(2.2), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the unit of the characteristic is parts per million.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataUnitsPartsPerMillion API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataUnitsPartsPerMillion API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Describes that the unit of the characteristic is micrograms per cubic meter.
  */
-HM_EXTERN NSString * const HMCharacteristicMetadataUnitsMicrogramsPerCubicMeter API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicMetadataUnitsMicrogramsPerCubicMeter API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 
 NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicThresholdRangeEvent.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicThresholdRangeEvent.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicThresholdRangeEvent.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicThresholdRangeEvent.h	2022-07-22 10:04:51.000000000 -0400
@@ -19,7 +19,7 @@
  * number range.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCharacteristicThresholdRangeEvent : HMEvent <NSCopying, NSMutableCopying>
+    @interface HMCharacteristicThresholdRangeEvent : HMEvent<NSCopying, NSMutableCopying>
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -39,12 +39,12 @@
 /*!
  * @brief The characteristic associated with the event.
  */
-@property(readonly, strong, nonatomic) HMCharacteristic *characteristic;
+@property (readonly, strong, nonatomic) HMCharacteristic *characteristic;
 
 /*!
  * @brief The range of the characteristic value that triggers the event.
  */
-@property(readonly, copy, nonatomic) HMNumberRange *thresholdRange;
+@property (readonly, copy, nonatomic) HMNumberRange *thresholdRange;
 
 @end
 
@@ -54,19 +54,19 @@
  * number range.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMMutableCharacteristicThresholdRangeEvent : HMCharacteristicThresholdRangeEvent
+    @interface HMMutableCharacteristicThresholdRangeEvent : HMCharacteristicThresholdRangeEvent
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief The characteristic associated with the event.
  */
-@property(readwrite, strong, nonatomic) HMCharacteristic *characteristic;
+@property (readwrite, strong, nonatomic) HMCharacteristic *characteristic;
 
 /*!
  * @brief The range of the characteristic value that triggers the event.
  */
-@property(readwrite, copy, nonatomic) HMNumberRange *thresholdRange;
+@property (readwrite, copy, nonatomic) HMNumberRange *thresholdRange;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicWriteAction.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicWriteAction.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicWriteAction.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCharacteristicWriteAction.h	2022-07-22 10:04:51.000000000 -0400
@@ -18,7 +18,7 @@
  *        value to a characteristic.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMCharacteristicWriteAction<TargetValueType : id<NSCopying>> : HMAction
+    @interface HMCharacteristicWriteAction<TargetValueType : id<NSCopying>> : HMAction
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -36,12 +36,12 @@
 /*!
  * @brief The characteristic associated with the action.
  */
-@property(readonly, strong, nonatomic) HMCharacteristic* characteristic;
+@property (readonly, strong, nonatomic) HMCharacteristic *characteristic;
 
 /*!
  * @brief The target value for the action.
  */
-@property(readonly, copy, nonatomic) TargetValueType targetValue;
+@property (readonly, copy, nonatomic) TargetValueType targetValue;
 
 /*!
  * @brief This method is used to change target value for the characteristic.
@@ -52,7 +52,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateTargetValue:(TargetValueType)targetValue completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateTargetValue:(TargetValueType)targetValue completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMDefines.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMDefines.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMDefines.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMDefines.h	2022-07-22 10:04:51.000000000 -0400
@@ -7,13 +7,13 @@
 
 #ifndef HM_EXTERN
 #ifdef __cplusplus
-#define HM_EXTERN   extern "C" __attribute__((visibility ("default")))
+#define HM_EXTERN extern "C" __attribute__((visibility("default")))
 #else
-#define HM_EXTERN   extern __attribute__((visibility ("default")))
+#define HM_EXTERN extern __attribute__((visibility("default")))
 #endif
 #endif
 
 /*!
  * @brief A generic handler for callbacks containing a single error parameter.
  */
-typedef void (^HMErrorBlock)(NSError * _Nullable error) API_AVAILABLE(ios(13.0), watchos(6.0), tvos(13.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+typedef void (^HMErrorBlock)(NSError *_Nullable error) API_AVAILABLE(ios(13.0), watchos(6.0), tvos(13.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMDurationEvent.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMDurationEvent.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMDurationEvent.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMDurationEvent.h	2022-07-22 10:04:50.000000000 -0400
@@ -13,7 +13,7 @@
  * @brief This class is used to represent a duration of time.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMDurationEvent : HMTimeEvent <NSCopying, NSMutableCopying>
+    @interface HMDurationEvent : HMTimeEvent<NSCopying, NSMutableCopying>
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -29,7 +29,7 @@
 /*!
  * @brief duration The duration of time in seconds.
  */
-@property(readonly, nonatomic, assign) NSTimeInterval duration;
+@property (readonly, nonatomic, assign) NSTimeInterval duration;
 
 @end
 
@@ -38,14 +38,14 @@
  * @brief This class is used to represent a duration of time.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMMutableDurationEvent : HMDurationEvent
+    @interface HMMutableDurationEvent : HMDurationEvent
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief duration The duration of time in seconds.
  */
-@property(readwrite, nonatomic, assign) NSTimeInterval duration;
+@property (readwrite, nonatomic, assign) NSTimeInterval duration;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMError.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMError.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMError.h	2022-06-30 21:55:38.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMError.h	2022-07-22 10:07:10.000000000 -0400
@@ -10,117 +10,117 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-HM_EXTERN NSString * const HMErrorDomain API_AVAILABLE(ios(8.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMErrorDomain API_AVAILABLE(ios(8.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief This enumeration describes the possible error constants that can be
  *        returned from the the HomeKit APIs.
  */
 typedef NS_ENUM(NSInteger, HMErrorCode) {
-    HMErrorCodeUnexpectedError                         API_AVAILABLE(ios(11.2), watchos(4.2), tvos(11.2)) = -1,
-    HMErrorCodeAlreadyExists                           = 1,
-    HMErrorCodeNotFound                                = 2,
-    HMErrorCodeInvalidParameter                        = 3,
-    HMErrorCodeAccessoryNotReachable                   = 4,
-    HMErrorCodeReadOnlyCharacteristic                  = 5,
-    HMErrorCodeWriteOnlyCharacteristic                 = 6,
-    HMErrorCodeNotificationNotSupported                = 7,
-    HMErrorCodeOperationTimedOut                       = 8,
-    HMErrorCodeAccessoryPoweredOff                     = 9,
-    HMErrorCodeAccessDenied                            = 10,
-    HMErrorCodeObjectAssociatedToAnotherHome           = 11,
-    HMErrorCodeObjectNotAssociatedToAnyHome            = 12,
-    HMErrorCodeObjectAlreadyAssociatedToHome           = 13,
-    HMErrorCodeAccessoryIsBusy                         = 14,
-    HMErrorCodeOperationInProgress                     = 15,
-    HMErrorCodeAccessoryOutOfResources                 = 16,
-    HMErrorCodeInsufficientPrivileges                  = 17,
-    HMErrorCodeAccessoryPairingFailed                  = 18,
-    HMErrorCodeInvalidDataFormatSpecified              = 19,
-    HMErrorCodeNilParameter                            = 20,
-    HMErrorCodeUnconfiguredParameter                   = 21,
-    HMErrorCodeInvalidClass                            = 22,
-    HMErrorCodeOperationCancelled                      = 23,
-    HMErrorCodeRoomForHomeCannotBeInZone               = 24,
-    HMErrorCodeNoActionsInActionSet                    = 25,
-    HMErrorCodeNoRegisteredActionSets                  = 26,
-    HMErrorCodeMissingParameter                        = 27,
-    HMErrorCodeFireDateInPast                          = 28,
-    HMErrorCodeRoomForHomeCannotBeUpdated              = 29,
-    HMErrorCodeActionInAnotherActionSet                = 30,
-    HMErrorCodeObjectWithSimilarNameExistsInHome       = 31,
-    HMErrorCodeHomeWithSimilarNameExists               = 32,
-    HMErrorCodeRenameWithSimilarName                   = 33,
-    HMErrorCodeCannotRemoveNonBridgeAccessory          = 34,
-    HMErrorCodeNameContainsProhibitedCharacters        = 35,
-    HMErrorCodeNameDoesNotStartWithValidCharacters     = 36,
-    HMErrorCodeUserIDNotEmailAddress                   = 37,
-    HMErrorCodeUserDeclinedAddingUser                  = 38,
-    HMErrorCodeUserDeclinedRemovingUser                = 39,
-    HMErrorCodeUserDeclinedInvite                      = 40,
-    HMErrorCodeUserManagementFailed                    = 41,
-    HMErrorCodeRecurrenceTooSmall                      = 42,
-    HMErrorCodeInvalidValueType                        = 43,
-    HMErrorCodeValueLowerThanMinimum                   = 44,
-    HMErrorCodeValueHigherThanMaximum                  = 45,
-    HMErrorCodeStringLongerThanMaximum                 = 46,
-    HMErrorCodeHomeAccessNotAuthorized                 = 47,
-    HMErrorCodeOperationNotSupported                   = 48,
-    HMErrorCodeMaximumObjectLimitReached               = 49,
-    HMErrorCodeAccessorySentInvalidResponse            = 50,
-    HMErrorCodeStringShorterThanMinimum                = 51,
-    HMErrorCodeGenericError                            = 52,
-    HMErrorCodeSecurityFailure                         = 53,
-    HMErrorCodeCommunicationFailure                    = 54,
-    HMErrorCodeMessageAuthenticationFailed             = 55,
-    HMErrorCodeInvalidMessageSize                      = 56,
-    HMErrorCodeAccessoryDiscoveryFailed                = 57,
-    HMErrorCodeClientRequestError                      = 58,
-    HMErrorCodeAccessoryResponseError                  = 59,
-    HMErrorCodeNameDoesNotEndWithValidCharacters       = 60,
-    HMErrorCodeAccessoryIsBlocked                      = 61,
-    HMErrorCodeInvalidAssociatedServiceType            = 62,
-    HMErrorCodeActionSetExecutionFailed                = 63,
-    HMErrorCodeActionSetExecutionPartialSuccess        = 64,
-    HMErrorCodeActionSetExecutionInProgress            = 65,
-    HMErrorCodeAccessoryOutOfCompliance                = 66,
-    HMErrorCodeDataResetFailure                        = 67,
-    HMErrorCodeNotificationAlreadyEnabled              = 68,
-    HMErrorCodeRecurrenceMustBeOnSpecifiedBoundaries   = 69,
-    HMErrorCodeDateMustBeOnSpecifiedBoundaries         = 70,
-    HMErrorCodeCannotActivateTriggerTooFarInFuture     = 71,
-    HMErrorCodeRecurrenceTooLarge                      = 72,
-    HMErrorCodeReadWritePartialSuccess                 = 73,
-    HMErrorCodeReadWriteFailure                        = 74,
-    HMErrorCodeNotSignedIntoiCloud                     = 75,
-    HMErrorCodeKeychainSyncNotEnabled                  = 76,
-    HMErrorCodeCloudDataSyncInProgress                 = 77,
-    HMErrorCodeNetworkUnavailable                      = 78,
-    HMErrorCodeAddAccessoryFailed                      = 79,
-    HMErrorCodeMissingEntitlement                      = 80,
-    HMErrorCodeCannotUnblockNonBridgeAccessory         = 81,
-    HMErrorCodeDeviceLocked                            = 82,
-    HMErrorCodeCannotRemoveBuiltinActionSet            API_AVAILABLE(ios(9.0)) = 83,
-    HMErrorCodeLocationForHomeDisabled                 API_AVAILABLE(ios(9.0)) = 84,
-    HMErrorCodeNotAuthorizedForLocationServices        API_AVAILABLE(ios(9.0)) = 85,
-    HMErrorCodeReferToUserManual                       API_AVAILABLE(ios(9.3)) = 86,
-    HMErrorCodeInvalidOrMissingAuthorizationData       API_AVAILABLE(ios(10.0)) = 87,
-    HMErrorCodeBridgedAccessoryNotReachable            API_AVAILABLE(ios(10.0)) = 88,
-    HMErrorCodeNotAuthorizedForMicrophoneAccess        API_AVAILABLE(ios(10.0)) = 89,
-    HMErrorCodeIncompatibleNetwork                     API_AVAILABLE(ios(10.2)) = 90,
-    HMErrorCodeNoHomeHub                               API_AVAILABLE(ios(11.0)) = 91,
-    HMErrorCodeNoCompatibleHomeHub                     API_AVAILABLE(ios(11.0)) = 92,
-    HMErrorCodeIncompatibleAccessory                   API_AVAILABLE(ios(11.3)) = 93,
-    HMErrorCodeIncompatibleHomeHub                     API_DEPRECATED_WITH_REPLACEMENT("HMErrorCodeNoCompatibleHomeHub", ios(11.0, 11.0), watchos(4.0, 4.0), tvos(11.0, 11.0)) API_UNAVAILABLE(macos, macCatalyst) = HMErrorCodeNoCompatibleHomeHub,
-    HMErrorCodeObjectWithSimilarNameExists             API_AVAILABLE(ios(12.0)) = 95,
-    HMErrorCodeOwnershipFailure                        API_AVAILABLE(ios(13.0)) = 96,
-    HMErrorCodeMaximumAccessoriesOfTypeInHome          API_AVAILABLE(ios(13.0)) = 97,
-    HMErrorCodeWiFiCredentialGenerationFailed          API_AVAILABLE(ios(13.0)) = 98,
-    HMErrorCodeEnterpriseNetworkNotSupported           API_AVAILABLE(ios(14.0)) = 99,
-    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,
+    HMErrorCodeUnexpectedError API_AVAILABLE(ios(11.2), watchos(4.2), tvos(11.2)) = -1,
+    HMErrorCodeAlreadyExists = 1,
+    HMErrorCodeNotFound = 2,
+    HMErrorCodeInvalidParameter = 3,
+    HMErrorCodeAccessoryNotReachable = 4,
+    HMErrorCodeReadOnlyCharacteristic = 5,
+    HMErrorCodeWriteOnlyCharacteristic = 6,
+    HMErrorCodeNotificationNotSupported = 7,
+    HMErrorCodeOperationTimedOut = 8,
+    HMErrorCodeAccessoryPoweredOff = 9,
+    HMErrorCodeAccessDenied = 10,
+    HMErrorCodeObjectAssociatedToAnotherHome = 11,
+    HMErrorCodeObjectNotAssociatedToAnyHome = 12,
+    HMErrorCodeObjectAlreadyAssociatedToHome = 13,
+    HMErrorCodeAccessoryIsBusy = 14,
+    HMErrorCodeOperationInProgress = 15,
+    HMErrorCodeAccessoryOutOfResources = 16,
+    HMErrorCodeInsufficientPrivileges = 17,
+    HMErrorCodeAccessoryPairingFailed = 18,
+    HMErrorCodeInvalidDataFormatSpecified = 19,
+    HMErrorCodeNilParameter = 20,
+    HMErrorCodeUnconfiguredParameter = 21,
+    HMErrorCodeInvalidClass = 22,
+    HMErrorCodeOperationCancelled = 23,
+    HMErrorCodeRoomForHomeCannotBeInZone = 24,
+    HMErrorCodeNoActionsInActionSet = 25,
+    HMErrorCodeNoRegisteredActionSets = 26,
+    HMErrorCodeMissingParameter = 27,
+    HMErrorCodeFireDateInPast = 28,
+    HMErrorCodeRoomForHomeCannotBeUpdated = 29,
+    HMErrorCodeActionInAnotherActionSet = 30,
+    HMErrorCodeObjectWithSimilarNameExistsInHome = 31,
+    HMErrorCodeHomeWithSimilarNameExists = 32,
+    HMErrorCodeRenameWithSimilarName = 33,
+    HMErrorCodeCannotRemoveNonBridgeAccessory = 34,
+    HMErrorCodeNameContainsProhibitedCharacters = 35,
+    HMErrorCodeNameDoesNotStartWithValidCharacters = 36,
+    HMErrorCodeUserIDNotEmailAddress = 37,
+    HMErrorCodeUserDeclinedAddingUser = 38,
+    HMErrorCodeUserDeclinedRemovingUser = 39,
+    HMErrorCodeUserDeclinedInvite = 40,
+    HMErrorCodeUserManagementFailed = 41,
+    HMErrorCodeRecurrenceTooSmall = 42,
+    HMErrorCodeInvalidValueType = 43,
+    HMErrorCodeValueLowerThanMinimum = 44,
+    HMErrorCodeValueHigherThanMaximum = 45,
+    HMErrorCodeStringLongerThanMaximum = 46,
+    HMErrorCodeHomeAccessNotAuthorized = 47,
+    HMErrorCodeOperationNotSupported = 48,
+    HMErrorCodeMaximumObjectLimitReached = 49,
+    HMErrorCodeAccessorySentInvalidResponse = 50,
+    HMErrorCodeStringShorterThanMinimum = 51,
+    HMErrorCodeGenericError = 52,
+    HMErrorCodeSecurityFailure = 53,
+    HMErrorCodeCommunicationFailure = 54,
+    HMErrorCodeMessageAuthenticationFailed = 55,
+    HMErrorCodeInvalidMessageSize = 56,
+    HMErrorCodeAccessoryDiscoveryFailed = 57,
+    HMErrorCodeClientRequestError = 58,
+    HMErrorCodeAccessoryResponseError = 59,
+    HMErrorCodeNameDoesNotEndWithValidCharacters = 60,
+    HMErrorCodeAccessoryIsBlocked = 61,
+    HMErrorCodeInvalidAssociatedServiceType = 62,
+    HMErrorCodeActionSetExecutionFailed = 63,
+    HMErrorCodeActionSetExecutionPartialSuccess = 64,
+    HMErrorCodeActionSetExecutionInProgress = 65,
+    HMErrorCodeAccessoryOutOfCompliance = 66,
+    HMErrorCodeDataResetFailure = 67,
+    HMErrorCodeNotificationAlreadyEnabled = 68,
+    HMErrorCodeRecurrenceMustBeOnSpecifiedBoundaries = 69,
+    HMErrorCodeDateMustBeOnSpecifiedBoundaries = 70,
+    HMErrorCodeCannotActivateTriggerTooFarInFuture = 71,
+    HMErrorCodeRecurrenceTooLarge = 72,
+    HMErrorCodeReadWritePartialSuccess = 73,
+    HMErrorCodeReadWriteFailure = 74,
+    HMErrorCodeNotSignedIntoiCloud = 75,
+    HMErrorCodeKeychainSyncNotEnabled = 76,
+    HMErrorCodeCloudDataSyncInProgress = 77,
+    HMErrorCodeNetworkUnavailable = 78,
+    HMErrorCodeAddAccessoryFailed = 79,
+    HMErrorCodeMissingEntitlement = 80,
+    HMErrorCodeCannotUnblockNonBridgeAccessory = 81,
+    HMErrorCodeDeviceLocked = 82,
+    HMErrorCodeCannotRemoveBuiltinActionSet API_AVAILABLE(ios(9.0)) = 83,
+    HMErrorCodeLocationForHomeDisabled API_AVAILABLE(ios(9.0)) = 84,
+    HMErrorCodeNotAuthorizedForLocationServices API_AVAILABLE(ios(9.0)) = 85,
+    HMErrorCodeReferToUserManual API_AVAILABLE(ios(9.3)) = 86,
+    HMErrorCodeInvalidOrMissingAuthorizationData API_AVAILABLE(ios(10.0)) = 87,
+    HMErrorCodeBridgedAccessoryNotReachable API_AVAILABLE(ios(10.0)) = 88,
+    HMErrorCodeNotAuthorizedForMicrophoneAccess API_AVAILABLE(ios(10.0)) = 89,
+    HMErrorCodeIncompatibleNetwork API_AVAILABLE(ios(10.2)) = 90,
+    HMErrorCodeNoHomeHub API_AVAILABLE(ios(11.0)) = 91,
+    HMErrorCodeNoCompatibleHomeHub API_AVAILABLE(ios(11.0)) = 92,
+    HMErrorCodeIncompatibleAccessory API_AVAILABLE(ios(11.3)) = 93,
+    HMErrorCodeIncompatibleHomeHub API_DEPRECATED_WITH_REPLACEMENT("HMErrorCodeNoCompatibleHomeHub", ios(11.0, 11.0), watchos(4.0, 4.0), tvos(11.0, 11.0)) API_UNAVAILABLE(macos, macCatalyst) = HMErrorCodeNoCompatibleHomeHub,
+    HMErrorCodeObjectWithSimilarNameExists API_AVAILABLE(ios(12.0)) = 95,
+    HMErrorCodeOwnershipFailure API_AVAILABLE(ios(13.0)) = 96,
+    HMErrorCodeMaximumAccessoriesOfTypeInHome API_AVAILABLE(ios(13.0)) = 97,
+    HMErrorCodeWiFiCredentialGenerationFailed API_AVAILABLE(ios(13.0)) = 98,
+    HMErrorCodeEnterpriseNetworkNotSupported API_AVAILABLE(ios(14.0)) = 99,
+    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_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEvent.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEvent.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEvent.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEvent.h	2022-07-22 10:04:51.000000000 -0400
@@ -16,12 +16,12 @@
  * @brief This class is used to represent a generic HomeKit event.
  */
 HM_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMEvent : NSObject
+    @interface HMEvent : NSObject
 
 /*!
  * @brief A unique identifier for the event.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier;
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier;
 
 /*!
  * @brief Specifies whether the HMEvent can be added to HMEventTrigger on the given home.
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEventTrigger.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEventTrigger.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEventTrigger.h	2022-06-30 21:55:39.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEventTrigger.h	2022-07-22 10:07:10.000000000 -0400
@@ -26,17 +26,17 @@
 /*!
  * @brief Specifies the key path for a characteristic in a NSPredicate
  */
-HM_EXTERN NSString * const HMCharacteristicKeyPath API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicKeyPath API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Specifies the key path for a characteristic value in a NSPredicate
  */
-HM_EXTERN NSString * const HMCharacteristicValueKeyPath API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMCharacteristicValueKeyPath API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
  * @brief Specifies the key path for a presence event in a NSPredicate
  */
-HM_EXTERN NSString * const HMPresenceKeyPath API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMPresenceKeyPath API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 
 /*!
@@ -45,7 +45,7 @@
  * @discussion This class represents a trigger that is based on events.
  */
 HM_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMEventTrigger : HMTrigger
+    @interface HMEventTrigger : HMTrigger
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -88,39 +88,39 @@
                       events:(NSArray<HMEvent *> *)events
                    endEvents:(nullable NSArray<HMEvent *> *)endEvents
                  recurrences:(nullable NSArray<NSDateComponents *> *)recurrences
-                   predicate:(nullable NSPredicate *)predicate API_AVAILABLE(ios(11.0)) API_UNAVAILABLE(watchos, tvos);
+                   predicate:(nullable NSPredicate *)predicate API_AVAILABLE(ios(11.0))API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief The events associated with the trigger.
  */
-@property(readonly, copy, nonatomic) NSArray<HMEvent *> *events;
+@property (readonly, copy, nonatomic) NSArray<HMEvent *> *events;
 
 /*!
  * @brief The events that correspond to executing the restore of the scene before the trigger was executed.
  *        E.g. Execute the scene for 10 mins and restore original state is achieved by specifying a corresponding
  *        HMDurationEvent in the list of endEvents.
  */
-@property(readonly, copy, nonatomic) NSArray<HMEvent *> *endEvents API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
+@property (readonly, copy, nonatomic) NSArray<HMEvent *> *endEvents API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
 
 /*!
  * @brief The predicate to evaluate before executing the action sets associated with the trigger.
  */
-@property(readonly, copy, nonatomic, nullable) NSPredicate *predicate;
+@property (readonly, copy, nonatomic, nullable) NSPredicate *predicate;
 
 /*!
  * @brief recurrences Specifies the recurrences for when the trigger is evaluated. This only supports days of the week.
  */
-@property(readonly, copy, nonatomic, nullable) NSArray<NSDateComponents *> *recurrences API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
+@property (readonly, copy, nonatomic, nullable) NSArray<NSDateComponents *> *recurrences API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
 
 /*!
  * @brief Specifies whether this trigger is executed only once after which the trigger is disabled.
  */
-@property(readonly, nonatomic) BOOL executeOnce API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
+@property (readonly, nonatomic) BOOL executeOnce API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
 
 /*!
  * @brief Specifies the current activation state of the trigger.
  */
-@property(readonly, assign, nonatomic) HMEventTriggerActivationState triggerActivationState API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
+@property (readonly, assign, nonatomic) HMEventTriggerActivationState triggerActivationState API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
 
 
 /*!
@@ -132,7 +132,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addEvent:(HMEvent *)event completionHandler:(void (^)(NSError * __nullable error))completion API_DEPRECATED("Use updateEvents:completionHandler: instead", ios(9.0, 11.0)) API_UNAVAILABLE(watchos, tvos);
+- (void)addEvent:(HMEvent *)event completionHandler:(void (^)(NSError *__nullable error))completion API_DEPRECATED("Use updateEvents:completionHandler: instead", ios(9.0, 11.0))API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Removes the specified event from the event trigger.
@@ -143,7 +143,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)removeEvent:(HMEvent *)event completionHandler:(void (^)(NSError * __nullable error))completion API_DEPRECATED("Use updateEvents:completionHandler: instead", ios(9.0, 11.0)) API_UNAVAILABLE(watchos, tvos);
+- (void)removeEvent:(HMEvent *)event completionHandler:(void (^)(NSError *__nullable error))completion API_DEPRECATED("Use updateEvents:completionHandler: instead", ios(9.0, 11.0))API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Updates the set of events in the event trigger.
@@ -154,7 +154,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateEvents:(NSArray<HMEvent *> *)events completionHandler:(void (^)(NSError * __nullable error))completion API_AVAILABLE(ios(11.0)) API_UNAVAILABLE(watchos, tvos);
+- (void)updateEvents:(NSArray<HMEvent *> *)events completionHandler:(void (^)(NSError *__nullable error))completion API_AVAILABLE(ios(11.0))API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Updates the set of events in the event trigger.
@@ -165,7 +165,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateEndEvents:(NSArray<HMEvent *> *)endEvents completionHandler:(void (^)(NSError * __nullable error))completion API_AVAILABLE(ios(11.0)) API_UNAVAILABLE(watchos, tvos);
+- (void)updateEndEvents:(NSArray<HMEvent *> *)endEvents completionHandler:(void (^)(NSError *__nullable error))completion API_AVAILABLE(ios(11.0))API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief This method replaces the predicate used to evaluate execution of the action sets associated with the trigger.
@@ -176,7 +176,7 @@
  *                   The NSError provides more information on the status of the request,
  *                   error will be nil on success. 
  */
-- (void)updatePredicate:(nullable NSPredicate *)predicate completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updatePredicate:(nullable NSPredicate *)predicate completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief This method replaces the recurrences which secifies the days of the week when the trigger is to be evaluated.
@@ -187,7 +187,7 @@
  *                   The NSError provides more information on the status of the request,
  *                   error will be nil on success.
  */
-- (void)updateRecurrences:(nullable NSArray<NSDateComponents *> *)recurrences completionHandler:(void (^)(NSError * __nullable error))completion API_AVAILABLE(ios(11.0)) API_UNAVAILABLE(watchos, tvos);
+- (void)updateRecurrences:(nullable NSArray<NSDateComponents *> *)recurrences completionHandler:(void (^)(NSError *__nullable error))completion API_AVAILABLE(ios(11.0))API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief This method is used to update whether the event trigger repeats or not.
@@ -198,11 +198,11 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateExecuteOnce:(BOOL)executeOnce completionHandler:(void (^)(NSError * __nullable error))completion API_AVAILABLE(ios(11.0)) API_UNAVAILABLE(watchos, tvos);
+- (void)updateExecuteOnce:(BOOL)executeOnce completionHandler:(void (^)(NSError *__nullable error))completion API_AVAILABLE(ios(11.0))API_UNAVAILABLE(watchos, tvos);
 
 @end
 
-@interface HMEventTrigger(NSPredicate)
+@interface HMEventTrigger (NSPredicate)
 
 /*!
  * @brief Creates a predicate that will evaluate whether the event occurred before a significant event.
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEventTriggerActivationState.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEventTriggerActivationState.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEventTriggerActivationState.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMEventTriggerActivationState.h	2022-07-22 10:04:50.000000000 -0400
@@ -13,29 +13,29 @@
 /*!
  * @abstract This enumeration describes the current activation state of the event trigger.
  */
-API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-typedef NS_ENUM(NSUInteger, HMEventTriggerActivationState)
-{
+API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0))
+API_UNAVAILABLE(macos)
+typedef NS_ENUM(NSUInteger, HMEventTriggerActivationState) {
     /*!
      * Trigger is not active because it is disabled
      */
     HMEventTriggerActivationStateDisabled = 0,
-    
+
     /*!
      * Trigger is not active because there is no HomeHub
      */
     HMEventTriggerActivationStateDisabledNoHomeHub = 1,
-    
+
     /*!
      * Trigger is not active because there is no compatible HomeHub
      */
     HMEventTriggerActivationStateDisabledNoCompatibleHomeHub = 2,
-    
+
     /*!
      * Trigger is not active because Location Authorization has been turned off by user
      */
     HMEventTriggerActivationStateDisabledNoLocationServicesAuthorization = 3,
-    
+
     /*!
      * Trigger is currently active
      */
@@ -43,5 +43,3 @@
 };
 
 NS_ASSUME_NONNULL_END
-
-
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHome.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHome.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHome.h	2022-06-30 19:28:37.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHome.h	2022-07-22 09:59:57.000000000 -0400
@@ -31,8 +31,7 @@
  @constant  HMHomeHubStateConnected         Home hub is connected.
  @constant  HMHomeHubStateDisconnected      No home hub is connected.
  */
-typedef NS_ENUM(NSUInteger, HMHomeHubState)
-{
+typedef NS_ENUM(NSUInteger, HMHomeHubState) {
     HMHomeHubStateNotAvailable = 0,
     HMHomeHubStateConnected,
     HMHomeHubStateDisconnected
@@ -47,34 +46,34 @@
  *             the home.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMHome : NSObject
+    @interface HMHome : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief Delegate that receives updates on the state of the home.
  */
-@property(weak, nonatomic, nullable) id<HMHomeDelegate> delegate;
+@property (weak, nonatomic, nullable) id<HMHomeDelegate> delegate;
 
 /*!
  * @brief The name of the home.
  */
-@property(readonly, copy, nonatomic) NSString *name;
+@property (readonly, copy, nonatomic) NSString *name;
 
 /*!
  * @brief Specifies whether this home is the primary home.
  */
-@property(readonly, getter=isPrimary, nonatomic) BOOL primary;
+@property (readonly, getter=isPrimary, nonatomic) BOOL primary;
 
 /*!
  * @brief Specifies the state of the home hub.
  */
-@property(readonly, nonatomic) HMHomeHubState homeHubState API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
+@property (readonly, nonatomic) HMHomeHubState homeHubState API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0));
 
 /*!
  * @brief A unique identifier for the home.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief This method is used to change the name of the home.
@@ -85,17 +84,17 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
 
-@interface HMHome(HMAccessory)
+@interface HMHome (HMAccessory)
 
 /*!
  * @brief Array of HMAccessory objects that represents all accessories added to the home. 
  */
-@property(readonly, copy, nonatomic) NSArray<HMAccessory *> *accessories;
+@property (readonly, copy, nonatomic) NSArray<HMAccessory *> *accessories;
 
 /*!
  * @brief Adds a new accessory to the home.
@@ -106,7 +105,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addAccessory:(HMAccessory *)accessory completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)addAccessory:(HMAccessory *)accessory completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Removes an accessory from the home.
@@ -117,7 +116,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)removeAccessory:(HMAccessory *)accessory completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)removeAccessory:(HMAccessory *)accessory completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Assigns a new room for the accessory.
@@ -133,7 +132,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)assignAccessory:(HMAccessory *)accessory toRoom:(HMRoom *)room completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)assignAccessory:(HMAccessory *)accessory toRoom:(HMRoom *)room completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Queries all services that match the specified types.
@@ -158,7 +157,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)unblockAccessory:(HMAccessory *)accessory completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)unblockAccessory:(HMAccessory *)accessory completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Find nearby accessories and add them to the home. During this process, each of the accessories added
@@ -168,7 +167,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addAndSetupAccessoriesWithCompletionHandler:(void (^)(NSError * __nullable error))completion NS_SWIFT_ASYNC_NAME(addAndSetUpAccessories()) API_DEPRECATED("Use -[HMAccessorySetupManager performAccessorySetupUsingRequest:completionHandler:] instead", ios(10.0, 15.4)) API_UNAVAILABLE(macos, macCatalyst) API_UNAVAILABLE(watchos, tvos);
+- (void)addAndSetupAccessoriesWithCompletionHandler:(void (^)(NSError *__nullable error))completion NS_SWIFT_ASYNC_NAME(addAndSetUpAccessories())API_DEPRECATED("Use -[HMAccessorySetupManager performAccessorySetupUsingRequest:completionHandler:] instead", ios(10.0, 15.4))API_UNAVAILABLE(macos, macCatalyst)API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Add accessory with the given setup payload to the home.
@@ -179,7 +178,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addAndSetupAccessoriesWithPayload:(HMAccessorySetupPayload *)payload completionHandler:(void (^)(NSArray<HMAccessory *>* __nullable accessories, NSError * __nullable error))completion NS_SWIFT_ASYNC_NAME(addAndSetUpAccessories(payload:)) API_DEPRECATED("Use -[HMAccessorySetupManager performAccessorySetupUsingRequest:completionHandler:] instead", ios(11.3, 15.0)) API_UNAVAILABLE(macos, macCatalyst) API_UNAVAILABLE(watchos, tvos);
+- (void)addAndSetupAccessoriesWithPayload:(HMAccessorySetupPayload *)payload completionHandler:(void (^)(NSArray<HMAccessory *> *__nullable accessories, NSError *__nullable error))completion NS_SWIFT_ASYNC_NAME(addAndSetUpAccessories(payload:))API_DEPRECATED("Use -[HMAccessorySetupManager performAccessorySetupUsingRequest:completionHandler:] instead", ios(11.3, 15.0))API_UNAVAILABLE(macos, macCatalyst)API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief True if this home supports all of the requirements for adding a network router.
@@ -189,17 +188,17 @@
 @end
 
 
-@interface HMHome(HMUser)
+@interface HMHome (HMUser)
 
 /*!
  * @brief HMUser object representing the current user of the home.
  */
-@property(readonly, strong, nonatomic) HMUser *currentUser API_AVAILABLE(ios(9.0), macCatalyst(14.0));
+@property (readonly, strong, nonatomic) HMUser *currentUser API_AVAILABLE(ios(9.0), macCatalyst(14.0));
 
 /*!
  * @brief Array of HMUser objects that represent all users associated with the home.
  */
-@property(readonly, copy, nonatomic) NSArray<HMUser *> *users API_DEPRECATED("No longer supported.", ios(8.0, 9.0)) API_UNAVAILABLE(watchos, tvos, macCatalyst);
+@property (readonly, copy, nonatomic) NSArray<HMUser *> *users API_DEPRECATED("No longer supported.", ios(8.0, 9.0)) API_UNAVAILABLE(watchos, tvos, macCatalyst);
 
 /*!
  * @brief Presents a view controller to manage users of the home.
@@ -212,7 +211,7 @@
  *                   will be nil on success. If the user does not have administrator privileges the error code will be set to
  *                   HMErrorCodeInsufficientPrivileges.
  */
-- (void)manageUsersWithCompletionHandler:(void (^)(NSError * __nullable error))completion API_AVAILABLE(ios(9.0), macCatalyst(14.0)) API_UNAVAILABLE(watchos, tvos);
+- (void)manageUsersWithCompletionHandler:(void (^)(NSError *__nullable error))completion API_AVAILABLE(ios(9.0), macCatalyst(14.0))API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Adds a user to the home.
@@ -223,7 +222,7 @@
  *                   will be nil on success. The userInfo dictionary will contain the HMUserFailedAccessoriesKey which provides
  *                   more details on the accessories that failed to add the user.
  */
-- (void)addUserWithCompletionHandler:(void (^)(HMUser * __nullable user, NSError * __nullable error))completion API_DEPRECATED_WITH_REPLACEMENT("-manageUsersWithCompletionHandler:", ios(8.0, 9.0)) API_UNAVAILABLE(watchos, tvos, macos, macCatalyst);
+- (void)addUserWithCompletionHandler:(void (^)(HMUser *__nullable user, NSError *__nullable error))completion API_DEPRECATED_WITH_REPLACEMENT("-manageUsersWithCompletionHandler:", ios(8.0, 9.0))API_UNAVAILABLE(watchos, tvos, macos, macCatalyst);
 
 /*!
  * @brief Removes a user from the home.
@@ -235,7 +234,7 @@
  *                   will be nil on success. The userInfo dictionary will contain the HMUserFailedAccessoriesKey which provides
  *                   more details on the accessories that failed to remove the user.
  */
-- (void)removeUser:(HMUser *)user completionHandler:(void (^)(NSError * __nullable error))completion API_DEPRECATED_WITH_REPLACEMENT("-manageUsersWithCompletionHandler:", ios(8.0, 9.0)) API_UNAVAILABLE(macos, watchos, tvos);
+- (void)removeUser:(HMUser *)user completionHandler:(void (^)(NSError *__nullable error))completion API_DEPRECATED_WITH_REPLACEMENT("-manageUsersWithCompletionHandler:", ios(8.0, 9.0))API_UNAVAILABLE(macos, watchos, tvos);
 
 /*!
  * @brief Retrieve the access level of the user associated with the home.
@@ -245,12 +244,12 @@
 @end
 
 
-@interface HMHome(HMRoom)
+@interface HMHome (HMRoom)
 
 /*!
  * @brief Array of HMRoom objects that represents all rooms in the home.
  */
-@property(readonly, copy, nonatomic) NSArray<HMRoom *> *rooms;
+@property (readonly, copy, nonatomic) NSArray<HMRoom *> *rooms;
 
 /*!
  * @brief Adds a room to the home.
@@ -262,7 +261,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addRoomWithName:(NSString *)roomName completionHandler:(void (^)(HMRoom * __nullable room, NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos) NS_SWIFT_ASYNC_NAME(addRoom(named:));
+- (void)addRoomWithName:(NSString *)roomName completionHandler:(void (^)(HMRoom *__nullable room, NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos)NS_SWIFT_ASYNC_NAME(addRoom(named:));
 
 /*!
  * @brief Removes a room from the home. 
@@ -277,7 +276,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)removeRoom:(HMRoom *)room completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)removeRoom:(HMRoom *)room completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief This method returns a room that represents the entire home. This can be used to assign a room
@@ -290,12 +289,12 @@
 @end
 
 
-@interface HMHome(HMZone)
+@interface HMHome (HMZone)
 
 /*!
  * @brief Array of HMZone objects that represents all the zones in the home.
  */
-@property(readonly, copy, nonatomic) NSArray<HMZone *> *zones;
+@property (readonly, copy, nonatomic) NSArray<HMZone *> *zones;
 
 /*!
  * @brief Adds a zone to the home.
@@ -307,7 +306,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addZoneWithName:(NSString *)zoneName completionHandler:(void (^)(HMZone * __nullable zone, NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos) NS_SWIFT_ASYNC_NAME(addZone(named:));
+- (void)addZoneWithName:(NSString *)zoneName completionHandler:(void (^)(HMZone *__nullable zone, NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos)NS_SWIFT_ASYNC_NAME(addZone(named:));
 
 /*!
  * @brief Removes a zone from the home.
@@ -318,17 +317,17 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)removeZone:(HMZone *)zone completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)removeZone:(HMZone *)zone completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
 
-@interface HMHome(HMServiceGroup)
+@interface HMHome (HMServiceGroup)
 
 /*!
  * @brief Array of HMServiceGroup objects that represents all service groups in the home.
  */
-@property(readonly, copy, nonatomic) NSArray<HMServiceGroup *> *serviceGroups;
+@property (readonly, copy, nonatomic) NSArray<HMServiceGroup *> *serviceGroups;
 
 /*!
  * @brief Adds a service group to the home.
@@ -340,7 +339,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addServiceGroupWithName:(NSString *)serviceGroupName completionHandler:(void (^)(HMServiceGroup * __nullable group, NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos) NS_SWIFT_ASYNC_NAME(addServiceGroup(named:));
+- (void)addServiceGroupWithName:(NSString *)serviceGroupName completionHandler:(void (^)(HMServiceGroup *__nullable group, NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos)NS_SWIFT_ASYNC_NAME(addServiceGroup(named:));
 
 /*!
  * @brief Removes a service group from the home.
@@ -351,17 +350,17 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)removeServiceGroup:(HMServiceGroup *)group completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)removeServiceGroup:(HMServiceGroup *)group completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
 
-@interface HMHome(HMActionSet)
+@interface HMHome (HMActionSet)
 
 /*!
  * @brief Array of HMActionSet objects that represents all the action sets in the home.
  */
-@property(readonly, copy, nonatomic) NSArray<HMActionSet *> *actionSets;
+@property (readonly, copy, nonatomic) NSArray<HMActionSet *> *actionSets;
 
 /*!
  * @brief Adds a new action set to the home.
@@ -373,7 +372,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addActionSetWithName:(NSString *)actionSetName completionHandler:(void (^)(HMActionSet * __nullable actionSet, NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos) NS_SWIFT_ASYNC_NAME(addActionSet(named:));
+- (void)addActionSetWithName:(NSString *)actionSetName completionHandler:(void (^)(HMActionSet *__nullable actionSet, NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos)NS_SWIFT_ASYNC_NAME(addActionSet(named:));
 
 /*!
  * @brief Removes an existing action set from the home.
@@ -384,7 +383,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)removeActionSet:(HMActionSet *)actionSet completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)removeActionSet:(HMActionSet *)actionSet completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Executes all the actions within an action set.
@@ -395,7 +394,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)executeActionSet:(HMActionSet *)actionSet completionHandler:(void (^)(NSError * __nullable error))completion;
+- (void)executeActionSet:(HMActionSet *)actionSet completionHandler:(void (^)(NSError *__nullable error))completion;
 
 /*!
  * @brief Retrieve a built-in action set for the home.
@@ -411,12 +410,12 @@
 @end
 
 
-@interface HMHome(HMTrigger)
+@interface HMHome (HMTrigger)
 
 /*!
  * @brief Array of HMTrigger objects that represents all the triggers in the home.
  */
-@property(readonly, copy, nonatomic) NSArray<HMTrigger *> *triggers;
+@property (readonly, copy, nonatomic) NSArray<HMTrigger *> *triggers;
 
 /*!
  * @brief Adds a trigger to the home. Unless the trigger object is added to the home, it cannot be 
@@ -432,7 +431,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addTrigger:(HMTrigger *)trigger completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)addTrigger:(HMTrigger *)trigger completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Removes a trigger from the home. If the trigger is active, they are automatically deactivated.
@@ -443,7 +442,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)removeTrigger:(HMTrigger *)trigger completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)removeTrigger:(HMTrigger *)trigger completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
@@ -452,7 +451,8 @@
  * @brief This delegate receives update on the various accessories, action sets, groups and triggers 
  *        managed in the home.
  */
-API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
+API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0))
+API_UNAVAILABLE(macos)
 @protocol HMHomeDelegate <NSObject>
 
 @optional
@@ -739,7 +739,7 @@
  * @param accessory Accessory that encountered the error
  */
 
-- (void)home:(HMHome *)home didEncounterError:(NSError*)error forAccessory:(HMAccessory *)accessory;
+- (void)home:(HMHome *)home didEncounterError:(NSError *)error forAccessory:(HMAccessory *)accessory;
 
 /*!
  * @brief Informs the delegate when state of the home hub changes.
@@ -758,7 +758,7 @@
  *
  * @param home Sender of the message.
  */
-- (void)homeDidUpdateSupportedFeatures:(HMHome *)home API_AVAILABLE(ios(13.2), watchos(6.1), tvos(13.2)) API_UNAVAILABLE(macos);
+- (void)homeDidUpdateSupportedFeatures:(HMHome *)home API_AVAILABLE(ios(13.2), watchos(6.1), tvos(13.2))API_UNAVAILABLE(macos);
 
 @end
 
@@ -771,6 +771,6 @@
  *             corresponding to the dictionary key is an NSError that provides more details on the
  *             underlying error for that accessory.
  */
-HM_EXTERN NSString * const HMUserFailedAccessoriesKey API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
+HM_EXTERN NSString *const HMUserFailedAccessoriesKey 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_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHomeAccessControl.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHomeAccessControl.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHomeAccessControl.h	2022-06-30 09:29:58.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHomeAccessControl.h	2022-07-22 10:04:52.000000000 -0400
@@ -5,8 +5,8 @@
 //  Copyright (c) 2015 Apple Inc. All rights reserved.
 //
 
-#import <HomeKit/HMDefines.h>
 #import <HomeKit/HMAccessControl.h>
+#import <HomeKit/HMDefines.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -14,12 +14,12 @@
  * @brief Represents the access control of a user associated with a home.
  */
 HM_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMHomeAccessControl : HMAccessControl
+    @interface HMHomeAccessControl : HMAccessControl
 
 /*!
  * @brief Specifies if the user has administrative privileges for the home.
  */
-@property(readonly, getter=isAdministrator, nonatomic) BOOL administrator;
+@property (readonly, getter=isAdministrator, nonatomic) BOOL administrator;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHomeManager.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHomeManager.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHomeManager.h	2022-06-30 22:08:47.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMHomeManager.h	2022-07-25 15:34:34.000000000 -0400
@@ -22,11 +22,10 @@
  *  @constant   HMHomeManagerAuthorizationStatusRestricted      Access to home data is currently restricted by the system.
  *  @constant   HMHomeManagerAuthorizationStatusAuthorized      The application is authorized to access home data.
  */
-typedef NS_OPTIONS( NSUInteger, HMHomeManagerAuthorizationStatus )
-{
-    HMHomeManagerAuthorizationStatusDetermined  = (1 << 0),
-    HMHomeManagerAuthorizationStatusRestricted  = (1 << 1),
-    HMHomeManagerAuthorizationStatusAuthorized  = (1 << 2),
+typedef NS_OPTIONS(NSUInteger, HMHomeManagerAuthorizationStatus) {
+    HMHomeManagerAuthorizationStatusDetermined = (1 << 0),
+    HMHomeManagerAuthorizationStatusRestricted = (1 << 1),
+    HMHomeManagerAuthorizationStatusAuthorized = (1 << 2),
 } API_AVAILABLE(ios(13.0), watchos(6.0), tvos(13.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 /*!
@@ -35,7 +34,7 @@
  *  @discussion This class is responsible for managing a collection of homes.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMHomeManager : NSObject
+    @interface HMHomeManager : NSObject
 
 /*!
  *  @abstract   Delegate that receives updates on the collection of homes.
@@ -71,7 +70,7 @@
  *                          The NSError provides more information on the status of the request, error
  *                          will be nil on success.
  */
-- (void)updatePrimaryHome:(HMHome *)home completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updatePrimaryHome:(HMHome *)home completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  *  @abstract   Adds a new home to the collection.
@@ -83,7 +82,7 @@
  *                          will be nil on success.
  *
  */
-- (void)addHomeWithName:(NSString *)homeName completionHandler:(void (^)(HMHome * __nullable home, NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos) NS_SWIFT_ASYNC_NAME(addHome(named:));
+- (void)addHomeWithName:(NSString *)homeName completionHandler:(void (^)(HMHome *__nullable home, NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos)NS_SWIFT_ASYNC_NAME(addHome(named:));
 
 /*!
  *  @abstract   Removes an existing home from the collection.
@@ -94,14 +93,15 @@
  *                          The NSError provides more information on the status of the request, error
  *                          will be nil on success.
  */
-- (void)removeHome:(HMHome *)home completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)removeHome:(HMHome *)home completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
 /*!
  *  @abstract   This delegate receives updates on homes being managed via the home manager.
  */
-API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
+API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0))
+API_UNAVAILABLE(macos)
 @protocol HMHomeManagerDelegate <NSObject>
 
 @optional
@@ -112,7 +112,7 @@
  *  @param      manager     Sender of this message.
  *  @param      status      The updated authorization status.
  */
-- (void)homeManager:(HMHomeManager *)manager didUpdateAuthorizationStatus:(HMHomeManagerAuthorizationStatus)status API_AVAILABLE(ios(13.0), watchos(6.0), tvos(13.0)) API_UNAVAILABLE(macos);
+- (void)homeManager:(HMHomeManager *)manager didUpdateAuthorizationStatus:(HMHomeManagerAuthorizationStatus)status API_AVAILABLE(ios(13.0), watchos(6.0), tvos(13.0))API_UNAVAILABLE(macos);
 
 /*!
  *  @abstract   Informs the delegate when homes configured by the user have been detected by the system.
@@ -158,7 +158,7 @@
  *
  *  @param      request     Information for the add accessory request.
  */
-- (void)homeManager:(HMHomeManager *)manager didReceiveAddAccessoryRequest:(HMAddAccessoryRequest *)request API_DEPRECATED("No longer supported", ios(13.0, 15.0)) API_UNAVAILABLE(ios, macos, watchos, tvos, macCatalyst) NS_SWIFT_NAME(homeManager(_:didReceiveAddAccessoryRequest:));
+- (void)homeManager:(HMHomeManager *)manager didReceiveAddAccessoryRequest:(HMAddAccessoryRequest *)request API_DEPRECATED("No longer supported", ios(13.0, 15.0))API_UNAVAILABLE(ios, macos, watchos, tvos, macCatalyst)NS_SWIFT_NAME(homeManager(_:didReceiveAddAccessoryRequest:));
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMLocationEvent.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMLocationEvent.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMLocationEvent.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMLocationEvent.h	2022-07-22 10:04:52.000000000 -0400
@@ -18,7 +18,7 @@
  *        exit from a Region
  */
 HM_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMLocationEvent : HMEvent <NSCopying, NSMutableCopying>
+    @interface HMLocationEvent : HMEvent<NSCopying, NSMutableCopying>
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -35,7 +35,7 @@
  * @brief Region on which events are triggered based on the properties notifyOnEntry and notifyOnExit.
  *        This property will be nil when an application is not authorized for location services.
  */
-@property(readonly, strong, nonatomic, nullable) CLRegion *region;
+@property (readonly, strong, nonatomic, nullable) CLRegion *region;
 
 /*!
  * @brief Updates the region
@@ -46,7 +46,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateRegion:(CLRegion *)region completionHandler:(void (^)(NSError * __nullable error))completion API_DEPRECATED("No longer supported.", ios(9.0, 11.0)) API_UNAVAILABLE(watchos, tvos);
+- (void)updateRegion:(CLRegion *)region completionHandler:(void (^)(NSError *__nullable error))completion API_DEPRECATED("No longer supported.", ios(9.0, 11.0))API_UNAVAILABLE(watchos, tvos);
 
 @end
 
@@ -56,7 +56,7 @@
  *        exit from a Region
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMMutableLocationEvent : HMLocationEvent
+    @interface HMMutableLocationEvent : HMLocationEvent
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -64,7 +64,7 @@
  * @brief Region on which events are triggered based on the properties notifyOnEntry and notifyOnExit.
  *        This property will be nil when an application is not authorized for location services.
  */
-@property(readwrite, strong, nonatomic, nullable) CLRegion *region;
+@property (readwrite, strong, nonatomic, nullable) CLRegion *region;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterHome.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterHome.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterHome.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterHome.h	2022-07-22 10:04:51.000000000 -0400
@@ -14,7 +14,7 @@
  * @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 HMMatterHome : NSObject <NSCopying, NSSecureCoding>
+    @interface HMMatterHome : NSObject<NSCopying, NSSecureCoding>
 
 /*!
  *  @abstract   The UUID of the receiver
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRequestHandler.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRequestHandler.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRequestHandler.h	2022-06-30 09:29:55.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRequestHandler.h	2022-07-22 10:04:49.000000000 -0400
@@ -14,21 +14,21 @@
 NS_ASSUME_NONNULL_BEGIN
 
 HM_EXTERN API_AVAILABLE(ios(15.0))
-@interface HMMatterRequestHandler : NSObject <NSExtensionRequestHandling>
+    @interface HMMatterRequestHandler : 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:(HMMatterHome *)home completion:(void (^)(NSArray<HMMatterRoom *> * _Nullable, NSError * _Nullable))completion NS_SWIFT_ASYNC_NAME(rooms(in:));
+- (void)fetchRoomsInHome:(HMMatterHome *)home completion:(void (^)(NSArray<HMMatterRoom *> *_Nullable, NSError *_Nullable))completion NS_SWIFT_ASYNC_NAME(rooms(in:));
 
 /*!
  * @abstract When this method is invoked, pair with the given accessory payload.
  * @param onboardingPayload The onboarding payload your CHIP stack will use to pair with the accessory.
  * @param completion Invoke the completion handler with an optional error after pairing.
  */
-- (void)pairAccessoryInHome:(HMMatterHome *)home onboardingPayload:(NSString *)onboardingPayload completion:(void(^)( NSError * _Nullable ))completion;
+- (void)pairAccessoryInHome:(HMMatterHome *)home onboardingPayload:(NSString *)onboardingPayload completion:(void (^)(NSError *_Nullable))completion;
 
 /*!
  * @abstract When this method is invoked, configure the accessory with user selected attributes.
@@ -36,7 +36,7 @@
  * @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:(HMMatterRoom *)accessoryRoom completion:(void(^)( NSError * _Nullable ))completion NS_SWIFT_NAME(configureAccessory(named:room:completion:));
+- (void)configureAccessoryWithName:(NSString *)accessoryName room:(HMMatterRoom *)accessoryRoom completion:(void (^)(NSError *_Nullable))completion NS_SWIFT_NAME(configureAccessory(named:room:completion:));
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRoom.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRoom.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRoom.h	2022-06-30 09:29:55.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRoom.h	2022-07-22 10:04:49.000000000 -0400
@@ -13,7 +13,7 @@
  * @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 HMMatterRoom : NSObject <NSCopying, NSSecureCoding>
+    @interface HMMatterRoom : NSObject<NSCopying, NSSecureCoding>
 
 /*!
  *  @abstract   The UUID of the receiver
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterTopology.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterTopology.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterTopology.h	2022-06-30 09:29:55.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterTopology.h	2022-07-22 10:04:49.000000000 -0400
@@ -17,7 +17,7 @@
  * @abstract Wraps the information a Matter 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 HMMatterTopology: NSObject <NSCopying, NSSecureCoding>
+    @interface HMMatterTopology : NSObject<NSCopying, NSSecureCoding>
 
 /*!
  * @abstract HMMatterTopology initializer.
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMNetworkConfigurationProfile.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMNetworkConfigurationProfile.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMNetworkConfigurationProfile.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMNetworkConfigurationProfile.h	2022-07-22 10:04:50.000000000 -0400
@@ -15,7 +15,7 @@
 @protocol HMNetworkConfigurationProfileDelegate;
 
 HM_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0), tvos(13.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMNetworkConfigurationProfile : HMAccessoryProfile
+    @interface HMNetworkConfigurationProfile : HMAccessoryProfile
 
 /*!
  *  @abstract   The delegate of the receiver.
@@ -29,7 +29,8 @@
 
 @end
 
-API_AVAILABLE(ios(13.0), watchos(6.0), tvos(13.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
+API_AVAILABLE(ios(13.0), watchos(6.0), tvos(13.0), macCatalyst(14.0))
+API_UNAVAILABLE(macos)
 @protocol HMNetworkConfigurationProfileDelegate <NSObject>
 
 @optional
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMNumberRange.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMNumberRange.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMNumberRange.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMNumberRange.h	2022-07-22 10:04:51.000000000 -0400
@@ -15,7 +15,7 @@
  *
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMNumberRange : NSObject
+    @interface HMNumberRange : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -47,12 +47,12 @@
 /*!
  * @brief The minimum value of the range.
  */
-@property(nullable, readonly, strong, nonatomic) NSNumber *minValue;
+@property (nullable, readonly, strong, nonatomic) NSNumber *minValue;
 
 /*!
  * @brief The maximum value of the range.
  */
-@property(nullable, readonly, strong, nonatomic) NSNumber *maxValue;
+@property (nullable, readonly, strong, nonatomic) NSNumber *maxValue;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMPresenceEvent.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMPresenceEvent.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMPresenceEvent.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMPresenceEvent.h	2022-07-22 10:04:50.000000000 -0400
@@ -14,7 +14,7 @@
  * @brief This class is used to represent the presence of users in a home.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMPresenceEvent : HMEvent <NSCopying, NSMutableCopying>
+    @interface HMPresenceEvent : HMEvent<NSCopying, NSMutableCopying>
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -32,12 +32,12 @@
 /*!
  * @brief presenceEventType The event type that will trigger the event.
  */
-@property(readonly, nonatomic) HMPresenceEventType presenceEventType;
+@property (readonly, nonatomic) HMPresenceEventType presenceEventType;
 
 /*!
  * @brief presenceUserType The user type whose presence will trigger the event.
  */
-@property(readonly, nonatomic) HMPresenceEventUserType presenceUserType;
+@property (readonly, nonatomic) HMPresenceEventUserType presenceUserType;
 
 @end
 
@@ -46,19 +46,19 @@
  * @brief This class is used to represent the presence of users in a home.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMMutablePresenceEvent : HMPresenceEvent
+    @interface HMMutablePresenceEvent : HMPresenceEvent
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief presenceEventType The event type that will trigger the event.
  */
-@property(readwrite, nonatomic) HMPresenceEventType presenceEventType;
+@property (readwrite, nonatomic) HMPresenceEventType presenceEventType;
 
 /*!
  * @brief presenceUserType The user type whose presence will trigger the event.
  */
-@property(readwrite, nonatomic) HMPresenceEventUserType presenceUserType;
+@property (readwrite, nonatomic) HMPresenceEventUserType presenceUserType;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMPresenceEventDefines.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMPresenceEventDefines.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMPresenceEventDefines.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMPresenceEventDefines.h	2022-07-22 10:04:51.000000000 -0400
@@ -11,36 +11,36 @@
 /*!
  * @abstract This enumeration describes the different types of presence events.
  */
-API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-typedef NS_ENUM(NSUInteger, HMPresenceEventType)
-{
+API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0))
+API_UNAVAILABLE(macos)
+typedef NS_ENUM(NSUInteger, HMPresenceEventType) {
     /*!
      * This corresponds to trigger an event for every user entering a home.
      * This cannot be added as predicate.
      */
     HMPresenceEventTypeEveryEntry = 1,
-    
+
     /*!
      * This corresponds to trigger an event for every user exiting a home.
      * This cannot be added as predicate.
      */
     HMPresenceEventTypeEveryExit = 2,
-    
+
     /*!
      * This corresponds to trigger an event for the first user entering a home.
      */
     HMPresenceEventTypeFirstEntry = 3,
-    
+
     /*!
      * This corresponds to trigger an event for the last user exiting a home.
      */
     HMPresenceEventTypeLastExit = 4,
-    
+
     /*!
      * Convenience value for First Entry to use in predicate of HMEventTrigger.
      */
     HMPresenceEventTypeAtHome = HMPresenceEventTypeFirstEntry,
-    
+
     /*!
      * Convenience value for Last Exit to use in predicate of HMEventTrigger.
      */
@@ -50,19 +50,19 @@
 /*!
  * @abstract This enumeration describes the different types of user sets in presence events.
  */
-API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-typedef NS_ENUM(NSUInteger, HMPresenceEventUserType)
-{
+API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0))
+API_UNAVAILABLE(macos)
+typedef NS_ENUM(NSUInteger, HMPresenceEventUserType) {
     /*!
      * Only current user's presence is used.
      */
     HMPresenceEventUserTypeCurrentUser = 1,
-    
+
     /*!
      * Presence of all home users is used.
      */
     HMPresenceEventUserTypeHomeUsers = 2,
-    
+
     /*!
      * Presence of custom set of home users is used.
      */
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMRoom.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMRoom.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMRoom.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMRoom.h	2022-07-22 10:04:52.000000000 -0400
@@ -16,25 +16,25 @@
  * @brief This class describes a room in the home.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMRoom : NSObject
+    @interface HMRoom : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief Name of the room.
  */
-@property(readonly, copy, nonatomic) NSString *name;
+@property (readonly, copy, nonatomic) NSString *name;
 
 /*!
  * @brief Array of HMAccessory objects that correspond to the accessories 
  *        associated with this room.
  */
-@property(readonly, copy, nonatomic) NSArray<HMAccessory *> *accessories;
+@property (readonly, copy, nonatomic) NSArray<HMAccessory *> *accessories;
 
 /*!
  * @brief A unique identifier for the room.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief This method is used to change the name of the room.
@@ -45,7 +45,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMService.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMService.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMService.h	2022-06-30 21:55:40.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMService.h	2022-07-22 10:04:52.000000000 -0400
@@ -21,22 +21,22 @@
  *             modified.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMService : NSObject
+    @interface HMService : NSObject
 
 /*!
  * @brief Accessory that provides this service.
  */
-@property(readonly, weak, nonatomic) HMAccessory *accessory;
+@property (readonly, weak, nonatomic) HMAccessory *accessory;
 
 /*!
  * @brief The type of the service, e.g. HMServiceTypeLightbulb.
  */
-@property(readonly, copy, nonatomic) NSString *serviceType;
+@property (readonly, copy, nonatomic) NSString *serviceType;
 
 /*!
  * @brief The localized description of the service.
  */
-@property(readonly, copy, nonatomic) NSString *localizedDescription API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSString *localizedDescription API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief Name for the service.
@@ -44,7 +44,7 @@
  * @discussion Returns the service's name that is associated with HomeKit. The initial value is the value of
  *             the name characteristic of the service, if it has one.
  */
-@property(readonly, copy, nonatomic) NSString *name;
+@property (readonly, copy, nonatomic) NSString *name;
 
 /*!
  * @brief For HMServiceTypeOutlet and HMServiceTypeSwitch, this is the type of the associated service.
@@ -52,18 +52,18 @@
  * @discussion This could be any of the HomeKit Accessory Profile defined services (except HMServiceTypeOutlet
  *             or HMServiceTypeSwitch) that supports HMCharacteristicTypePowerState characteristic.
  */
-@property(readonly, copy, nonatomic, nullable) NSString *associatedServiceType;
+@property (readonly, copy, nonatomic, nullable) NSString *associatedServiceType;
 
 /*!
  * @brief Array of HMCharacteristic objects that represents all the characteristics
  *        provided by the service.
  */
-@property(readonly, copy, nonatomic) NSArray<HMCharacteristic *> *characteristics;
+@property (readonly, copy, nonatomic) NSArray<HMCharacteristic *> *characteristics;
 
 /*!
  * @brief A unique identifier for the service.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief Indicates if this service supports user interaction or not.
@@ -71,14 +71,14 @@
  * @discussion Applications should use this property to filter out services that the users
  *             should not directly interact with, e.g. HMServiceTypeAccessoryInformation.
  */
-@property(readonly, getter=isUserInteractive, nonatomic) BOOL userInteractive API_AVAILABLE(ios(9.0));
+@property (readonly, getter=isUserInteractive, nonatomic) BOOL userInteractive API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief Indicates if this services is the primary service.
  *
  * @discussion Applications should use this property to show the primary service on the accessory.
  */
-@property(readonly, getter=isPrimaryService, nonatomic) BOOL primaryService API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0));
+@property (readonly, getter=isPrimaryService, nonatomic) BOOL primaryService API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0));
 
 /*!
  * @brief Array of HMService objects that represents all the services that the service links to.
@@ -86,7 +86,7 @@
  * @discussion Applications should use this property to show logical grouping of services on the accessory.
  *             linkedServices will be nil when the service does not link to any other services.
  */
-@property(readonly, copy, nonatomic) NSArray<HMService *> * __nullable linkedServices API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0));
+@property (readonly, copy, nonatomic) NSArray<HMService *> *__nullable linkedServices API_AVAILABLE(ios(10.0), watchos(3.0), tvos(10.0));
 
 /*!
  * @brief This method is used to change the name of the service.
@@ -99,7 +99,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief This method is used to set up the service type of the device connected to a contact sensor, switch or an outlet.
@@ -120,7 +120,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateAssociatedServiceType:(nullable NSString *)serviceType completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateAssociatedServiceType:(nullable NSString *)serviceType completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMServiceGroup.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMServiceGroup.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMServiceGroup.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMServiceGroup.h	2022-07-22 10:04:50.000000000 -0400
@@ -20,24 +20,24 @@
  *             Eg. A collection of lights can be grouped as the "Desk Lamps" service group.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMServiceGroup : NSObject
+    @interface HMServiceGroup : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief Name of the service group.
  */
-@property(readonly, copy, nonatomic) NSString *name;
+@property (readonly, copy, nonatomic) NSString *name;
 
 /*!
  * @brief Array of HMService objects that correspond to the services contained in this group.
  */
-@property(readonly, copy, nonatomic) NSArray<HMService *> *services;
+@property (readonly, copy, nonatomic) NSArray<HMService *> *services;
 
 /*!
  * @brief A unique identifier for the service group.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief This method is used to change the name of the service group.
@@ -48,7 +48,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Adds an service to this service group. The service and the group must be part of the same
@@ -61,7 +61,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addService:(HMService *)service completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)addService:(HMService *)service completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Removes an service from this service group.
@@ -72,7 +72,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)removeService:(HMService *)service completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)removeService:(HMService *)service completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMSignificantEvents.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMSignificantEvents.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMSignificantEvents.h	2022-06-30 09:29:55.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMSignificantEvents.h	2022-07-22 10:04:50.000000000 -0400
@@ -13,7 +13,7 @@
 /*!
  * @brief Type corresponding to significant events.
  */
-typedef NSString * HMSignificantEvent NS_EXTENSIBLE_STRING_ENUM API_UNAVAILABLE(macos);
+typedef NSString *HMSignificantEvent NS_EXTENSIBLE_STRING_ENUM API_UNAVAILABLE(macos);
 
 /*!
  * @brief Event corresponding to sunrise
@@ -26,5 +26,3 @@
 HM_EXTERN HMSignificantEvent const HMSignificantEventSunset API_AVAILABLE(ios(9.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos);
 
 NS_ASSUME_NONNULL_END
-
-
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMSignificantTimeEvent.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMSignificantTimeEvent.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMSignificantTimeEvent.h	2022-06-30 09:29:57.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMSignificantTimeEvent.h	2022-07-22 10:04:51.000000000 -0400
@@ -13,7 +13,7 @@
  * @brief This class is used to represent a significant time event.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMSignificantTimeEvent : HMTimeEvent <NSCopying, NSMutableCopying>
+    @interface HMSignificantTimeEvent : HMTimeEvent<NSCopying, NSMutableCopying>
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -34,37 +34,35 @@
 /*!
  * @brief significantEvent The significant event for the trigger.
  */
-@property(readonly, strong, nonatomic) HMSignificantEvent significantEvent;
+@property (readonly, strong, nonatomic) HMSignificantEvent significantEvent;
 
 /*!
  * @brief offset An offset from the time of the signficant event. To specify an offset before the significant event, the
  *               properties of the NSDateComponents must be negative value. e.g. To specify 30 mins before sunset, the
  *               'minute' property must be set to -30.
  */
-@property(readonly, strong, nonatomic, nullable) NSDateComponents *offset;
+@property (readonly, strong, nonatomic, nullable) NSDateComponents *offset;
 
 @end
 
 
-
-
 /*!
  * @brief This class is used to represent a significant time event.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMMutableSignificantTimeEvent : HMSignificantTimeEvent
+    @interface HMMutableSignificantTimeEvent : HMSignificantTimeEvent
 
 /*!
  * @brief significantEvent The significant event for the trigger.
  */
-@property(readwrite, strong, nonatomic) HMSignificantEvent significantEvent;
+@property (readwrite, strong, nonatomic) HMSignificantEvent significantEvent;
 
 /*!
  * @brief offset An offset from the time of the signficant event. To specify an offset before the significant event, the
  *               properties of the NSDateComponents must be negative value. e.g. To specify 30 mins before sunset, the
  *               'minute' property must be set to -30.
  */
-@property(readwrite, strong, nonatomic) NSDateComponents *offset;
+@property (readwrite, strong, nonatomic) NSDateComponents *offset;
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTimeEvent.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTimeEvent.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTimeEvent.h	2022-06-30 09:29:58.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTimeEvent.h	2022-07-22 10:04:52.000000000 -0400
@@ -14,7 +14,7 @@
  * @brief This class is used to represent a generic time event.
  */
 HM_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), tvos(11.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMTimeEvent : HMEvent
+    @interface HMTimeEvent : HMEvent
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTimerTrigger.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTimerTrigger.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTimerTrigger.h	2022-06-30 19:28:36.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTimerTrigger.h	2022-07-22 09:58:10.000000000 -0400
@@ -16,7 +16,7 @@
  * @discussion This class represents a trigger that is based on timers.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMTimerTrigger : HMTrigger
+    @interface HMTimerTrigger : HMTrigger
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -62,7 +62,7 @@
  *
  * @note Should be at least 1 minute ahead for reliable firing.
  */
-@property(readonly, copy, nonatomic) NSDate *fireDate;
+@property (readonly, copy, nonatomic) NSDate *fireDate;
 
 /*!
  * @brief Set the time zone to interpret the fire date in. 
@@ -71,7 +71,7 @@
  *             fired will be adjusted to account for the time zone change. If this value is
  *             non-nil, the trigger will fire at the specified time in the specific time zone.
  */
-@property(readonly, copy, nonatomic, nullable) NSTimeZone *timeZone;
+@property (readonly, copy, nonatomic, nullable) NSTimeZone *timeZone;
 
 /*!
  * @brief The date components that specify how a trigger is to be repeated. 
@@ -86,12 +86,12 @@
  *             whole minutes. Examples are 5 minutes, 6 minutes, 1 day, 2 weeks.
  *
  */
-@property(readonly, copy, nonatomic, nullable) NSDateComponents *recurrence;
+@property (readonly, copy, nonatomic, nullable) NSDateComponents *recurrence;
 
- /*!
+/*!
   * @brief The calendar corresponding to a recurring timer trigger.
   */
-@property(readonly, copy, nonatomic, nullable) NSCalendar *recurrenceCalendar;
+@property (readonly, copy, nonatomic, nullable) NSCalendar *recurrenceCalendar;
 
 /*!
  * @brief This method is used to change the fire date of a timer trigger.
@@ -103,7 +103,7 @@
  *                   error will be nil on success. HMErrorCodeDateMustBeOnSpecifiedBoundaries will
  *                   be returned if the fireDate includes a seconds value other than 0.
  */
-- (void)updateFireDate:(NSDate *)fireDate completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateFireDate:(NSDate *)fireDate completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief This method is used to change the time zone of the fire date of a timer trigger.
@@ -115,7 +115,7 @@
  *                   The NSError provides more information on the status of the request,
  *                   error will be nil on success.
  */
-- (void)updateTimeZone:(nullable NSTimeZone *)timeZone completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateTimeZone:(nullable NSTimeZone *)timeZone completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief This method is used to change the recurrence interval for a timer trigger.
@@ -135,7 +135,7 @@
  *                   greater than 5 weeks. *                   error will be nil on success.
  */
 - (void)updateRecurrence:(nullable NSDateComponents *)recurrence
-       completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+       completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTrigger.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTrigger.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTrigger.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMTrigger.h	2022-07-22 10:04:51.000000000 -0400
@@ -19,37 +19,37 @@
  *             be used to execute one or more action sets when the event fires.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMTrigger : NSObject
+    @interface HMTrigger : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief Name of the trigger.
  */
-@property(readonly, copy, nonatomic) NSString *name;
+@property (readonly, copy, nonatomic) NSString *name;
 
 /*!
  * @brief State of the trigger.
  *
  * @discussion TRUE if the trigger is enable, FALSE otherwise.
  */
-@property(readonly, getter=isEnabled, nonatomic) BOOL enabled;
+@property (readonly, getter=isEnabled, nonatomic) BOOL enabled;
 
 /*!
  * @abstract Array of HMActionSet objects that represent all the action sets associated
  *           with this trigger.
  */
-@property(readonly, copy, nonatomic) NSArray<HMActionSet *> *actionSets;
+@property (readonly, copy, nonatomic) NSArray<HMActionSet *> *actionSets;
 
 /*!
  * @brief The date that this trigger was most recently fired.
  */
-@property(readonly, copy, nonatomic, nullable) NSDate *lastFireDate;
+@property (readonly, copy, nonatomic, nullable) NSDate *lastFireDate;
 
 /*!
  * @brief A unique identifier for the trigger.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief This method is used to change the name of the trigger.
@@ -59,7 +59,7 @@
  * @param completion Block that is invoked once the request is processed.
  *                   The NSError provides more information on the status of the request.
  */
-- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Registers an action set to be executed when the trigger is fired.
@@ -70,7 +70,7 @@
  * @param completion Block that is invoked once the request is processed. 
  *                   The NSError provides more information on the status of the request.
  */
-- (void)addActionSet:(HMActionSet *)actionSet completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)addActionSet:(HMActionSet *)actionSet completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief De-registers an action set from the trigger.
@@ -80,7 +80,7 @@
  * @param completion Block that is invoked once the request is processed. 
  *                   The NSError provides more information on the status of the request.
  */
-- (void)removeActionSet:(HMActionSet *)actionSet completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)removeActionSet:(HMActionSet *)actionSet completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Enables or disables the trigger. 
@@ -97,7 +97,7 @@
  * @param completion Block that is invoked once the request is processed. 
  *                   The NSError provides more information on the status of the request.
  */
-- (void)enable:(BOOL)enable completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)enable:(BOOL)enable completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMUser.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMUser.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMUser.h	2022-06-30 09:29:56.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMUser.h	2022-07-22 10:04:50.000000000 -0400
@@ -16,19 +16,19 @@
  * @brief This class describes a user in the home.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMUser : NSObject
+    @interface HMUser : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief Name of the user.
  */
-@property(readonly, copy, nonatomic) NSString *name;
+@property (readonly, copy, nonatomic) NSString *name;
 
 /*!
  * @brief A unique identifier for the user.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMZone.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMZone.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMZone.h	2022-06-30 09:29:58.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMZone.h	2022-07-22 10:04:52.000000000 -0400
@@ -21,24 +21,24 @@
  *             in the "Downstairs" zone.
  */
 HM_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), tvos(10.0), macCatalyst(14.0)) API_UNAVAILABLE(macos)
-@interface HMZone : NSObject
+    @interface HMZone : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
 /*!
  * @brief Name of the zone.
  */
-@property(readonly, copy, nonatomic) NSString *name;
+@property (readonly, copy, nonatomic) NSString *name;
 
 /*!
  * @brief Array of HMRoom objects that correspond to the rooms contained in this zone.
  */
-@property(readonly, copy, nonatomic) NSArray<HMRoom *> *rooms;
+@property (readonly, copy, nonatomic) NSArray<HMRoom *> *rooms;
 
 /*!
  * @brief A unique identifier for the zone.
  */
-@property(readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
+@property (readonly, copy, nonatomic) NSUUID *uniqueIdentifier API_AVAILABLE(ios(9.0));
 
 /*!
  * @brief This method is used to change the name of the zone.
@@ -49,7 +49,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)updateName:(NSString *)name completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Adds a room to a zone.
@@ -63,7 +63,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)addRoom:(HMRoom *)room completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)addRoom:(HMRoom *)room completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 /*!
  * @brief Removes a room from the zone.
@@ -74,7 +74,7 @@
  *                   The NSError provides more information on the status of the request, error
  *                   will be nil on success.
  */
-- (void)removeRoom:(HMRoom *)room completionHandler:(void (^)(NSError * __nullable error))completion API_UNAVAILABLE(watchos, tvos);
+- (void)removeRoom:(HMRoom *)room completionHandler:(void (^)(NSError *__nullable error))completion API_UNAVAILABLE(watchos, tvos);
 
 @end
 
diff -ruN /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h
--- /Applications/Xcode_14.0.0-beta3.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h	2022-06-25 00:09:38.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta4.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h	2022-07-17 23:16:38.000000000 -0400
@@ -5,60 +5,60 @@
 //  Copyright (c) 2014-2018 Apple Inc. All rights reserved.
 //
 
-#import <HomeKit/HMHomeManager.h>
-#import <HomeKit/HMAccessoryBrowser.h>
-#import <HomeKit/HMHome.h>
-#import <HomeKit/HMRoom.h>
-#import <HomeKit/HMZone.h>
-#import <HomeKit/HMServiceGroup.h>
 #import <HomeKit/HMAccessory.h>
-#import <HomeKit/HMService.h>
+#import <HomeKit/HMAccessoryBrowser.h>
+#import <HomeKit/HMAccessoryCategory.h>
+#import <HomeKit/HMAccessoryCategoryTypes.h>
+#import <HomeKit/HMAction.h>
+#import <HomeKit/HMActionSet.h>
 #import <HomeKit/HMCharacteristic.h>
 #import <HomeKit/HMCharacteristicDefines.h>
 #import <HomeKit/HMCharacteristicMetadata.h>
-#import <HomeKit/HMAction.h>
 #import <HomeKit/HMCharacteristicWriteAction.h>
-#import <HomeKit/HMActionSet.h>
-#import <HomeKit/HMTrigger.h>
+#import <HomeKit/HMHome.h>
+#import <HomeKit/HMHomeAccessControl.h>
+#import <HomeKit/HMHomeManager.h>
+#import <HomeKit/HMRoom.h>
+#import <HomeKit/HMService.h>
+#import <HomeKit/HMServiceGroup.h>
 #import <HomeKit/HMTimerTrigger.h>
+#import <HomeKit/HMTrigger.h>
 #import <HomeKit/HMUser.h>
-#import <HomeKit/HMHomeAccessControl.h>
-#import <HomeKit/HMAccessoryCategory.h>
-#import <HomeKit/HMAccessoryCategoryTypes.h>
+#import <HomeKit/HMZone.h>
 
-#import <HomeKit/HMEvent.h>
+#import <HomeKit/HMCalendarEvent.h>
 #import <HomeKit/HMCharacteristicEvent.h>
+#import <HomeKit/HMEvent.h>
 #import <HomeKit/HMLocationEvent.h>
-#import <HomeKit/HMCalendarEvent.h>
 
-#import <HomeKit/HMEventTrigger.h>
-#import <HomeKit/HMError.h>
 #import <HomeKit/HMAccessoryProfile.h>
-#import <HomeKit/HMSignificantTimeEvent.h>
-#import <HomeKit/HMDurationEvent.h>
+#import <HomeKit/HMAddAccessoryRequest.h>
 #import <HomeKit/HMCharacteristicThresholdRangeEvent.h>
-#import <HomeKit/HMPresenceEvent.h>
-#import <HomeKit/HMNumberRange.h>
+#import <HomeKit/HMDurationEvent.h>
+#import <HomeKit/HMError.h>
+#import <HomeKit/HMEventTrigger.h>
 #import <HomeKit/HMEventTriggerActivationState.h>
-#import <HomeKit/HMSignificantEvents.h>
-#import <HomeKit/HMPresenceEventDefines.h>
-#import <HomeKit/HMAddAccessoryRequest.h>
 #import <HomeKit/HMNetworkConfigurationProfile.h>
+#import <HomeKit/HMNumberRange.h>
+#import <HomeKit/HMPresenceEvent.h>
+#import <HomeKit/HMPresenceEventDefines.h>
+#import <HomeKit/HMSignificantEvents.h>
+#import <HomeKit/HMSignificantTimeEvent.h>
 
 #import <HomeKit/HMCameraView.h>
 
 #import <HomeKit/HMAccessory+Camera.h>
-#import <HomeKit/HMCameraProfile.h>
 #import <HomeKit/HMCameraControl.h>
+#import <HomeKit/HMCameraProfile.h>
 
-#import <HomeKit/HMCameraStreamControl.h>
 #import <HomeKit/HMCameraStream.h>
+#import <HomeKit/HMCameraStreamControl.h>
 
-#import <HomeKit/HMCameraSnapshotControl.h>
 #import <HomeKit/HMCameraSnapshot.h>
+#import <HomeKit/HMCameraSnapshotControl.h>
 
-#import <HomeKit/HMCameraSettingsControl.h>
 #import <HomeKit/HMCameraAudioControl.h>
+#import <HomeKit/HMCameraSettingsControl.h>
 
 #import <HomeKit/HMAccessorySetupManager.h>
 #import <HomeKit/HMAccessorySetupPayload.h>
Clone this wiki locally