-
Notifications
You must be signed in to change notification settings - Fork 503
HealthKit iOS xcode14.0 beta1
TJ Lambert edited this page Aug 3, 2022
·
3 revisions
#HealthKit.framework https://github.com/xamarin/xamarin-macios/pull/15612
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKActivitySummary.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKActivitySummary.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKActivitySummary.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKActivitySummary.h 2022-05-31 15:04:02.000000000 -0400
@@ -2,7 +2,7 @@
// HKActivitySummary.h
// HealthKit
//
-// Copyright (c) 2015 Apple Inc. All rights reserved.
+// Copyright (c) 2015-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -15,7 +15,7 @@
@class HKActivitySummary
@abstract An object that represents a summary of a user's activity for a given day.
*/
-HK_EXTERN API_AVAILABLE(ios(9.3), watchos(2.2))
+HK_EXTERN API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(13.0), macos(13.0))
@interface HKActivitySummary : NSObject <NSSecureCoding, NSCopying>
/**
@@ -30,7 +30,7 @@
@abstract The move mode of this activity summary
@discussion The move mode of an activity summary determines if activeEnergyBurned or appleMoveTime are used for the move ring.
*/
-@property (nonatomic, assign) HKActivityMoveMode activityMoveMode API_AVAILABLE(ios(14.0), watchos(7.0));
+@property (nonatomic, assign) HKActivityMoveMode activityMoveMode API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/**
@property activeEnergyBurned
@@ -45,7 +45,7 @@
@discussion This quantity is compatible with time units. The measurement criteria of
move time time is defined by Apple.
*/
-@property (nonatomic, strong) HKQuantity *appleMoveTime API_AVAILABLE(ios(14.0), watchos(7.0));
+@property (nonatomic, strong) HKQuantity *appleMoveTime API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/**
@property appleExerciseTime
@@ -75,25 +75,39 @@
@abstract The user's move time goal for the day.
@discussion This quantity is compatible with time units.
*/
-@property (nonatomic, strong) HKQuantity *appleMoveTimeGoal API_AVAILABLE(ios(14.0), watchos(7.0));
+@property (nonatomic, strong) HKQuantity *appleMoveTimeGoal API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/**
@property appleExerciseTimeGoal
@abstract The user's exercise time goal for the day.
@discussion This quantity is compatible with time units.
*/
-@property (nonatomic, strong) HKQuantity *appleExerciseTimeGoal;
+@property (nonatomic, strong) HKQuantity *appleExerciseTimeGoal API_DEPRECATED_WITH_REPLACEMENT("exerciseTimeGoal", ios(9.3, API_TO_BE_DEPRECATED), watchos(2.2, API_TO_BE_DEPRECATED));
+
+/**
+ @property exerciseTimeGoal
+ @abstract The user's exercise time goal for the day.
+ @discussion This quantity is compatible with time units.
+ */
+@property (nonatomic, strong, nullable) HKQuantity *exerciseTimeGoal API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
/**
@property appleStandHoursGoal
@abstract The user's active stand hours goal for the day.
@discussion This quantity is compatible with the count unit.
*/
-@property (nonatomic, strong) HKQuantity *appleStandHoursGoal;
+@property (nonatomic, strong) HKQuantity *appleStandHoursGoal API_DEPRECATED_WITH_REPLACEMENT("standHoursGoal", ios(9.3, API_TO_BE_DEPRECATED), watchos(2.2, API_TO_BE_DEPRECATED));
+
+/**
+ @property standHoursGoal
+ @abstract The user's active stand hours goal for the day.
+ @discussion This quantity is compatible with the count unit.
+ */
+@property (nonatomic, strong, nullable) HKQuantity *standHoursGoal API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
@end
// Predicate Key Paths
-HK_EXTERN NSString * const HKPredicateKeyPathDateComponents API_AVAILABLE(ios(9.3), watchos(2.2));
+HK_EXTERN NSString * const HKPredicateKeyPathDateComponents API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(13.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKActivitySummaryQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKActivitySummaryQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKActivitySummaryQuery.h 2022-02-23 07:59:07.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKActivitySummaryQuery.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,7 +2,7 @@
// HKActivitySummaryQuery.h
// HealthKit
//
-// Copyright (c) 2015 Apple Inc. All rights reserved.
+// Copyright (c) 2015-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -15,7 +15,7 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKActivitySummaryQueryDescriptor", ios(9.3, API_TO_BE_DEPRECATED), watchos(2.2, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(9.3), watchos(2.2))
+API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(13.0), macos(13.0))
#endif
@interface HKActivitySummaryQuery : HKQuery
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAnchoredObjectQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAnchoredObjectQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAnchoredObjectQuery.h 2022-02-23 07:15:54.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAnchoredObjectQuery.h 2022-05-31 15:04:04.000000000 -0400
@@ -2,7 +2,7 @@
// HKAnchoredObjectQuery.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -24,7 +24,7 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKAnchoredObjectQueryDescriptor", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(8.0), watchos(2.0))
+API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
#endif
@interface HKAnchoredObjectQuery : HKQuery
@@ -56,7 +56,7 @@
predicate:(nullable NSPredicate *)predicate
anchor:(nullable HKQueryAnchor *)anchor
limit:(NSUInteger)limit
- resultsHandler:(void(^)(HKAnchoredObjectQuery *query, NSArray<__kindof HKSample *> * _Nullable sampleObjects, NSArray<HKDeletedObject *> * _Nullable deletedObjects, HKQueryAnchor * _Nullable newAnchor, NSError * _Nullable error))handler API_AVAILABLE(ios(9.0), watchos(2.0));
+ resultsHandler:(void(^)(HKAnchoredObjectQuery *query, NSArray<__kindof HKSample *> * _Nullable sampleObjects, NSArray<HKDeletedObject *> * _Nullable deletedObjects, HKQueryAnchor * _Nullable newAnchor, NSError * _Nullable error))handler API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
- (instancetype)initWithType:(HKSampleType *)type
predicate:(nullable NSPredicate *)predicate
@@ -83,7 +83,7 @@
- (instancetype)initWithQueryDescriptors:(NSArray<HKQueryDescriptor *> *)queryDescriptors
anchor:(nullable HKQueryAnchor *)anchor
limit:(NSInteger)limit
- resultsHandler:(void(^)(HKAnchoredObjectQuery *query, NSArray<__kindof HKSample *> * _Nullable sampleObjects, NSArray<HKDeletedObject *> * _Nullable deletedObjects, HKQueryAnchor * _Nullable newAnchor, NSError * _Nullable error))handler API_AVAILABLE(ios(15.0), watchos(8.0));
+ resultsHandler:(void(^)(HKAnchoredObjectQuery *query, NSArray<__kindof HKSample *> * _Nullable sampleObjects, NSArray<HKDeletedObject *> * _Nullable deletedObjects, HKQueryAnchor * _Nullable newAnchor, NSError * _Nullable error))handler API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
@end
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAppleWalkingSteadinessClassification.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAppleWalkingSteadinessClassification.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAppleWalkingSteadinessClassification.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAppleWalkingSteadinessClassification.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKAppleWalkingSteadinessClassification.h
// HealthKit
//
-// Copyright © 2021 Apple. All rights reserved.
+// Copyright © 2021-2022 Apple. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -22,7 +22,7 @@
HKAppleWalkingSteadinessClassificationOK NS_SWIFT_NAME(ok) = 1,
HKAppleWalkingSteadinessClassificationLow,
HKAppleWalkingSteadinessClassificationVeryLow,
-} API_AVAILABLE(ios(15.0), watchos(8.0));
+} API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
/*!
@abstract Determines the Apple Walking Steadiness classification for the provided Apple Walking Steadiness value.
@@ -31,18 +31,18 @@
@param errorOut A pointer to an error describing why an unknown classification was returned.
@return YES if the classification was successful. NO otherwise, meaning the provided value could not be classified.
*/
-HK_EXTERN BOOL HKAppleWalkingSteadinessClassificationForQuantity(HKQuantity *value, HKAppleWalkingSteadinessClassification *classificationOut, NSError **errorOut) API_AVAILABLE(ios(15.0), watchos(8.0)) NS_REFINED_FOR_SWIFT;
+HK_EXTERN BOOL HKAppleWalkingSteadinessClassificationForQuantity(HKQuantity *value, HKAppleWalkingSteadinessClassification *classificationOut, NSError **errorOut) API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0)) NS_REFINED_FOR_SWIFT;
/*!
@abstract Retrieves the minimum quantity in percent unit for an Apple Walking Steadiness classification.
@param classification Apple Walking Steadiness classification for desired minimum value.
*/
-HK_EXTERN HKQuantity * HKAppleWalkingSteadinessMinimumQuantityForClassification(HKAppleWalkingSteadinessClassification classification) API_AVAILABLE(ios(15.0), watchos(8.0)) NS_REFINED_FOR_SWIFT;
+HK_EXTERN HKQuantity * HKAppleWalkingSteadinessMinimumQuantityForClassification(HKAppleWalkingSteadinessClassification classification) API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0)) NS_REFINED_FOR_SWIFT;
/*!
@abstract Retrieves the maximum quantity in percent unit for an Apple Walking Steadiness classification.
@param classification Apple Walking Steadiness classification for desired maximum value.
*/
-HK_EXTERN HKQuantity * HKAppleWalkingSteadinessMaximumQuantityForClassification(HKAppleWalkingSteadinessClassification classification) API_AVAILABLE(ios(15.0), watchos(8.0)) NS_REFINED_FOR_SWIFT;
+HK_EXTERN HKQuantity * HKAppleWalkingSteadinessMaximumQuantityForClassification(HKAppleWalkingSteadinessClassification classification) API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0)) NS_REFINED_FOR_SWIFT;
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAttachment.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAttachment.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAttachment.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAttachment.h 2022-05-31 14:51:53.000000000 -0400
@@ -0,0 +1,72 @@
+//
+// HKAttachment.h
+// HealthKit
+//
+// Copyright © 2022 Apple. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HealthKit/HKDefines.h>
+#import <UniformTypeIdentifiers/UTType.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ @class HKAttachment
+ @discussion An HKAttachment represents a file attachment stored in the HealthKit database.
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKAttachment : NSObject <NSSecureCoding, NSCopying>
+
+/*!
+ @property identifier
+ @abstract A unique identifier of the receiver in the HealthKit database.
+ */
+@property (copy, readonly) NSUUID *identifier;
+
+/*!
+ @property name
+ @abstract Represents the name of the file.
+ */
+@property (copy, readonly) NSString *name;
+
+/*!
+ @property contentType
+ @abstract The Uniform Type of the file.
+ */
+@property (copy, readonly) UTType *contentType;
+
+/*!
+ @property size
+ @abstract The size in bytes of the file.
+ */
+@property (assign, readonly) NSInteger size;
+
+/*!
+ @property creationDate
+ @abstract The date the receiver was created.
+ */
+@property (copy, readonly) NSDate *creationDate;
+
+/*!
+ @property metadata
+ @abstract Extra information describing the attachment.
+ @discussion Keys must be NSString and values must be either NSString, NSNumber, or NSDate.
+ */
+@property (copy, readonly, nullable) NSDictionary<NSString *, id> *metadata;
+
+/*!
+ @method init
+ @abstract The init method is unavailable. To create an attachment, use HKAttachmentStore.
+ */
+- (instancetype)init NS_UNAVAILABLE;
+
+/*!
+ @method new
+ @abstract The new method is unavailable. To create an attachment, use HKAttachmentStore.
+ */
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAttachmentStore.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAttachmentStore.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAttachmentStore.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAttachmentStore.h 2022-05-31 14:49:27.000000000 -0400
@@ -0,0 +1,94 @@
+//
+// HKAttachmentStore.h
+// HealthKit
+//
+// Copyright © 2022 Apple. All rights reserved.
+//
+
+#import <HealthKit/HKDefines.h>
+#import <HealthKit/HKAttachment.h>
+
+@class HKHealthStore;
+@class HKObject;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ @class HKAttachmentStore
+ @discussion The HKAttachmentStore class provides an interface for accessing and storing HKAttachment objects.
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKAttachmentStore : NSObject
+
+/*!
+ @method initWithHealthStore:
+ @abstract The designated initializer to create an HKAttachmentStore.
+ @param healthStore Specifies the HKHealthStore object to use.
+ */
+- (instancetype)initWithHealthStore:(HKHealthStore *)healthStore;
+
+/*!
+ @method addAttachmentToObject:name:contentType:URL:metadata:completion:
+ @abstract Creates a new HKAttachment using the passed in NSURL and attaches it to the specified HKObject.
+ @param object The object for which to add the HKAttachment.
+ @param name The name of the attachment.
+ @param contentType The content type of the attachment.
+ @param URL The NSURL to use to create the attachment.
+ @param metadata Extra information describing the attachment.
+ @param completion Called with an HKAttachment instance once the file was successfully saved and attached,
+ otherwise called with an error.
+ */
+- (void)addAttachmentToObject:(HKObject *)object
+ name:(NSString *)name
+ contentType:(UTType *)contentType
+ URL:(NSURL *)URL
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata
+ completion:(void (^)(HKAttachment * _Nullable attachment, NSError * _Nullable error))completion NS_REFINED_FOR_SWIFT;
+
+/*!
+ @method removeAttachment:fromObject:completion:
+ @abstract Removes the given HKAttachment from the specified HKObject.
+ @param attachment The HKAttachment to be removed.
+ @param object The object from which to remove the attachment.
+ @param completion Called once the remove operation finishes.
+ */
+- (void)removeAttachment:(HKAttachment *)attachment
+ fromObject:(HKObject *)object
+ completion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_NAME(removeAttachment(_:from:completion:)) NS_SWIFT_ASYNC_THROWS_ON_FALSE(1);
+
+/*!
+ @method getAttachmentsForObject:completion:
+ @abstract Retrieves a list of attachments for a given object.
+ @param object The object for which to retrieve attachments.
+ @param completion Called with a list of attachments or an error.
+ */
+- (void)getAttachmentsForObject:(HKObject *)object
+ completion:(void(^)(NSArray<HKAttachment *> * _Nullable attachments, NSError * _Nullable error))completion NS_SWIFT_NAME(getAttachments(for:completion:)) NS_SWIFT_ASYNC_NAME(attachments(for:));
+
+/*!
+ @method getDataForAttachment:completion:
+ @abstract Retrieves the NSData for the given HKAttachment.
+ @discussion Prefer @c streamDataForAttachment:completion: for large files that support incremental reading to limit your app's peak memory usage.
+ The attachment's data may not always be available locally, and could be stored in iCloud.
+ @param attachment The attachment object to read data from.
+ @param completion Called with an NSData or an error.
+ @return An NSProgress object to use for tracking the progress of downloading the attachment's data from iCloud.
+ */
+- (NSProgress *)getDataForAttachment:(HKAttachment *)attachment
+ completion:(void(^)(NSData * _Nullable attachmentData, NSError * _Nullable error))completion NS_SWIFT_NAME(getData(for:completion:));
+
+/*!
+ @method streamDataForAttachment:dataHandler:
+ @abstract Streams the given HKAttachment's data as ordered NSData chunks.
+ @discussion The dataHandler's done parameter is set to YES when all chunks have been streamed.
+ The attachment's data may not always be available locally, and could be stored in iCloud.
+ @param attachment The attachment object to read data from.
+ @param dataHandler Called with an NSData chunk or an error. When done is YES, the operation has completed.
+ @return An NSProgress object to use for tracking the progress of downloading the attachment's data from iCloud.
+ */
+- (NSProgress *)streamDataForAttachment:(HKAttachment *)attachment
+ dataHandler:(void(^)(NSData * _Nullable dataChunk, NSError * _Nullable error, BOOL done))dataHandler;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAudiogramSample.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAudiogramSample.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAudiogramSample.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKAudiogramSample.h 2022-05-31 14:51:52.000000000 -0400
@@ -2,7 +2,7 @@
// HKAudiogramSample.h
// HealthKit
//
-// Copyright © 2017 Apple. All rights reserved.
+// Copyright © 2017-2022 Apple. All rights reserved.
//
#import <HealthKit/HKQuantity.h>
@@ -16,7 +16,7 @@
@class HKAudiogramSample
@abstract A sample object representing the results of a standard hearing test.
*/
-HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0))
+HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0))
@interface HKAudiogramSample : HKSample
/*!
@@ -41,7 +41,7 @@
@end
-HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0))
+HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0))
@interface HKAudiogramSensitivityPoint : NSObject
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCDADocumentSample.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCDADocumentSample.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCDADocumentSample.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCDADocumentSample.h 2022-05-31 15:02:15.000000000 -0400
@@ -2,7 +2,7 @@
// HKCDADocumentSample.h
// HealthKit
//
-// Copyright © 2015 Apple. All rights reserved.
+// Copyright © 2015-2022 Apple. All rights reserved.
//
// HealthKit support for storing and retrieving
// Consolidated Clinical Document records.
@@ -18,7 +18,7 @@
@class HKCDADocumentSample
@abstract A sample object representing a CDA document.
*/
-HK_EXTERN API_AVAILABLE(ios(10.0)) API_UNAVAILABLE(watchos)
+HK_EXTERN API_AVAILABLE(ios(10.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos)
@interface HKCDADocumentSample : HKDocumentSample
/*!
@@ -54,7 +54,7 @@
@end
-HK_EXTERN API_AVAILABLE(ios(11.0)) API_UNAVAILABLE(watchos)
+HK_EXTERN API_AVAILABLE(ios(11.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos)
@interface HKCDADocument : NSObject
/*!
@@ -62,57 +62,57 @@
@abstract The CDA document content in XML format as specified in the CDA standard. This may be nil if the
includeDocumentData option in HKDocumentQuery is specified as NO.
*/
-@property (readonly, copy, nullable) NSData *documentData API_AVAILABLE(ios(10.0));
+@property (readonly, copy, nullable) NSData *documentData API_AVAILABLE(ios(10.0), macCatalyst(13.0), macos(13.0));
/*!
@property title
@abstract The title of the document.
@discussion This property is extracted automatically from the document.
*/
-@property (readonly, copy) NSString *title API_AVAILABLE(ios(10.0));
+@property (readonly, copy) NSString *title API_AVAILABLE(ios(10.0), macCatalyst(13.0), macos(13.0));
/*!
@property patientName
@abstract The name of the patient receiving treatment.
@discussion This property is extracted automatically from the document.
*/
-@property (readonly, copy) NSString *patientName API_AVAILABLE(ios(10.0));
+@property (readonly, copy) NSString *patientName API_AVAILABLE(ios(10.0), macCatalyst(13.0), macos(13.0));
/*!
@property authorName
@abstract The person responsible for authoring the document. Usually, this is the treating physician.
@discussion This property is extracted automatically from the document.
*/
-@property (readonly, copy) NSString *authorName API_AVAILABLE(ios(10.0));
+@property (readonly, copy) NSString *authorName API_AVAILABLE(ios(10.0), macCatalyst(13.0), macos(13.0));
/*!
@property custodianName
@abstract The organization responsible for the document. This is usually the treating institution name.
@discussion This property is extracted automatically from the document.
*/
-@property (readonly, copy) NSString *custodianName API_AVAILABLE(ios(10.0));
+@property (readonly, copy) NSString *custodianName API_AVAILABLE(ios(10.0), macCatalyst(13.0), macos(13.0));
@end
/*!
@constant HKPredicateKeyPathCDATitle
*/
-HK_EXTERN NSString * const HKPredicateKeyPathCDATitle API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKPredicateKeyPathCDATitle API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKPredicateKeyPathCDAPatientName
*/
-HK_EXTERN NSString * const HKPredicateKeyPathCDAPatientName API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKPredicateKeyPathCDAPatientName API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKPredicateKeyPathCDAAuthorName
*/
-HK_EXTERN NSString * const HKPredicateKeyPathCDAAuthorName API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKPredicateKeyPathCDAAuthorName API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKPredicateKeyPathCDACustodianName
*/
-HK_EXTERN NSString * const HKPredicateKeyPathCDACustodianName API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKPredicateKeyPathCDACustodianName API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKDetailedCDAValidationErrorKey
@@ -120,6 +120,6 @@
CDADocumentSampleWithData:startDate:endDate:device:metadata:validationError: to obtain a detailed
description of the validation errors encountered when creating a CDA document.
*/
-HK_EXTERN NSString * const HKDetailedCDAValidationErrorKey API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKDetailedCDAValidationErrorKey API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCategorySample.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCategorySample.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCategorySample.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCategorySample.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,7 +2,7 @@
// HKCategorySample.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKObject.h>
@@ -17,7 +17,7 @@
@abstract An HKObject subclass representing an category measurement
@discussion Category samples are samples that can be categorized into an enum of concrete values
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKCategorySample : HKSample
@property (readonly, strong) HKCategoryType *categoryType;
@@ -76,13 +76,13 @@
startDate:(NSDate *)startDate
endDate:(NSDate *)endDate
device:(nullable HKDevice *)device
- metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(9.0), watchos(2.0));
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
@end
/*!
@constant HKPredicateKeyPathCategoryValue
*/
-HK_EXTERN NSString * const HKPredicateKeyPathCategoryValue API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKPredicateKeyPathCategoryValue API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCharacteristicObjects.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCharacteristicObjects.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCharacteristicObjects.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCharacteristicObjects.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,18 +2,20 @@
// HKCharacteristicObjects.h
// HealthKit
//
-// Copyright © 2016 Apple. All rights reserved.
+// Copyright © 2016-2022 Apple. All rights reserved.
//
#import <HealthKit/HKDefines.h>
#import <Foundation/Foundation.h>
+NS_ASSUME_NONNULL_BEGIN
+
/*!
@class HKBiologicalSexObject
@abstract A wrapper object for HKBiologicalSex enumeration.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKBiologicalSexObject : NSObject <NSCopying, NSSecureCoding>
@property (readonly) HKBiologicalSex biologicalSex;
@@ -24,7 +26,7 @@
@class HKBloodTypeObject
@abstract A wrapper object for HKBloodType enumeration.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKBloodTypeObject : NSObject <NSCopying, NSSecureCoding>
@property (readonly) HKBloodType bloodType;
@@ -35,7 +37,7 @@
@class HKFitzpatrickSkinTypeObject
@abstract A wrapper object for HKFitzpatrickSkinType enumeration.
*/
-HK_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKFitzpatrickSkinTypeObject : NSObject <NSCopying, NSSecureCoding>
@property (readonly) HKFitzpatrickSkinType skinType;
@@ -46,7 +48,7 @@
@class HKWheelchairUseObject
@abstract A wrapper object for HKWheelchairUse enumeration.
*/
-HK_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0))
+HK_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0))
@interface HKWheelchairUseObject : NSObject <NSCopying, NSSecureCoding>
@property (readonly) HKWheelchairUse wheelchairUse;
@@ -57,9 +59,11 @@
@class HKActivityMoveModeObject
@abstract A wrapper object for HKActivityMoveMode enumeration.
*/
-HK_EXTERN API_AVAILABLE(ios(14.0), watchos(7.0))
+HK_EXTERN API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0))
@interface HKActivityMoveModeObject : NSObject <NSCopying, NSSecureCoding>
@property (readonly) HKActivityMoveMode activityMoveMode;
@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKClinicalRecord.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKClinicalRecord.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKClinicalRecord.h 2022-02-23 07:59:09.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKClinicalRecord.h 2022-05-31 14:51:55.000000000 -0400
@@ -2,7 +2,7 @@
// HKClinicalRecord.h
// HealthKit
//
-// Copyright (c) 2018 Apple Inc. All rights reserved.
+// Copyright (c) 2018-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKSample.h>
@@ -12,8 +12,8 @@
NS_ASSUME_NONNULL_BEGIN
-HK_EXTERN NSString * const HKPredicateKeyPathClinicalRecordFHIRResourceIdentifier API_AVAILABLE(ios(12.0)) __WATCHOS_PROHIBITED;
-HK_EXTERN NSString * const HKPredicateKeyPathClinicalRecordFHIRResourceType API_AVAILABLE(ios(12.0)) __WATCHOS_PROHIBITED;
+HK_EXTERN NSString * const HKPredicateKeyPathClinicalRecordFHIRResourceIdentifier API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) __WATCHOS_PROHIBITED;
+HK_EXTERN NSString * const HKPredicateKeyPathClinicalRecordFHIRResourceType API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) __WATCHOS_PROHIBITED;
/*!
@class HKClinicalRecord
@@ -24,7 +24,7 @@
FHIRResource.identifier instead.
*/
HK_EXTERN
-API_AVAILABLE(ios(12.0))
+API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0))
__WATCHOS_PROHIBITED
@interface HKClinicalRecord : HKSample <NSSecureCoding, NSCopying>
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKClinicalType.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKClinicalType.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKClinicalType.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKClinicalType.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKClinicalType.h
// HealthKit
//
-// Copyright (c) 2018 Apple Inc. All rights reserved.
+// Copyright (c) 2018-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -12,27 +12,51 @@
@class HKClinicalType;
-typedef NSString *HKClinicalTypeIdentifier NS_TYPED_ENUM API_AVAILABLE(ios(12.0), watchos(5.0));
+typedef NSString *HKClinicalTypeIdentifier NS_TYPED_ENUM API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
-HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierAllergyRecord API_AVAILABLE(ios(12.0), watchos(5.0));
-HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierConditionRecord API_AVAILABLE(ios(12.0), watchos(5.0));
-HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierImmunizationRecord API_AVAILABLE(ios(12.0), watchos(5.0));
-HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierLabResultRecord API_AVAILABLE(ios(12.0), watchos(5.0));
-HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierMedicationRecord API_AVAILABLE(ios(12.0), watchos(5.0));
-HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierProcedureRecord API_AVAILABLE(ios(12.0), watchos(5.0));
-HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierVitalSignRecord API_AVAILABLE(ios(12.0), watchos(5.0));
-HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierCoverageRecord API_AVAILABLE(ios(14.0), watchos(7.0));
+/// A type identifier for records of allergies or intolerances.
+HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierAllergyRecord API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
+
+/// A type identifier for records of a condition, problem, or diagnosis.
+HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierConditionRecord API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
+
+/// A type identifier for records of vaccine administration.
+HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierImmunizationRecord API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
+
+/// A type identifier for records of lab results.
+HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierLabResultRecord API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
+
+/// A type identifier for records of medication prescription, intake, or administration.
+HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierMedicationRecord API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
+
+/// A type identifier for records of clinical procedures.
+HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierProcedureRecord API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
+
+/// A type identifier for records of vital signs.
+HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierVitalSignRecord API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
+
+/// A type identifier for records containing information about the user’s insurance coverage.
+HK_EXTERN HKClinicalTypeIdentifier const HKClinicalTypeIdentifierCoverageRecord API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
@interface HKObjectType (ClinicalType)
-#if __swift__
+
+/*!
+ @method clinicalTypeForIdentifier
+ @abstract Returns the clinical type given a valid clinical type identifier.
+ */
+#if defined(__swift__) && __swift__
+ (nullable HKClinicalType *)clinicalTypeForIdentifier:(HKClinicalTypeIdentifier)identifier API_DEPRECATED_WITH_REPLACEMENT("HKClinicalType(_:)", ios(12.0, API_TO_BE_DEPRECATED), watchos(5.0, API_TO_BE_DEPRECATED));
#else
-+ (nullable HKClinicalType *)clinicalTypeForIdentifier:(HKClinicalTypeIdentifier)identifier API_AVAILABLE(ios(12.0), watchos(5.0));
-#endif
++ (nullable HKClinicalType *)clinicalTypeForIdentifier:(HKClinicalTypeIdentifier)identifier API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
+#endif // defined(__swift__) && __swift__
@end
+/*!
+ @class HKClinicalType
+ @abstract A type that identifies samples that contain clinical record data.
+ */
HK_EXTERN
-API_AVAILABLE(ios(12.0), watchos(5.0))
+API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0))
@interface HKClinicalType : HKSampleType
@end
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKContactsLensSpecification.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKContactsLensSpecification.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKContactsLensSpecification.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKContactsLensSpecification.h 2022-05-31 14:51:53.000000000 -0400
@@ -0,0 +1,56 @@
+//
+// HKContactsLensSpecification.h
+// HealthKit
+//
+// Copyright © 2022 Apple. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HealthKit/HKLensSpecification.h>
+
+@class HKQuantity;
+@class HKVisionPrism;
+
+NS_ASSUME_NONNULL_BEGIN
+/*!
+ @class HKContactsLensSpecification
+ @abstract An object subclass representing lens specification for contacts
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKContactsLensSpecification : HKLensSpecification <NSSecureCoding, NSCopying>
+
+/*!
+ @property baseCurve
+ @abstract The curvature of the back surface of the lens (measured in mm)
+ */
+@property (nonatomic, copy, readonly, nullable) HKQuantity *baseCurve;
+
+/*!
+ @property diameter
+ @abstract The width of the lens from edge to edge (measured in mm)
+ */
+@property (nonatomic, copy, readonly, nullable) HKQuantity *diameter;
+
+/*!
+ @method initWithSphere:cylinder:axis:addPower:baseCurve:diameter
+
+ @param sphere The lens power to correct nearsightedness or farsightedness
+ @param cylinder The lens power required to correct astigmatism
+ @param axis The angle along which cylindrical power should be positioned to correct astigmatism
+ @param addPower The power adjustment applied to a multifocal lens to correct presbyopia
+ @param baseCurve The curvature of the back surface of the lens
+ @param diameter The width of the lens from edge to edge
+ */
+- (instancetype)initWithSphere:(HKQuantity *)sphere
+ cylinder:(nullable HKQuantity *)cylinder
+ axis:(nullable HKQuantity *)axis
+ addPower:(nullable HKQuantity *)addPower
+ baseCurve:(nullable HKQuantity *)baseCurve
+ diameter:(nullable HKQuantity *)diameter;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKContactsPrescription.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKContactsPrescription.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKContactsPrescription.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKContactsPrescription.h 2022-05-31 14:51:55.000000000 -0400
@@ -0,0 +1,66 @@
+//
+// HKContactsPrescription.h
+// HealthKit
+//
+// Copyright © 2022 Apple. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HealthKit/HKDefines.h>
+#import <HealthKit/HKVisionPrescription.h>
+
+@class HKContactsLensSpecification;
+@class HKDevice;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ @class HKContactsPrescription
+ @abstract An object representing a contacts prescription
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKContactsPrescription: HKVisionPrescription
+
+/*!
+ @property rightEye
+ @abstract The right eye lens specification
+ */
+@property (nonatomic, copy, readonly, nullable) HKContactsLensSpecification *rightEye;
+
+/*!
+ @property leftEye
+ @abstract The left eye lens specification
+ */
+@property (nonatomic, copy, readonly, nullable) HKContactsLensSpecification *leftEye;
+
+/*!
+ @property brand
+ @abstract The prescribed brand after contact lens fitting
+ */
+@property (nonatomic, copy, readonly) NSString *brand;
+
+/*!
+ @method prescriptionWithRightEyeSpecification:leftEyeSpecification:brand:dateIssued:expirationDate:device:metadata
+
+ @param rightEyeSpecification The right eye specification
+ @param leftEyeSpecification The left eye specification
+ @param brand The prescribed brand after contact lens fitting
+ @param dateIssued The date the prescription was issued
+ @param expirationDate The date the prescription expires
+ @param device The device that generated the sample
+ @param metadata The metadata for the sample
+ */
++ (instancetype)prescriptionWithRightEyeSpecification:(nullable HKContactsLensSpecification *)rightEyeSpecification
+ leftEyeSpecification:(nullable HKContactsLensSpecification *)leftEyeSpecification
+ brand:(NSString *)brand
+ dateIssued:(NSDate *)dateIssued
+ expirationDate:(nullable NSDate *)expirationDate
+ device:(nullable HKDevice *)device
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCorrelation.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCorrelation.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCorrelation.h 2022-02-23 07:59:07.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCorrelation.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,7 +2,7 @@
// HKCorrelation.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKSample.h>
@@ -21,7 +21,7 @@
For example, systolic and diastolic blood pressure readings are typically presented together so these
readings should be saved with a correlation of type blood pressure.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKCorrelation : HKSample
@property (readonly) HKCorrelationType *correlationType;
@@ -68,7 +68,7 @@
endDate:(NSDate *)endDate
objects:(NSSet<HKSample *> *)objects
device:(nullable HKDevice *)device
- metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(9.0), watchos(2.0));
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@method objectsForType:
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCorrelationQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCorrelationQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCorrelationQuery.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCorrelationQuery.h 2022-05-31 14:51:52.000000000 -0400
@@ -2,7 +2,7 @@
// HKCorrelationQuery.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -19,7 +19,7 @@
accepts a predicate to filter HKCorrelations and a dictionary of predicates to filter the
correlated samples.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKCorrelationQuery : HKQuery
@property (readonly, copy) HKCorrelationType *correlationType;
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCumulativeQuantitySample.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCumulativeQuantitySample.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCumulativeQuantitySample.h 2022-02-23 07:59:07.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCumulativeQuantitySample.h 2022-05-31 14:51:54.000000000 -0400
@@ -15,7 +15,7 @@
@class HKCumulativeQuantitySample
@abstract An HKQuantitySample subclass representing a quantity measurement with cumulative aggregation style.
*/
-HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0))
+HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0))
@interface HKCumulativeQuantitySample : HKQuantitySample
/*!
@@ -27,6 +27,6 @@
@end
// Predicate Key Paths
-HK_EXTERN NSString * const HKPredicateKeyPathSum API_AVAILABLE(ios(12.0), watchos(5.0));
+HK_EXTERN NSString * const HKPredicateKeyPathSum API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCumulativeQuantitySeriesSample.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCumulativeQuantitySeriesSample.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCumulativeQuantitySeriesSample.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKCumulativeQuantitySeriesSample.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKCumulativeQuantitySeriesSample.h
// HealthKit
//
-// Copyright © 2018 Apple. All rights reserved.
+// Copyright © 2018-2022 Apple. All rights reserved.
//
#import <HealthKit/HKCumulativeQuantitySample.h>
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDefines.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDefines.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDefines.h 2022-02-23 07:13:48.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDefines.h 2022-05-31 15:04:04.000000000 -0400
@@ -2,7 +2,7 @@
// HKDefines.h
// HealthKit
//
-// Copyright (c) 2013-2014 Apple Inc. All rights reserved.
+// Copyright (c) 2013-2022 Apple Inc. All rights reserved.
//
#import <Foundation/Foundation.h>
@@ -15,7 +15,7 @@
#define HK_EXTERN extern "C" __attribute__((visibility("default")))
#endif
-HK_EXTERN NSString * const HKErrorDomain API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKErrorDomain API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKErrorCode
@@ -45,11 +45,11 @@
HKErrorAuthorizationNotDetermined,
HKErrorDatabaseInaccessible,
HKErrorUserCanceled,
- HKErrorAnotherWorkoutSessionStarted API_AVAILABLE(ios(9.0), watchos(2.0)),
- HKErrorUserExitedWorkoutSession API_AVAILABLE(ios(9.0), watchos(2.0)),
- HKErrorRequiredAuthorizationDenied API_AVAILABLE(ios(12.0), watchos(5.0)),
- HKErrorNoData API_AVAILABLE(ios(14.0), watchos(7.0)),
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+ HKErrorAnotherWorkoutSessionStarted API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)),
+ HKErrorUserExitedWorkoutSession API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)),
+ HKErrorRequiredAuthorizationDenied API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0)),
+ HKErrorNoData API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)),
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKUpdateFrequency
@@ -59,7 +59,7 @@
HKUpdateFrequencyHourly,
HKUpdateFrequencyDaily,
HKUpdateFrequencyWeekly,
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKAuthorizationStatus
@@ -75,7 +75,7 @@
HKAuthorizationStatusNotDetermined = 0,
HKAuthorizationStatusSharingDenied,
HKAuthorizationStatusSharingAuthorized,
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKAuthorizationRequestStatus
@@ -90,7 +90,7 @@
HKAuthorizationRequestStatusUnknown = 0,
HKAuthorizationRequestStatusShouldRequest,
HKAuthorizationRequestStatusUnnecessary,
-} API_AVAILABLE(ios(12.0), watchos(5.0));
+} API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKBiologicalSex
@@ -100,8 +100,8 @@
HKBiologicalSexNotSet = 0,
HKBiologicalSexFemale,
HKBiologicalSexMale,
- HKBiologicalSexOther API_AVAILABLE(ios(8.2), watchos(2.0)),
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+ HKBiologicalSexOther API_AVAILABLE(ios(8.2), watchos(2.0), macCatalyst(13.0), macos(13.0)),
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKBloodType
@@ -117,7 +117,7 @@
HKBloodTypeABNegative,
HKBloodTypeOPositive,
HKBloodTypeONegative,
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKCategoryValueSleepAnalysis
@@ -128,12 +128,26 @@
2) The percentage of time in bed that the user actually spent sleeping,
3) The number of times the user woke while in bed
4) The total amount of time spent both in bed and asleep.
+
+ @constant HKCategoryValueSleepAnalysisInBed The user is in bed.
+ @constant HKCategoryValueSleepAnalysisAwake The user is awake.
+ @constant HKCategoryValueSleepAnalysisAsleepUnspecified The user is asleep and no specific stage is specified.
+ @constant HKCategoryValueSleepAnalysisAsleepCore Corresponds to Stages 1 and 2 of AASM scoring model.
+ @constant HKCategoryValueSleepAnalysisAsleepDeep Corresponds to Stage 3 of AASM scoring model.
+ @constant HKCategoryValueSleepAnalysisAsleepREM Corresponds to REM stage of AASM scoring model.
*/
typedef NS_ENUM(NSInteger, HKCategoryValueSleepAnalysis) {
- HKCategoryValueSleepAnalysisInBed,
- HKCategoryValueSleepAnalysisAsleep,
- HKCategoryValueSleepAnalysisAwake API_AVAILABLE(ios(10.0), watchos(3.0)),
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+ HKCategoryValueSleepAnalysisInBed = 0,
+ HKCategoryValueSleepAnalysisAsleepUnspecified API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) = 1,
+ HKCategoryValueSleepAnalysisAsleep API_DEPRECATED_WITH_REPLACEMENT("HKCategoryValueSleepAnalysisAsleepUnspecified", ios(8.0, 16.0), watchos(2.0, 9.0)) = HKCategoryValueSleepAnalysisAsleepUnspecified,
+ HKCategoryValueSleepAnalysisAwake API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)) = 2,
+ HKCategoryValueSleepAnalysisAsleepCore API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) = 3,
+ HKCategoryValueSleepAnalysisAsleepDeep API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) = 4,
+ HKCategoryValueSleepAnalysisAsleepREM API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) = 5,
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+
+/// Returns the set of `HKCategoryValueSleepAnalysis` values that are considered to be asleep.
+HK_EXTERN NSSet<NSNumber *> * HKCategoryValueSleepAnalysisAsleepValues(void) API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_REFINED_FOR_SWIFT;
/*!
@@ -148,7 +162,7 @@
typedef NS_ENUM(NSInteger, HKCategoryValueAppleStandHour) {
HKCategoryValueAppleStandHourStood = 0,
HKCategoryValueAppleStandHourIdle,
-} API_AVAILABLE(ios(9.0), watchos(2.0));
+} API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKFitzpatrickSkinType
@@ -171,7 +185,7 @@
HKFitzpatrickSkinTypeIV,
HKFitzpatrickSkinTypeV,
HKFitzpatrickSkinTypeVI,
-} API_AVAILABLE(ios(9.0), watchos(2.0));
+} API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKWheelchairUse
@@ -184,7 +198,7 @@
HKWheelchairUseNotSet = 0,
HKWheelchairUseNo,
HKWheelchairUseYes,
-} API_AVAILABLE(ios(10.0), watchos(3.0));
+} API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKCategoryValueCervicalMucusQuality
@@ -197,7 +211,7 @@
HKCategoryValueCervicalMucusQualityCreamy,
HKCategoryValueCervicalMucusQualityWatery,
HKCategoryValueCervicalMucusQualityEggWhite,
-} API_AVAILABLE(ios(9.0), watchos(2.0));
+} API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKCategoryValueOvulationTestResult
@@ -211,7 +225,7 @@
HKCategoryValueOvulationTestResultPositive API_DEPRECATED_WITH_REPLACEMENT("HKCategoryValueOvulationTestResultLuteinizingHormoneSurge", ios(9.0, 13.0), watchos(2.0, 6.0)) = HKCategoryValueOvulationTestResultLuteinizingHormoneSurge,
HKCategoryValueOvulationTestResultIndeterminate = 3,
HKCategoryValueOvulationTestResultEstrogenSurge API_AVAILABLE(ios(13.0), watchos(6.0)) = 4,
-} API_AVAILABLE(ios(9.0), watchos(2.0));
+} API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKCategoryValuePregnancyTestResult
@@ -223,7 +237,7 @@
HKCategoryValuePregnancyTestResultNegative = 1,
HKCategoryValuePregnancyTestResultPositive,
HKCategoryValuePregnancyTestResultIndeterminate,
-} API_AVAILABLE(ios(15.0), watchos(8.0));
+} API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
/*!
@enum HKCategoryValueProgesteroneTestResult
@@ -235,7 +249,7 @@
HKCategoryValueProgesteroneTestResultNegative = 1,
HKCategoryValueProgesteroneTestResultPositive,
HKCategoryValueProgesteroneTestResultIndeterminate,
-} API_AVAILABLE(ios(15.0), watchos(8.0));
+} API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
/*!
@enum HKCategoryValueMenstrualFlow
@@ -246,8 +260,8 @@
HKCategoryValueMenstrualFlowLight,
HKCategoryValueMenstrualFlowMedium,
HKCategoryValueMenstrualFlowHeavy,
- HKCategoryValueMenstrualFlowNone API_AVAILABLE(ios(12.0), watchos(5.0)),
-} API_AVAILABLE(ios(9.0), watchos(2.0));
+ HKCategoryValueMenstrualFlowNone API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0)),
+} API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKCategoryValue
@@ -255,7 +269,7 @@
*/
typedef NS_ENUM(NSInteger, HKCategoryValue) {
HKCategoryValueNotApplicable = 0,
-} API_AVAILABLE(ios(9.0), watchos(2.0));
+} API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKCategoryValueAudioExposureEvent
@@ -274,7 +288,7 @@
*/
typedef NS_ENUM(NSInteger, HKCategoryValueEnvironmentalAudioExposureEvent) {
HKCategoryValueEnvironmentalAudioExposureEventMomentaryLimit = 1,
-} API_AVAILABLE(ios(14.0), watchos(7.0));
+} API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/*!
@enum HKCategoryValueContraceptive
@@ -288,7 +302,7 @@
HKCategoryValueContraceptiveIntravaginalRing,
HKCategoryValueContraceptiveOral,
HKCategoryValueContraceptivePatch,
-} API_AVAILABLE(ios(14.3), watchos(7.2));
+} API_AVAILABLE(ios(14.3), watchos(7.2), macCatalyst(14.3), macos(13.0));
/*!
@enum HKCategoryValueSeverity
@@ -300,7 +314,7 @@
HKCategoryValueSeverityMild,
HKCategoryValueSeverityModerate,
HKCategoryValueSeveritySevere,
-} API_AVAILABLE(ios(13.6), watchos(7.0));
+} API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0));
/*!
@enum HKCategoryValueAppetiteChanges
@@ -311,7 +325,7 @@
HKCategoryValueAppetiteChangesNoChange,
HKCategoryValueAppetiteChangesDecreased,
HKCategoryValueAppetiteChangesIncreased,
-} API_AVAILABLE(ios(13.6), watchos(7.0));
+} API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0));
/*!
@enum HKCategoryValuePresence
@@ -320,7 +334,7 @@
typedef NS_ENUM(NSInteger, HKCategoryValuePresence) {
HKCategoryValuePresencePresent = 0,
HKCategoryValuePresenceNotPresent,
-} API_AVAILABLE(ios(13.6), watchos(7.0));
+} API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0));
/*!
@enum HKCategoryValueHeadphoneAudioExposureEvent
@@ -329,7 +343,7 @@
*/
typedef NS_ENUM(NSInteger, HKCategoryValueHeadphoneAudioExposureEvent) {
HKCategoryValueHeadphoneAudioExposureEventSevenDayLimit = 1
-} API_AVAILABLE(ios(14.2), watchos(7.1));
+} API_AVAILABLE(ios(14.2), watchos(7.1), macCatalyst(14.2), macos(13.0));
/*!
@enum HKCategoryValueLowCardioFitnessEvent
@@ -339,7 +353,7 @@
*/
typedef NS_ENUM(NSInteger, HKCategoryValueLowCardioFitnessEvent) {
HKCategoryValueLowCardioFitnessEventLowFitness = 1,
-} API_AVAILABLE(ios(14.3), watchos(7.2));
+} API_AVAILABLE(ios(14.3), watchos(7.2), macCatalyst(14.3), macos(13.0));
/*!
@enum HKActivityMoveMode
@@ -350,7 +364,7 @@
typedef NS_ENUM(NSInteger, HKActivityMoveMode) {
HKActivityMoveModeActiveEnergy = 1,
HKActivityMoveModeAppleMoveTime = 2,
-} API_AVAILABLE(ios(14.0), watchos(7.0));
+} API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/*!
@enum HKCategoryValueAppleWalkingSteadinessEvent
@@ -365,6 +379,6 @@
HKCategoryValueAppleWalkingSteadinessEventInitialVeryLow = 2,
HKCategoryValueAppleWalkingSteadinessEventRepeatLow = 3,
HKCategoryValueAppleWalkingSteadinessEventRepeatVeryLow = 4,
-} API_AVAILABLE(ios(15.0), watchos(8.0));
+} API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDeletedObject.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDeletedObject.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDeletedObject.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDeletedObject.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKDeletedObject.h
// HealthKit
//
-// Copyright (c) 2015 Apple. All rights reserved.
+// Copyright (c) 2015-2022 Apple. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -13,7 +13,7 @@
@class HKDeletedObject
@abstract A class representing an HKObject that was deleted from the HealtKit database.
*/
-HK_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKDeletedObject : NSObject <NSSecureCoding>
/*!
@@ -28,7 +28,7 @@
@discussion Metadata retained from the deleted HKObject.
Available keys: HKMetadataKeySyncIdentifier, HKMetadataKeySyncVersion
*/
-@property (readonly, copy, nullable) NSDictionary<NSString *, id> *metadata API_AVAILABLE(ios(11.0), watchos(4.0));
+@property (readonly, copy, nullable) NSDictionary<NSString *, id> *metadata API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
- (instancetype)init NS_UNAVAILABLE;
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDevice.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDevice.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDevice.h 2022-02-23 07:15:53.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDevice.h 2022-05-31 15:02:41.000000000 -0400
@@ -2,7 +2,7 @@
// HKDevice.h
// HealthKit
//
-// Copyright © 2015 Apple. All rights reserved.
+// Copyright © 2015-2022 Apple. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -14,60 +14,60 @@
@abstract Used with predicateForObjectsWithDeviceProperty to specify a device name.
@discussion The expected value type is an NSString.
*/
-HK_EXTERN NSString * const HKDevicePropertyKeyName API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKDevicePropertyKeyName API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKDevicePropertyKeyManufacturer
@abstract Used with predicateForObjectsWithDeviceProperty to specify a device manufacturer.
@discussion The expected value type is an NSString.
*/
-HK_EXTERN NSString * const HKDevicePropertyKeyManufacturer API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKDevicePropertyKeyManufacturer API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKDevicePropertyKeyModel
@abstract Used with predicateForObjectsWithDeviceProperty to specify a device model.
@discussion The expected value type is an NSString.
*/
-HK_EXTERN NSString * const HKDevicePropertyKeyModel API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKDevicePropertyKeyModel API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKDevicePropertyKeyHardwareVersion
@abstract Used with predicateForObjectsWithDeviceProperty to specify a hardware version.
@discussion The expected value type is an NSString.
*/
-HK_EXTERN NSString * const HKDevicePropertyKeyHardwareVersion API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKDevicePropertyKeyHardwareVersion API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKDevicePropertyKeyFirmwareVersion
@abstract Used with predicateForObjectsWithDeviceProperty to specify a firmware version.
@discussion The expected value type is an NSString.
*/
-HK_EXTERN NSString * const HKDevicePropertyKeyFirmwareVersion API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKDevicePropertyKeyFirmwareVersion API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKDevicePropertyKeySoftwareVersion
@abstract Used with predicateForObjectsWithDeviceProperty to specify a software version.
@discussion The expected value type is an NSString.
*/
-HK_EXTERN NSString * const HKDevicePropertyKeySoftwareVersion API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKDevicePropertyKeySoftwareVersion API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKDevicePropertyKeyLocalIdentifier
@abstract Used with predicateForObjectsWithDeviceProperty to specify a local identifier.
@discussion The expected value type is an NSString.
*/
-HK_EXTERN NSString * const HKDevicePropertyKeyLocalIdentifier API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKDevicePropertyKeyLocalIdentifier API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKDevicePropertyKeyUDIDeviceIdentifier
@abstract Used with predicateForObjectsWithDeviceProperty to specify a UDI device identifier.
@discussion The expected value type is an NSString.
*/
-HK_EXTERN NSString * const HKDevicePropertyKeyUDIDeviceIdentifier API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKDevicePropertyKeyUDIDeviceIdentifier API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
-HK_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKDevice : NSObject <NSSecureCoding, NSCopying>
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDiscreteQuantitySample.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDiscreteQuantitySample.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDiscreteQuantitySample.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDiscreteQuantitySample.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,7 +2,7 @@
// HKDiscreteQuantitySample.h
// HealthKit
//
-// Copyright © 2019 Apple. All rights reserved.
+// Copyright © 2019-2022 Apple. All rights reserved.
//
#import <HealthKit/HKQuantitySample.h>
@@ -16,7 +16,7 @@
@abstract An HKQuantitySample subclass representing a quantity measurement with
discrete aggregation style.
*/
-HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0))
+HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0))
@interface HKDiscreteQuantitySample : HKQuantitySample
/*!
@@ -52,12 +52,12 @@
@end
// Predicate Key Paths
-HK_EXTERN NSString * const HKPredicateKeyPathMin API_AVAILABLE(ios(13.0), watchos(6.0));
-HK_EXTERN NSString * const HKPredicateKeyPathAverage API_AVAILABLE(ios(13.0), watchos(6.0));
-HK_EXTERN NSString * const HKPredicateKeyPathMax API_AVAILABLE(ios(13.0), watchos(6.0));
-HK_EXTERN NSString * const HKPredicateKeyPathMostRecent API_AVAILABLE(ios(13.0), watchos(6.0));
-HK_EXTERN NSString * const HKPredicateKeyPathMostRecentStartDate API_AVAILABLE(ios(13.0), watchos(6.0));
-HK_EXTERN NSString * const HKPredicateKeyPathMostRecentEndDate API_AVAILABLE(ios(13.0), watchos(6.0));
-HK_EXTERN NSString * const HKPredicateKeyPathMostRecentDuration API_AVAILABLE(ios(13.0), watchos(6.0));
+HK_EXTERN NSString * const HKPredicateKeyPathMin API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathAverage API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathMax API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathMostRecent API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathMostRecentStartDate API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathMostRecentEndDate API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathMostRecentDuration API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDocumentQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDocumentQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDocumentQuery.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDocumentQuery.h 2022-05-31 14:51:52.000000000 -0400
@@ -2,7 +2,7 @@
// HKDocumentQuery.h
// HealthKit
//
-// Copyright (c) 2016 Apple Inc. All rights reserved.
+// Copyright (c) 2016-2022 Apple Inc. All rights reserved.
//
#include <HealthKit/HKQuery.h>
@@ -17,7 +17,7 @@
@abstract A concrete subclass of HKQuery that provides an interface to retrieve documents from the Health store.
*/
-HK_EXTERN API_AVAILABLE(ios(10.0))
+HK_EXTERN API_AVAILABLE(ios(10.0), macCatalyst(13.0), macos(13.0))
@interface HKDocumentQuery : HKQuery
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDocumentSample.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDocumentSample.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDocumentSample.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKDocumentSample.h 2022-05-31 14:51:52.000000000 -0400
@@ -2,7 +2,7 @@
// HKDocumentSample.h
// HealthKit
//
-// Copyright © 2016 Apple. All rights reserved.
+// Copyright © 2016-2022 Apple. All rights reserved.
//
#import <HealthKit/HKSample.h>
@@ -15,7 +15,7 @@
@class HKDocumentSample
@abstract An abstract class representing a health document.
*/
-HK_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0))
+HK_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0))
@interface HKDocumentSample : HKSample
@property (readonly, strong) HKDocumentType *documentType;
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKElectrocardiogram.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKElectrocardiogram.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKElectrocardiogram.h 2022-02-23 07:15:56.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKElectrocardiogram.h 2022-05-31 14:51:55.000000000 -0400
@@ -2,7 +2,7 @@
// HKElectrocardiogram.h
// HealthKit
//
-// Copyright © 2020 Apple. All rights reserved.
+// Copyright © 2020-2022 Apple. All rights reserved.
//
#import <HealthKit/HKSample.h>
@@ -19,7 +19,7 @@
*/
typedef NS_ENUM(NSInteger, HKElectrocardiogramLead) {
HKElectrocardiogramLeadAppleWatchSimilarToLeadI = 1
-} API_AVAILABLE(ios(14.0), watchos(7.0)) NS_SWIFT_NAME(HKElectrocardiogram.Lead);
+} API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)) NS_SWIFT_NAME(HKElectrocardiogram.Lead);
/*!
@enum HKElectrocardiogramClassification
@@ -44,7 +44,7 @@
HKElectrocardiogramClassificationInconclusiveOther,
HKElectrocardiogramClassificationUnrecognized = 100,
-} API_AVAILABLE(ios(14.0), watchos(7.0)) NS_SWIFT_NAME(HKElectrocardiogram.Classification);
+} API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)) NS_SWIFT_NAME(HKElectrocardiogram.Classification);
/*!
@enum HKElectrocardiogramSymptomsStatus
@@ -59,14 +59,14 @@
HKElectrocardiogramSymptomsStatusNotSet = 0,
HKElectrocardiogramSymptomsStatusNone = 1,
HKElectrocardiogramSymptomsStatusPresent = 2,
-} API_AVAILABLE(ios(14.0), watchos(7.0)) NS_SWIFT_NAME(HKElectrocardiogram.SymptomsStatus);
+} API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)) NS_SWIFT_NAME(HKElectrocardiogram.SymptomsStatus);
/*!
@class HKElectrocardiogram
@abstract An HKElectrocardiogram is a collection of voltage values as waveforms
from one or more leads
*/
-HK_EXTERN API_AVAILABLE(ios(14.0), watchos(7.0))
+HK_EXTERN API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0))
@interface HKElectrocardiogram : HKSample
/*!
@@ -98,8 +98,8 @@
// Predicate Key Paths
-HK_EXTERN NSString * const HKPredicateKeyPathAverageHeartRate API_AVAILABLE(ios(14.0), watchos(7.0));
-HK_EXTERN NSString * const HKPredicateKeyPathECGClassification API_AVAILABLE(ios(14.0), watchos(7.0));
-HK_EXTERN NSString * const HKPredicateKeyPathECGSymptomsStatus API_AVAILABLE(ios(14.0), watchos(7.0));
+HK_EXTERN NSString * const HKPredicateKeyPathAverageHeartRate API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathECGClassification API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathECGSymptomsStatus API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKElectrocardiogramQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKElectrocardiogramQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKElectrocardiogramQuery.h 2022-02-23 07:59:09.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKElectrocardiogramQuery.h 2022-05-31 14:51:55.000000000 -0400
@@ -2,7 +2,7 @@
// HKElectrocardiogramQuery.h
// HealthKit
//
-// Copyright © 2020 Apple. All rights reserved.
+// Copyright © 2020-2022 Apple. All rights reserved.
//
#import <HealthKit/HKElectrocardiogram.h>
@@ -15,8 +15,8 @@
@abstract An HKElectrocardiogramVoltageMeasurement contains voltage quantities for all leads at a single instance of measurement.
@discussion Each HKElectrocardiogramVoltageMeasurement object corresponds to the voltage quantities across all leads for a given instance in time.
*/
-HK_EXTERN API_AVAILABLE(ios(14.0), watchos(7.0)) NS_SWIFT_NAME(HKElectrocardiogram.VoltageMeasurement)
-@interface HKElectrocardiogramVoltageMeasurement : NSObject
+HK_EXTERN API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)) NS_SWIFT_NAME(HKElectrocardiogram.VoltageMeasurement)
+@interface HKElectrocardiogramVoltageMeasurement : NSObject <NSCopying>
/*!
The time interval between this voltage measurement and the start of the sample.
@@ -42,7 +42,7 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKElectrocardiogramQueryDescriptor", ios(14.0, API_TO_BE_DEPRECATED), watchos(7.0, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(14.0), watchos(7.0))
+API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0))
#endif
@interface HKElectrocardiogramQuery : HKQuery
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRRelease.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRRelease.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRRelease.h 2022-02-23 07:59:07.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRRelease.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,7 +2,7 @@
// HKFHIRRelease.h
// HealthKit
//
-// Copyright © 2019 Apple. All rights reserved.
+// Copyright © 2019-2022 Apple. All rights reserved.
//
#import <Foundation/Foundation.h>
@@ -20,16 +20,16 @@
/*!
@abstract The "DSTU2" release: http://hl7.org/fhir/DSTU2/
*/
-HK_EXTERN HKFHIRRelease const HKFHIRReleaseDSTU2 NS_SWIFT_NAME(dstu2) API_AVAILABLE(ios(14.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRRelease const HKFHIRReleaseDSTU2 NS_SWIFT_NAME(dstu2) API_AVAILABLE(ios(14.0), macCatalyst(14.0), macos(13.0)) API_UNAVAILABLE(watchos);
/*!
@abstract The "R4" release: http://hl7.org/fhir/R4/
*/
-HK_EXTERN HKFHIRRelease const HKFHIRReleaseR4 NS_SWIFT_NAME(r4) API_AVAILABLE(ios(14.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRRelease const HKFHIRReleaseR4 NS_SWIFT_NAME(r4) API_AVAILABLE(ios(14.0), macCatalyst(14.0), macos(13.0)) API_UNAVAILABLE(watchos);
/*!
@abstract An unknown release
*/
-HK_EXTERN HKFHIRRelease const HKFHIRReleaseUnknown API_AVAILABLE(ios(14.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRRelease const HKFHIRReleaseUnknown API_AVAILABLE(ios(14.0), macCatalyst(14.0), macos(13.0)) API_UNAVAILABLE(watchos);
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRResource.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRResource.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRResource.h 2022-02-23 07:59:07.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRResource.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,7 +2,7 @@
// HKFHIRResource.h
// HealthKit
//
-// Copyright © 2018 Apple. All rights reserved.
+// Copyright © 2018-2022 Apple. All rights reserved.
//
#import <Foundation/Foundation.h>
@@ -12,31 +12,31 @@
NS_ASSUME_NONNULL_BEGIN
-typedef NSString * HKFHIRResourceType NS_TYPED_ENUM API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
+typedef NSString * HKFHIRResourceType NS_TYPED_ENUM API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
-HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeAllergyIntolerance API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
-HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeCondition API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
-HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeCoverage API_AVAILABLE(ios(14.0)) API_UNAVAILABLE(watchos);
-HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeImmunization API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
-HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeMedicationDispense API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
-HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeMedicationOrder API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
-HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeMedicationRequest API_AVAILABLE(ios(14.0)) API_UNAVAILABLE(watchos);
-HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeMedicationStatement API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
-HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeObservation API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
-HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeProcedure API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeAllergyIntolerance API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeCondition API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeCoverage API_AVAILABLE(ios(14.0), macCatalyst(14.0), macos(13.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeImmunization API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeMedicationDispense API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeMedicationOrder API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeMedicationRequest API_AVAILABLE(ios(14.0), macCatalyst(14.0), macos(13.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeMedicationStatement API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeObservation API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
+HK_EXTERN HKFHIRResourceType const HKFHIRResourceTypeProcedure API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
/*!
@class HKFHIRResource
@abstract The HKFHIRResource class encapsulates a FHIR (Fast Healthcare Interoperability Resources) resource.
*/
-HK_EXTERN API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos)
+HK_EXTERN API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos)
@interface HKFHIRResource : NSObject <NSSecureCoding, NSCopying>
/*!
@property FHIRVersion
@abstract The FHIR version of the resource data.
*/
-@property (readonly, copy) HKFHIRVersion *FHIRVersion API_AVAILABLE(ios(14.0)) API_UNAVAILABLE(watchos);
+@property (readonly, copy) HKFHIRVersion *FHIRVersion API_AVAILABLE(ios(14.0), macCatalyst(14.0), macos(13.0)) API_UNAVAILABLE(watchos);
/*!
@property resourceType
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRVersion.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRVersion.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRVersion.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKFHIRVersion.h 2022-05-31 14:51:55.000000000 -0400
@@ -2,7 +2,7 @@
// HKFHIRVersion.h
// HealthKit
//
-// Copyright © 2019 Apple. All rights reserved.
+// Copyright © 2019-2022 Apple. All rights reserved.
//
#import <Foundation/Foundation.h>
@@ -19,7 +19,7 @@
given resource is represented in. A FHIR version is associated with one FHIR release.
@see http://hl7.org/fhir/versions.html#versions
*/
-HK_EXTERN API_AVAILABLE(ios(14.0)) API_UNAVAILABLE(watchos)
+HK_EXTERN API_AVAILABLE(ios(14.0), macCatalyst(14.0), macos(13.0)) API_UNAVAILABLE(watchos)
@interface HKFHIRVersion : NSObject <NSCopying, NSSecureCoding>
@property (nonatomic, assign, readonly) NSInteger majorVersion;
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKGlassesLensSpecification.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKGlassesLensSpecification.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKGlassesLensSpecification.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKGlassesLensSpecification.h 2022-05-31 14:51:52.000000000 -0400
@@ -0,0 +1,78 @@
+//
+// HKGlassesLensSpecification.h
+// HealthKit
+//
+// Copyright © 2022 Apple. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HealthKit/HKLensSpecification.h>
+
+@class HKQuantity;
+@class HKVisionPrism;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ @class HKGlassesLensSpecification
+ @abstract An object subclass representing lens specification for glasses
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKGlassesLensSpecification : HKLensSpecification <NSSecureCoding, NSCopying>
+
+/*!
+ @property vertexDistance
+ @abstract The distance between the back of the eyeglass lens and the eye (measured in mm)
+ */
+@property (nonatomic, copy, readonly, nullable) HKQuantity *vertexDistance;
+
+/*!
+ @property prism
+ @abstract The object encapsulating the prism fields
+ */
+@property (nonatomic, copy, readonly, nullable) HKVisionPrism *prism;
+
+/*!
+ @property farPupillaryDistance
+ @abstract The distance from each pupil to the center of the nose (measured in mm) when looking at a far target.
+ Can be described as combined or individual value. For distance prescriptions, the pupillary distance will be a far value.
+ */
+@property (nonatomic, copy, readonly, nullable) HKQuantity *farPupillaryDistance;
+
+/*!
+ @property nearPupillaryDistance
+ @abstract The distance from each pupil to the center of the nose (measured in mm) when looking at a near target.
+ Can be described as combined or individual value. For near prescriptions, the pupillary distance will be a near value.
+ */
+@property (nonatomic, copy, readonly, nullable) HKQuantity *nearPupillaryDistance;
+
+
+/*!
+ @method initWithSphere:cylinder:axis:addPower:vertexDistance:prism:farPupillaryDistance:nearPupillaryDistance
+
+ @param sphere The lens power to correct nearsightedness or farsightedness
+ @param cylinder The lens power required to correct astigmatism
+ @param axis The angle along which cylindrical power should be positioned to correct astigmatism
+ @param addPower The power adjustment applied to a multifocal lens to correct presbyopia
+ @param vertexDistance The distance between the back of the eyeglass lens and the eye
+ @param prism The object encapsulating the prism fields
+ @param farPupillaryDistance The distance from each pupil to the center of the nose (measured in mm) when looking at a far target.
+ Can be described as combined or individual value. For distance prescriptions, the pupillary distance will be a far value.
+ @param nearPupillaryDistance The distance from each pupil to the center of the nose (measured in mm) when looking at a near target.
+ Can be described as combined or individual value. For near prescriptions, the pupillary distance will be a near value.
+ */
+- (instancetype)initWithSphere:(HKQuantity *)sphere
+ cylinder:(nullable HKQuantity *)cylinder
+ axis:(nullable HKQuantity *)axis
+ addPower:(nullable HKQuantity *)addPower
+ vertexDistance:(nullable HKQuantity *)vertexDistance
+ prism:(nullable HKVisionPrism *)prism
+ farPupillaryDistance:(nullable HKQuantity *)farPupillaryDistance
+ nearPupillaryDistance:(nullable HKQuantity *)nearPupillaryDistance;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKGlassesPrescription.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKGlassesPrescription.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKGlassesPrescription.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKGlassesPrescription.h 2022-05-31 14:51:53.000000000 -0400
@@ -0,0 +1,67 @@
+//
+// HKGlassesPrescription.h
+// HealthKit
+//
+// Copyright © 2022 Apple. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HealthKit/HKDefines.h>
+#import <HealthKit/HKVisionPrescription.h>
+
+@class HKDevice;
+@class HKQuantity;
+@class HKGlassesLensSpecification;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ @class HKGlassesPrescription
+ @abstract An object subclass representing a glasses prescription
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKGlassesPrescription : HKVisionPrescription
+
+/*!
+ @property glassesDescription
+ @abstract The description of the type of glasses
+ */
+@property (nonatomic, copy, readonly) NSString *glassesDescription;
+
+/*!
+ @property rightEye
+ @abstract The right eye lens specification
+ */
+@property (nonatomic, copy, readonly, nullable) HKGlassesLensSpecification *rightEye;
+
+/*!
+ @property leftEye
+ @abstract The left eye lens specification
+ */
+@property (nonatomic, copy, readonly, nullable) HKGlassesLensSpecification *leftEye;
+
+/*!
+ @method prescriptionWithRightEyeSpecification:leftEyeSpecification:type:dateIssued:expirationDate:device:metadata
+
+ @param rightEyeSpecification The right eye specification
+ @param leftEyeSpecification The left eye specification
+ @param description The description of the type of glasses
+ @param dateIssued The date the prescription was issued
+ @param expirationDate The date the prescription expires
+ @param device The device that generated the sample
+ @param metadata The metadata for the sample
+ */
++ (instancetype)prescriptionWithRightEyeSpecification:(nullable HKGlassesLensSpecification *)rightEyeSpecification
+ leftEyeSpecification:(nullable HKGlassesLensSpecification *)leftEyeSpecification
+ description:(NSString *)description
+ dateIssued:(NSDate *)dateIssued
+ expirationDate:(nullable NSDate *)expirationDate
+ device:(nullable HKDevice *)device
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHealthStore.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHealthStore.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHealthStore.h 2022-02-23 07:15:55.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHealthStore.h 2022-05-31 15:04:05.000000000 -0400
@@ -2,7 +2,7 @@
// HKHealthStore.h
// HealthKit
//
-// Copyright (c) 2013-2018 Apple Inc. All rights reserved.
+// Copyright (c) 2013-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -30,7 +30,7 @@
@class HKHealthStore
@abstract The HKHealthStore class provides an interface for accessing and storing the user's health data.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKHealthStore : NSObject
/*!
@@ -50,7 +50,7 @@
restore or synchronization.
Call supportsHealthRecords before attempting to request authorization for any clinical types.
*/
-- (BOOL)supportsHealthRecords API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
+- (BOOL)supportsHealthRecords API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
/*!
@method authorizationStatusForType:
@@ -80,6 +80,24 @@
completion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_REFINED_FOR_SWIFT_ASYNC(3) NS_SWIFT_ASYNC_THROWS_ON_FALSE(1);
/*!
+ @method requestPerObjectReadAuthorizationForType:predicate:completion:
+ @abstract For types that support per object authorization (like vision prescriptions), prompts the user to select
+ the objects for which they want to grant your app access.
+ @discussion Before attempting to execute queries, the application should first request authorization from the user
+ to read objects for which the application may require access.
+
+ The request is performed asynchronously, and its completion will be executed on an arbitrary background
+ queue after the user has responded. The user will always be prompted to provide access to objects
+ regardless of whether access had been previously provided. The user can choose to toggle each object's
+ access with each prompt. The success parameter of the completion indicates whether prompting the user
+ completed successfully and was not cancelled. It does NOT indicate whether the application was granted
+ authorization.
+ */
+- (void)requestPerObjectReadAuthorizationForType:(HKObjectType *)objectType
+ predicate:(nullable NSPredicate *)predicate
+ completion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1);
+
+/*!
@method getRequestStatusForAuthorizationToShareTypes:readTypes:completion:
@abstract Determines whether requesting authorization for the given types is necessary.
@discussion Applications may call this method to determine whether the user would be prompted for authorization if
@@ -89,7 +107,7 @@
*/
- (void)getRequestStatusForAuthorizationToShareTypes:(NSSet<HKSampleType *> *)typesToShare
readTypes:(NSSet<HKObjectType *> *)typesToRead
- completion:(void (^)(HKAuthorizationRequestStatus requestStatus, NSError * _Nullable error))completion NS_SWIFT_ASYNC_NAME(statusForAuthorizationRequest(toShare:read:)) API_AVAILABLE(ios(12.0), watchos(5.0));
+ completion:(void (^)(HKAuthorizationRequestStatus requestStatus, NSError * _Nullable error))completion NS_SWIFT_ASYNC_NAME(statusForAuthorizationRequest(toShare:read:)) API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
/*!
@method handleAuthorizationForExtensionWithCompletion:
@@ -103,7 +121,7 @@
the user, if necessary, completed successfully and was not cancelled by the user. It does NOT indicate
whether the application was granted authorization.
*/
-- (void)handleAuthorizationForExtensionWithCompletion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(ios(9.0)) API_UNAVAILABLE(watchos) NS_EXTENSION_UNAVAILABLE("Not available to extensions");
+- (void)handleAuthorizationForExtensionWithCompletion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(ios(9.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos) NS_EXTENSION_UNAVAILABLE("Not available to extensions");
/*!
@method earliestPermittedSampleDate
@@ -111,7 +129,7 @@
@discussion On some platforms, only samples with end dates newer than the value returned by earliestPermittedSampleDate
may be saved or retrieved.
*/
-- (NSDate *)earliestPermittedSampleDate API_AVAILABLE(ios(9.0), watchos(2.0));
+- (NSDate *)earliestPermittedSampleDate API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@method saveObject:withCompletion:
@@ -151,7 +169,7 @@
@discussion An application may only delete objects that it previously saved. This operation is performed
asynchronously and the completion will be executed on an arbitrary background queue.
*/
-- (void)deleteObjects:(NSArray<HKObject *> *)objects withCompletion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(ios(9.0), watchos(2.0));
+- (void)deleteObjects:(NSArray<HKObject *> *)objects withCompletion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@method deleteObjectsOfType:predicate:withCompletion:
@@ -159,7 +177,7 @@
@discussion An application may only delete objects that it previously saved. This operation is performed
asynchronously and the completion will be executed on an arbitrary background queue.
*/
-- (void)deleteObjectsOfType:(HKObjectType *)objectType predicate:(NSPredicate *)predicate withCompletion:(void (^)(BOOL success, NSUInteger deletedObjectCount, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(ios(9.0), watchos(2.0));
+- (void)deleteObjectsOfType:(HKObjectType *)objectType predicate:(NSPredicate *)predicate withCompletion:(void (^)(BOOL success, NSUInteger deletedObjectCount, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@method executeQuery:
@@ -206,7 +224,7 @@
@discussion Before calling this method, the application should request authorization to access objects with the
HKCharacteristicType identified by HKCharacteristicTypeIdentifierDateOfBirth.
*/
-- (nullable NSDateComponents *)dateOfBirthComponentsWithError:(NSError **)error API_AVAILABLE(ios(10.0), watchos(3.0));
+- (nullable NSDateComponents *)dateOfBirthComponentsWithError:(NSError **)error API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@method biologicalSexWithError:
@@ -230,7 +248,7 @@
@discussion Before calling this method, the application should request authorization to access objects with the
HKCharacteristicType identified by HKCharacteristicTypeIdentifierFitzpatrickSkinType.
*/
-- (nullable HKFitzpatrickSkinTypeObject *)fitzpatrickSkinTypeWithError:(NSError **)error API_AVAILABLE(ios(9.0), watchos(2.0));
+- (nullable HKFitzpatrickSkinTypeObject *)fitzpatrickSkinTypeWithError:(NSError **)error API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@method wheelchairUseWithError:
@@ -238,7 +256,7 @@
@discussion Before calling this method, the application should request authorization to access objects with the
HKCharacteristicType identified by HKCharacteristicTypeIdentifierWheelchairUse.
*/
-- (nullable HKWheelchairUseObject *)wheelchairUseWithError:(NSError **)error API_AVAILABLE(ios(10.0), watchos(3.0));
+- (nullable HKWheelchairUseObject *)wheelchairUseWithError:(NSError **)error API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@method activityMoveModeWithError:
@@ -246,7 +264,7 @@
@discussion Before calling this method, the application should request authorization to access objects with the
HKCharacteristicType identified by HKCharacteristicTypeIdentifierActivityMoveMode.
*/
-- (nullable HKActivityMoveModeObject *)activityMoveModeWithError:(NSError **)error API_AVAILABLE(ios(14.0), watchos(7.0));
+- (nullable HKActivityMoveModeObject *)activityMoveModeWithError:(NSError **)error API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
@end
@@ -269,7 +287,7 @@
@discussion This method will asynchronously begin a workout session. The methods on the session's delegate will be
called when the session has successfully started or fails to start.
*/
-- (void)startWorkoutSession:(HKWorkoutSession *)workoutSession API_DEPRECATED("Use HKWorkoutSession's start method", watchos(2.0, 5.0)) API_UNAVAILABLE(ios);
+- (void)startWorkoutSession:(HKWorkoutSession *)workoutSession API_DEPRECATED("Use HKWorkoutSession's start method", watchos(2.0, 5.0)) API_UNAVAILABLE(ios, macCatalyst, macos);
/*!
@method endWorkoutSession:
@@ -278,7 +296,7 @@
transition to HKWorkoutSessionStateEnded. Once a workout session is ended, it cannot be reused to start
a new workout session.
*/
-- (void)endWorkoutSession:(HKWorkoutSession *)workoutSession API_DEPRECATED("Use HKWorkoutSession's end method", watchos(2.0, 5.0)) API_UNAVAILABLE(ios);
+- (void)endWorkoutSession:(HKWorkoutSession *)workoutSession API_DEPRECATED("Use HKWorkoutSession's end method", watchos(2.0, 5.0)) API_UNAVAILABLE(ios, macCatalyst, macos);
/*!
@method pauseWorkoutSession:
@@ -306,14 +324,14 @@
protocol will be called with the HKWorkoutConfiguration as a parameter. The receiving Watch app can use
this configuration object to create an HKWorkoutSession and start it with -startWorkoutSession:.
*/
-- (void)startWatchAppWithWorkoutConfiguration:(HKWorkoutConfiguration *)workoutConfiguration completion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) NS_SWIFT_ASYNC_NAME(startWatchApp(toHandle:)) API_AVAILABLE(ios(10.0)) API_UNAVAILABLE(watchos);
+- (void)startWatchAppWithWorkoutConfiguration:(HKWorkoutConfiguration *)workoutConfiguration completion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) NS_SWIFT_ASYNC_NAME(startWatchApp(toHandle:)) API_AVAILABLE(ios(10.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
/*!
@method recoverActiveWorkoutSessionWithCompletion:
@abstract Recovers an active workout session after a client crash. If no session is available to be re-attached,
nil will be returned. If an error occurs, session will be nil and error will be set appropriately.
*/
-- (void)recoverActiveWorkoutSessionWithCompletion:(void (^)(HKWorkoutSession * _Nullable_result session, NSError * _Nullable error))completion API_AVAILABLE(watchos(5.0)) API_UNAVAILABLE(ios);
+- (void)recoverActiveWorkoutSessionWithCompletion:(void (^)(HKWorkoutSession * _Nullable_result session, NSError * _Nullable error))completion API_AVAILABLE(watchos(5.0)) API_UNAVAILABLE(ios, macCatalyst, macos);
@end
@@ -329,11 +347,11 @@
HKQuantityTypeIdentifierStepCount) have a minimum frequency of HKUpdateFrequencyHourly. This is enforced
transparently to the caller.
*/
-- (void)enableBackgroundDeliveryForType:(HKObjectType *)type frequency:(HKUpdateFrequency)frequency withCompletion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(watchos(8.0));
+- (void)enableBackgroundDeliveryForType:(HKObjectType *)type frequency:(HKUpdateFrequency)frequency withCompletion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(watchos(8.0), macCatalyst(13.0), macos(13.0));
-- (void)disableBackgroundDeliveryForType:(HKObjectType *)type withCompletion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(watchos(8.0));
+- (void)disableBackgroundDeliveryForType:(HKObjectType *)type withCompletion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(watchos(8.0), macCatalyst(13.0), macos(13.0));
-- (void)disableAllBackgroundDeliveryWithCompletion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(watchos(8.0));
+- (void)disableAllBackgroundDeliveryWithCompletion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) API_AVAILABLE(watchos(8.0), macCatalyst(13.0), macos(13.0));
@end
@@ -345,7 +363,7 @@
notification when this occurs, it is necessary to provide an HKHealthStore instance for the object
parameter of NSNotificationCenter's addObserver methods.
*/
-HK_EXTERN NSString * const HKUserPreferencesDidChangeNotification API_AVAILABLE(ios(8.2), watchos(2.0));
+HK_EXTERN NSString * const HKUserPreferencesDidChangeNotification API_AVAILABLE(ios(8.2), watchos(2.0), macCatalyst(13.0), macos(13.0));
@interface HKHealthStore (HKUserPreferences)
@@ -363,7 +381,7 @@
The returned dictionary will map HKQuantityType to HKUnit.
*/
-- (void)preferredUnitsForQuantityTypes:(NSSet<HKQuantityType *> *)quantityTypes completion:(void (^)(NSDictionary<HKQuantityType *, HKUnit *> *preferredUnits, NSError * _Nullable error))completion API_AVAILABLE(ios(8.2), watchos(2.0));
+- (void)preferredUnitsForQuantityTypes:(NSSet<HKQuantityType *> *)quantityTypes completion:(void (^)(NSDictionary<HKQuantityType *, HKUnit *> *preferredUnits, NSError * _Nullable error))completion API_AVAILABLE(ios(8.2), watchos(2.0), macCatalyst(13.0), macos(13.0));
@end
@@ -377,7 +395,7 @@
*/
- (void)recalibrateEstimatesForSampleType:(HKSampleType *)sampleType
atDate:(NSDate *)date
- completion:(void(^)(BOOL success, NSError * _Nullable error))completion API_AVAILABLE(ios(15.0), watchos(8.0)) NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) NS_SWIFT_NAME(recalibrateEstimates(sampleType:date:completion:));
+ completion:(void(^)(BOOL success, NSError * _Nullable error))completion API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0)) NS_SWIFT_ASYNC_THROWS_ON_FALSE(1) NS_SWIFT_NAME(recalibrateEstimates(sampleType:date:completion:));
@end
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesBuilder.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesBuilder.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesBuilder.h 2022-02-23 07:13:46.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesBuilder.h 2022-05-31 15:02:41.000000000 -0400
@@ -2,7 +2,7 @@
// HKHeartbeatSeriesBuilder.h
// HealthKit
//
-// Copyright © 2018 Apple. All rights reserved.
+// Copyright © 2018-2022 Apple. All rights reserved.
//
#import <HealthKit/HKSeriesBuilder.h>
@@ -21,7 +21,7 @@
Calling finishSeriesWithcompletion: will stop and complete the series. If the builder is deleted,
or the client goes away before calling the finish method, data will be lost.
*/
-HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0))
+HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0))
@interface HKHeartbeatSeriesBuilder : HKSeriesBuilder
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesQuery.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesQuery.h 2022-05-31 14:51:55.000000000 -0400
@@ -2,7 +2,7 @@
// HKHeartbeatSeriesQuery.h
// HealthKit
//
-// Copyright © 2018 Apple. All rights reserved.
+// Copyright © 2018-2022 Apple. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -20,7 +20,7 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKHeartbeatSeriesQueryDescriptor", ios(13.0, API_TO_BE_DEPRECATED), watchos(6.0, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(13.0), watchos(6.0))
+API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0))
#endif
@interface HKHeartbeatSeriesQuery : HKQuery
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesSample.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesSample.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesSample.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKHeartbeatSeriesSample.h 2022-05-31 14:51:52.000000000 -0400
@@ -2,7 +2,7 @@
// HKHeartbeatSeriesSample.h
// HealthKit
//
-// Copyright © 2018 Apple. All rights reserved.
+// Copyright © 2018-2022 Apple. All rights reserved.
//
#import <HealthKit/HKSeriesSample.h>
@@ -14,7 +14,7 @@
@abstract An HKHeartbeatSeriesSample represents a series of heartbeats.
@discussion To retrieve the underlying series data for an HKHeartbeatSeriesSample, use HKHeartbeatSeriesQuery
*/
-HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0))
+HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0))
@interface HKHeartbeatSeriesSample : HKSeriesSample
@end
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLensSpecification.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLensSpecification.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLensSpecification.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLensSpecification.h 2022-05-31 14:51:55.000000000 -0400
@@ -0,0 +1,51 @@
+//
+// HKLensSpecification.h
+// HealthKit
+//
+// Copyright © 2022 Apple. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HealthKit/HKDefines.h>
+
+@class HKQuantity;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ @class HKLensSpecification
+ @abstract An object subclass representing common lens specification
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKLensSpecification : NSObject
+
+/*!
+ @property sphere
+ @abstract The lens power to correct nearsightedness or farsightedness. (-) means nearsighted while (+) farsighted.
+ */
+@property (nonatomic, copy, readonly) HKQuantity *sphere;
+
+/*!
+ @property cylinder
+ @abstract The lens power required to correct astigmatism. Can be positive or negative.
+ */
+@property (nonatomic, copy, readonly, nullable) HKQuantity *cylinder;
+
+/*!
+ @property axis
+ @abstract The angle along which cylindrical power should be positioned to correct astigmatism
+ */
+@property (nonatomic, copy, readonly, nullable) HKQuantity *axis;
+
+/*!
+ @property addPower
+ @abstract The power adjustment applied to a multifocal lens to correct presbyopia
+ */
+@property (nonatomic, copy, readonly, nullable) HKQuantity *addPower;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLiveWorkoutBuilder.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLiveWorkoutBuilder.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLiveWorkoutBuilder.h 2022-02-23 07:59:09.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLiveWorkoutBuilder.h 2022-05-31 15:04:05.000000000 -0400
@@ -2,7 +2,7 @@
// HKLiveWorkoutBuilder.h
// HealthKit
//
-// Copyright © 2018 Apple. All rights reserved.
+// Copyright © 2018-2022 Apple. All rights reserved.
//
#import <HealthKit/HealthKit.h>
@@ -34,6 +34,26 @@
*/
- (void)workoutBuilderDidCollectEvent:(HKLiveWorkoutBuilder *)workoutBuilder;
+@optional
+
+/*!
+ @method workoutBuilder:didBeginActivity:
+ @abstract Called every time new activity is started and added to the workout builder.
+
+ @param workoutBuilder The workout builder to which the activity was added to.
+ @param workoutActivity The activity that was added.
+ */
+- (void)workoutBuilder:(HKLiveWorkoutBuilder *)workoutBuilder didBeginActivity:(HKWorkoutActivity *)workoutActivity API_AVAILABLE(watchos(9.0));
+
+/*!
+ @method workoutBuilder:didEndActivity:
+ @abstract Called every time the end date is set on an activity in the workout builder.
+
+ @param workoutBuilder The workout builder to which the activity belongs to
+ @param workoutActivity The activity that was ended.
+ */
+- (void)workoutBuilder:(HKLiveWorkoutBuilder *)workoutBuilder didEndActivity:(HKWorkoutActivity *)workoutActivity API_AVAILABLE(watchos(9.0));
+
@end
HK_EXTERN API_AVAILABLE(watchos(5.0)) API_UNAVAILABLE(ios)
@@ -79,6 +99,14 @@
*/
@property (assign, readonly) NSTimeInterval elapsedTime;
+/*!
+ @property currentWorkoutActivity
+ @abstract The latest activity that has been added to this builder.
+ @discussion When an activity is in progress it will be returned by this property. The end date of this activity will always
+ be nil. When the activity is ended, the property would be set to nil until a new activity begins.
+ */
+@property (copy, readonly, nullable) HKWorkoutActivity *currentWorkoutActivity API_AVAILABLE(watchos(9.0));
+
@end
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLiveWorkoutDataSource.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLiveWorkoutDataSource.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLiveWorkoutDataSource.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKLiveWorkoutDataSource.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKLiveWorkoutDataSource.h
// HealthKit
//
-// Copyright © 2017-2018 Apple. All rights reserved.
+// Copyright © 2017 Apple. All rights reserved.
//
#import <Foundation/Foundation.h>
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKMetadata.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKMetadata.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKMetadata.h 2022-02-23 07:15:55.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKMetadata.h 2022-05-31 14:49:27.000000000 -0400
@@ -2,7 +2,7 @@
// HKMetadata.h
// HealthKit
//
-// Copyright (c) 2013-2018 Apple Inc. All rights reserved.
+// Copyright (c) 2013-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -14,14 +14,14 @@
@abstract Represents the serial number of the device that created the HKObject.
@discussion The expected value type is NSString.
*/
-HK_EXTERN NSString * const HKMetadataKeyDeviceSerialNumber API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyDeviceSerialNumber API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyBodyTemperatureSensorLocation
@abstract Represents the location where a particular body temperature reading was taken.
@discussion The expected value type is an NSNumber containing a HKBodyTemperatureSensorLocation value.
*/
-HK_EXTERN NSString * const HKMetadataKeyBodyTemperatureSensorLocation API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyBodyTemperatureSensorLocation API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
typedef NS_ENUM(NSInteger, HKBodyTemperatureSensorLocation) {
HKBodyTemperatureSensorLocationOther = 0,
@@ -36,14 +36,14 @@
HKBodyTemperatureSensorLocationEarDrum,
HKBodyTemperatureSensorLocationTemporalArtery,
HKBodyTemperatureSensorLocationForehead,
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyHeartRateSensorLocation
@abstract Represents the location where a particular heart rate reading was taken.
@discussion The expected value type is an NSNumber containing a HKHeartRateSensorLocation value.
*/
-HK_EXTERN NSString * const HKMetadataKeyHeartRateSensorLocation API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyHeartRateSensorLocation API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
typedef NS_ENUM(NSInteger, HKHeartRateSensorLocation) {
HKHeartRateSensorLocationOther = 0,
@@ -53,7 +53,7 @@
HKHeartRateSensorLocationHand,
HKHeartRateSensorLocationEarLobe,
HKHeartRateSensorLocationFoot,
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyHeartRateMotionContext
@@ -62,13 +62,77 @@
(HKHeartRateMotionContextActive) if the user is in motion or working out, sedentary if the user is
still (HKHeartRateMotionContextSedentary), or not set (HKHeartRateMotionContextNotSet) otherwise.
*/
-HK_EXTERN NSString * const HKMetadataKeyHeartRateMotionContext API_AVAILABLE(ios(11.0), watchos(4.0));
+HK_EXTERN NSString * const HKMetadataKeyHeartRateMotionContext API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
typedef NS_ENUM(NSInteger, HKHeartRateMotionContext) {
HKHeartRateMotionContextNotSet = 0,
HKHeartRateMotionContextSedentary,
HKHeartRateMotionContextActive,
-} API_AVAILABLE(ios(11.0), watchos(4.0));
+} API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
+
+/*!
+ @constant HKMetadataKeyUserMotionContext
+ @abstract Represents the user's motion when a particular sample was taken.
+ @discussion The expected value type is an NSNumber containing a HKUserMotionContext value. The value is active
+ (HKUserMotionContextActive) if the user is in motion or working out, stationary if the user is
+ still (HKUserMotionContextStationary), or not set (HKUserMotionContextNotSet) otherwise.
+ */
+HK_EXTERN NSString * const HKMetadataKeyUserMotionContext API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+typedef NS_ENUM(NSInteger, HKUserMotionContext) {
+ HKUserMotionContextNotSet = 0,
+ HKUserMotionContextStationary,
+ HKUserMotionContextActive,
+} API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @constant HKMetadataKeySessionEstimate
+ @abstract Represents a per-session estimate prior to longitudinal smoothing applied to the value stored in the associated HKQuantitySample.
+ @discussion The expected value type is an HKQuantity object with a unit compatible with the associated HKQuantitySample.
+ */
+HK_EXTERN NSString * const HKMetadataKeySessionEstimate API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @enum HKHeartRateRecoveryTestType
+ @abstract Represents the test used to determine a Heart Rate Recovery value
+
+ @constant HKHeartRateRecoveryTestTypeMaxExercise The user was exerted to their physical limit to evaluate actual Heart Rate Recovery.
+ @constant HKHeartRateRecoveryTestTypePredictionSubMaxExercise A specific test protocol was used to calculate and correlate a predicted Heart Rate Recovery.
+ @constant HKHeartRateRecoveryTestTypePredictionNonExercise A non-exercise equation was used based on user metrics to calculate a predicted Heart Rate Recovery.
+ */
+typedef NS_ENUM(NSInteger, HKHeartRateRecoveryTestType) {
+ HKHeartRateRecoveryTestTypeMaxExercise = 1,
+ HKHeartRateRecoveryTestTypePredictionSubMaxExercise,
+ HKHeartRateRecoveryTestTypePredictionNonExercise,
+} API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @constant HKMetadataKeyHeartRateRecoveryTestType
+ @abstract Represents the test used to determine a Heart Rate Recovery value
+ @discussion The expected value type is an NSNumber containing a HKHeartRateRecoveryTestType value.
+ */
+HK_EXTERN NSString * const HKMetadataKeyHeartRateRecoveryTestType API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @constant HKMetadataKeyHeartRateRecoveryActivityType
+ @abstract Represents the activity which preceded a Heart Rate Recovery value
+ @discussion The expected value type is an NSNumber containing a HKWorkoutActivityType value.
+ */
+HK_EXTERN NSString * const HKMetadataKeyHeartRateRecoveryActivityType API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @constant HKMetadataKeyHeartRateRecoveryActivityDuration
+ @abstract Represents the duration of activity which preceded a Heart Rate Recovery value
+ @discussion The expected value type is an HKQuantity object compatible with a time unit.
+ */
+HK_EXTERN NSString * const HKMetadataKeyHeartRateRecoveryActivityDuration API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @constant HKMetadataKeyHeartRateRecoveryMaxObservedRecoveryHeartRate
+ @abstract Represents the maximum heart rate observed during the corresponding Heart Rate Recovery sample interval
+ @discussion The expected value type is an HKQuantity object compatible with "count/min" unit (eg "BPM").
+ */
+HK_EXTERN NSString * const HKMetadataKeyHeartRateRecoveryMaxObservedRecoveryHeartRate API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
/*!
@constant HKMetadataKeyFoodType
@@ -76,7 +140,7 @@
@discussion This should be a short string representing the type of food, such as 'Banana'. The expected value type
is NSString.
*/
-HK_EXTERN NSString * const HKMetadataKeyFoodType API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyFoodType API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyUDIDeviceIdentifier
@@ -86,7 +150,7 @@
** Note that the use of this key is now discouraged in favor of the HKDevice class.
*/
-HK_EXTERN NSString * const HKMetadataKeyUDIDeviceIdentifier API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyUDIDeviceIdentifier API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyUDIProductionIdentifier
@@ -97,7 +161,7 @@
needed.
The expected value type is NSString.
*/
-HK_EXTERN NSString * const HKMetadataKeyUDIProductionIdentifier API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyUDIProductionIdentifier API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyDigitalSignature
@@ -110,7 +174,7 @@
Standard Elliptic Curve P-256. See documentation for details.
*/
-HK_EXTERN NSString * const HKMetadataKeyDigitalSignature API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyDigitalSignature API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyExternalUUID
@@ -118,7 +182,7 @@
Uniqueness of objects with the same value of this key is not enforced by HealthKit.
@discussion The expected value type is NSString.
*/
-HK_EXTERN NSString * const HKMetadataKeyExternalUUID API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyExternalUUID API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeySyncIdentifier
@@ -130,7 +194,7 @@
HKMetadataKeySyncVersion must be provided if HKMetadataKeySyncIdentifier is provided.
The expected value type is NSString.
*/
-HK_EXTERN NSString * const HKMetadataKeySyncIdentifier API_AVAILABLE(ios(11.0), watchos(4.0));
+HK_EXTERN NSString * const HKMetadataKeySyncIdentifier API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeySyncVersion
@@ -139,14 +203,14 @@
@discussion HKMetadataKeySyncVersion may not be provided if HKMetadataKeySyncIdentifier is not provided.
The expected value type is NSNumber.
*/
-HK_EXTERN NSString * const HKMetadataKeySyncVersion API_AVAILABLE(ios(11.0), watchos(4.0));
+HK_EXTERN NSString * const HKMetadataKeySyncVersion API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyTimeZone
@abstract Represents the time zone that the user was in when the HKObject was created.
@discussion The expected value type is an NSString compatible with NSTimeZone's +timeZoneWithName:.
*/
-HK_EXTERN NSString * const HKMetadataKeyTimeZone API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyTimeZone API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@@ -156,7 +220,7 @@
** Note that the use of this key is now discouraged in favor of the HKDevice class.
*/
-HK_EXTERN NSString * const HKMetadataKeyDeviceName API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyDeviceName API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyDeviceManufacturerName
@@ -165,63 +229,63 @@
** Note that the use of this key is now discouraged in favor of the HKDevice class.
*/
-HK_EXTERN NSString * const HKMetadataKeyDeviceManufacturerName API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyDeviceManufacturerName API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyWasTakenInLab
@abstract Represents whether or not the reading was taken in a lab.
@discussion The expected value type is an NSNumber containing a BOOL value.
*/
-HK_EXTERN NSString * const HKMetadataKeyWasTakenInLab API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyWasTakenInLab API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyReferenceRangeLowerLimit
@abstract Represents the lower limit of the reference range for a lab result.
@discussion The expected value type is an NSNumber.
*/
-HK_EXTERN NSString * const HKMetadataKeyReferenceRangeLowerLimit API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyReferenceRangeLowerLimit API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyReferenceRangeUpperLimit
@abstract Represents the upper limit of the reference range for a lab result.
@discussion The expected value type is an NSNumber.
*/
-HK_EXTERN NSString * const HKMetadataKeyReferenceRangeUpperLimit API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyReferenceRangeUpperLimit API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyWasUserEntered
@abstract Represents whether or not the reading was entered by the user.
@discussion The expected value type is an NSNumber containing a BOOL value.
*/
-HK_EXTERN NSString * const HKMetadataKeyWasUserEntered API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyWasUserEntered API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyWorkoutBrandName
@abstract Represents the brand name of a particular workout.
@discussion The expected value type is NSString.
*/
-HK_EXTERN NSString * const HKMetadataKeyWorkoutBrandName API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyWorkoutBrandName API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyGroupFitness
@abstract Represents whether or not a workout was performed as part of a group fitness class.
@discussion The expected value type is an NSNumber containing a BOOL value.
*/
-HK_EXTERN NSString * const HKMetadataKeyGroupFitness API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyGroupFitness API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyIndoorWorkout
@abstract Represents whether or not a workout was performed indoors as opposed to outdoors.
@discussion The expected value type is an NSNumber containing a BOOL value.
*/
-HK_EXTERN NSString * const HKMetadataKeyIndoorWorkout API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyIndoorWorkout API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyCoachedWorkout
@abstract Represents whether or not a workout was performed with a coach or personal trainer.
@discussion The expected value type is an NSNumber containing a BOOL value.
*/
-HK_EXTERN NSString * const HKMetadataKeyCoachedWorkout API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyCoachedWorkout API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
typedef NS_ENUM(NSInteger, HKWeatherCondition) {
HKWeatherConditionNone = 0,
@@ -252,7 +316,7 @@
HKWeatherConditionTropicalStorm,
HKWeatherConditionHurricane,
HKWeatherConditionTornado,
-} API_AVAILABLE(ios(10.0), watchos(3.0));
+} API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyWeatherCondition
@@ -260,7 +324,7 @@
@discussion The expected value type is an NSNumber containing an HKWeatherCondition value. This key may be set on an
HKWorkout object to represent the overall weather condition during the workout.
*/
-HK_EXTERN NSString * const HKMetadataKeyWeatherCondition API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKMetadataKeyWeatherCondition API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyWeatherTemperature
@@ -268,7 +332,7 @@
@discussion The expected value type is an HKQuantity expressed in a temperature unit. This key may be set on an
HKWorkout object to represent the overall temperature during the workout.
*/
-HK_EXTERN NSString * const HKMetadataKeyWeatherTemperature API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKMetadataKeyWeatherTemperature API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyHumidity
@@ -276,7 +340,7 @@
@discussion The expected value type is an HKQuantity expressed in percent. This key may be set on an HKWorkout
object to represent the overall humidity during the workout.
*/
-HK_EXTERN NSString * const HKMetadataKeyWeatherHumidity API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKMetadataKeyWeatherHumidity API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeySexualActivityProtectionUsed
@@ -284,7 +348,7 @@
protection from STIs or protection from pregnancy.
@discussion The expected value type is an NSNumber containing a BOOL value.
*/
-HK_EXTERN NSString * const HKMetadataKeySexualActivityProtectionUsed API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeySexualActivityProtectionUsed API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyMenstrualCycleStart
@@ -292,7 +356,7 @@
metadata key for category samples of type HKCategoryTypeIdentifierMenstrualFlow.
@discussion The expected value type is an NSNumber containing a BOOL value.
*/
-HK_EXTERN NSString * const HKMetadataKeyMenstrualCycleStart API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKMetadataKeyMenstrualCycleStart API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyLapLength
@@ -300,7 +364,7 @@
@discussion The expected value type is an HKQuantity object compatible with a length unit. This key may be set on an
HKWorkout object to represent the length of a lap.
*/
-HK_EXTERN NSString * const HKMetadataKeyLapLength API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKMetadataKeyLapLength API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKWorkoutSwimmingLocationType
@@ -311,7 +375,7 @@
HKWorkoutSwimmingLocationTypeUnknown = 0,
HKWorkoutSwimmingLocationTypePool,
HKWorkoutSwimmingLocationTypeOpenWater,
-} API_AVAILABLE(ios(10.0), watchos(3.0));
+} API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeySwimmingLocationType
@@ -319,7 +383,7 @@
@discussion The expected value type is an NSNumber containing an HKWorkoutSwimmingLocationType value. This key may
be set on an HKWorkout object to represent the swimming location type.
*/
-HK_EXTERN NSString * const HKMetadataKeySwimmingLocationType API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKMetadataKeySwimmingLocationType API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKSwimmingStrokeStyle
@@ -332,7 +396,8 @@
HKSwimmingStrokeStyleBackstroke,
HKSwimmingStrokeStyleBreaststroke,
HKSwimmingStrokeStyleButterfly,
-} API_AVAILABLE(ios(10.0), watchos(3.0));
+ HKSwimmingStrokeStyleKickboard API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)),
+} API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeySwimmingStrokeStyle
@@ -341,7 +406,7 @@
an HKWorkoutEvent object with the type HKWorkoutEventTypeLap to represent the predominant style used
during the lap.
*/
-HK_EXTERN NSString * const HKMetadataKeySwimmingStrokeStyle API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN NSString * const HKMetadataKeySwimmingStrokeStyle API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKInsulinDeliveryReason
@@ -357,7 +422,7 @@
typedef NS_ENUM(NSInteger, HKInsulinDeliveryReason) {
HKInsulinDeliveryReasonBasal = 1,
HKInsulinDeliveryReasonBolus,
-} API_AVAILABLE(ios(11.0), watchos(4.0));
+} API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyInsulinDeliveryReason
@@ -365,7 +430,7 @@
samples of type HKQuantityTypeIdentifierInsulinDelivery.
@discussion The expected value type is an NSNumber containing a HKInsulinDeliveryReason value.
*/
-HK_EXTERN NSString * const HKMetadataKeyInsulinDeliveryReason API_AVAILABLE(ios(11.0), watchos(4.0));
+HK_EXTERN NSString * const HKMetadataKeyInsulinDeliveryReason API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKBloodGlucoseMealTime
@@ -377,7 +442,7 @@
typedef NS_ENUM(NSInteger, HKBloodGlucoseMealTime) {
HKBloodGlucoseMealTimePreprandial = 1,
HKBloodGlucoseMealTimePostprandial,
-} API_AVAILABLE(ios(11.0), watchos(4.0));
+} API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyBloodGlucoseMealTime
@@ -388,7 +453,7 @@
HKQuantityTypeIdentifierDietaryCarbohydrates. The expected value type is an NSNumber containing a
HKBloodGlucoseMealTime value.
*/
-HK_EXTERN NSString * const HKMetadataKeyBloodGlucoseMealTime API_AVAILABLE(ios(11.0), watchos(4.0));
+HK_EXTERN NSString * const HKMetadataKeyBloodGlucoseMealTime API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@enum HKVO2MaxTestType
@@ -402,14 +467,14 @@
HKVO2MaxTestTypeMaxExercise = 1,
HKVO2MaxTestTypePredictionSubMaxExercise,
HKVO2MaxTestTypePredictionNonExercise,
-} API_AVAILABLE(ios(11.0), watchos(4.0));
+} API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyVO2MaxTestType
@abstract Represents the test used to create VO2 Max Sample
@discussion The expected value type is an NSNumber containing a HKVO2MaxTestType value.
*/
-HK_EXTERN NSString * const HKMetadataKeyVO2MaxTestType API_AVAILABLE(ios(11.0), watchos(4.0));
+HK_EXTERN NSString * const HKMetadataKeyVO2MaxTestType API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyAverageSpeed
@@ -421,7 +486,7 @@
set on quantity samples of type HKQuantityTypeIdentifierDistanceDownhillSnowSports or a workout segment
representing a skiing run.
*/
-HK_EXTERN NSString * const HKMetadataKeyAverageSpeed API_AVAILABLE(ios(11.2), watchos(4.2));
+HK_EXTERN NSString * const HKMetadataKeyAverageSpeed API_AVAILABLE(ios(11.2), watchos(4.2), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyMaximumSpeed
@@ -430,7 +495,7 @@
set on quantity samples of type HKQuantityTypeIdentifierDistanceDownhillSnowSports or a workout segment
representing a skiing run.
*/
-HK_EXTERN NSString * const HKMetadataKeyMaximumSpeed API_AVAILABLE(ios(11.2), watchos(4.2));
+HK_EXTERN NSString * const HKMetadataKeyMaximumSpeed API_AVAILABLE(ios(11.2), watchos(4.2), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyAlpineSlopeGrade
@@ -441,7 +506,7 @@
quantity samples of type HKQuantityTypeIdentifierDistanceDownhillSnowSports or a workout segment
representing a skiing run.
*/
-HK_EXTERN NSString * const HKMetadataKeyAlpineSlopeGrade API_AVAILABLE(ios(11.2), watchos(4.2));
+HK_EXTERN NSString * const HKMetadataKeyAlpineSlopeGrade API_AVAILABLE(ios(11.2), watchos(4.2), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyElevationAscended
@@ -449,7 +514,7 @@
@discussion The expected value type is an HKQuantity object compatible with length unit. This key may be set on a
workout, workout segments or distance samples.
*/
-HK_EXTERN NSString * const HKMetadataKeyElevationAscended API_AVAILABLE(ios(11.2), watchos(4.2));
+HK_EXTERN NSString * const HKMetadataKeyElevationAscended API_AVAILABLE(ios(11.2), watchos(4.2), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyElevationDescended
@@ -457,7 +522,7 @@
@discussion The expected value type is an HKQuantity object compatible with length unit. This key may be set on a
workout, workout segments or distance samples.
*/
-HK_EXTERN NSString * const HKMetadataKeyElevationDescended API_AVAILABLE(ios(11.2), watchos(4.2));
+HK_EXTERN NSString * const HKMetadataKeyElevationDescended API_AVAILABLE(ios(11.2), watchos(4.2), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyFitnessMachineDuration
@@ -466,7 +531,7 @@
HKWorkout object to represent the duration of the workout as displayed by a GymKit connected fitness
machine.
*/
-HK_EXTERN NSString * const HKMetadataKeyFitnessMachineDuration API_AVAILABLE(ios(12.0), watchos(5.0));
+HK_EXTERN NSString * const HKMetadataKeyFitnessMachineDuration API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyIndoorBikeDistance
@@ -474,7 +539,7 @@
@discussion The expected value type is an HKQuantity object compatible with a length unit. This key may be set on an
HKWorkout object to represent the distance covered during an indoor bike workout.
*/
-HK_EXTERN NSString * const HKMetadataKeyIndoorBikeDistance API_AVAILABLE(ios(12.0), watchos(5.0));
+HK_EXTERN NSString * const HKMetadataKeyIndoorBikeDistance API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyCrossTrainerDistance
@@ -482,7 +547,7 @@
@discussion The expected value type is an HKQuantity object compatible with a length unit. This key may be set on an
HKWorkout object to represent the distance covered during a cross trainer workout.
*/
-HK_EXTERN NSString * const HKMetadataKeyCrossTrainerDistance API_AVAILABLE(ios(12.0), watchos(5.0));
+HK_EXTERN NSString * const HKMetadataKeyCrossTrainerDistance API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyHeartRateEventThreshold
@@ -491,7 +556,7 @@
This key will be set on heart rate event samples of type HKCategoryTypeIdentifierHighHeartRateEvent and
HKCategoryTypeIdentifierLowHeartRateEvent.
*/
-HK_EXTERN NSString * const HKMetadataKeyHeartRateEventThreshold API_AVAILABLE(ios(12.2), watchos(5.2));
+HK_EXTERN NSString * const HKMetadataKeyHeartRateEventThreshold API_AVAILABLE(ios(12.2), watchos(5.2), macCatalyst(13.0), macos(13.0));
/*!
@@ -500,7 +565,7 @@
@discussion The expected value type is an HKQuantity expressed in a METs (kcal/(kg*hr)) unit. This key may be set on an
HKWorkout object to represent the average workout intensity represented as METs over the entire workout duration.
*/
-HK_EXTERN NSString * const HKMetadataKeyAverageMETs API_AVAILABLE(ios(13.0), watchos(6.0));
+HK_EXTERN NSString * const HKMetadataKeyAverageMETs API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyAudioExposureLevel
@@ -508,7 +573,7 @@
@discussion The expected value is an HKQuantity whose value is the audio level
associated with the event measured in dBASPL units.
*/
-HK_EXTERN NSString * const HKMetadataKeyAudioExposureLevel API_AVAILABLE(ios(13.0), watchos(6.0));
+HK_EXTERN NSString * const HKMetadataKeyAudioExposureLevel API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
/*!
@constant HKMetadataKeyAudioExposureDuration
@@ -517,7 +582,7 @@
This key may be set on headphone audio exposure event samples to indicate
the duration of time that the user was actually exposed to audio through their headphones.
*/
-HK_EXTERN NSString * const HKMetadataKeyAudioExposureDuration API_AVAILABLE(ios(14.2), watchos(7.1));
+HK_EXTERN NSString * const HKMetadataKeyAudioExposureDuration API_AVAILABLE(ios(14.2), watchos(7.1), macCatalyst(14.2), macos(13.0));
/*!
@enum HKAppleECGAlgorithmVersion
@@ -527,15 +592,15 @@
*/
typedef NS_ENUM(NSInteger, HKAppleECGAlgorithmVersion) {
HKAppleECGAlgorithmVersion1 = 1,
- HKAppleECGAlgorithmVersion2 API_AVAILABLE(ios(14.3), watchos(7.2)) = 2,
-} API_AVAILABLE(ios(14.0), watchos(7.0));
+ HKAppleECGAlgorithmVersion2 API_AVAILABLE(ios(14.3), watchos(7.2), macCatalyst(14.3), macos(13.0)) = 2,
+} API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/*!
@constant HKMetadataKeyAppleECGAlgorithmVersion
@abstract Represents the ECG algorithm version that was used to generate a particular HKElectrocardiogram.
@discussion The expected value type is an an NSNumber containing a HKAppleECGAlgorithmVersion value.
*/
-HK_EXTERN NSString * const HKMetadataKeyAppleECGAlgorithmVersion API_AVAILABLE(ios(14.0), watchos(7.0));
+HK_EXTERN NSString * const HKMetadataKeyAppleECGAlgorithmVersion API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/*!
@enum HKDevicePlacementSide
@@ -550,7 +615,7 @@
HKDevicePlacementSideLeft,
HKDevicePlacementSideRight,
HKDevicePlacementSideCentral,
-} API_AVAILABLE(ios(14.0), watchos(7.0));
+} API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/*!
@constant HKMetadataKeyDevicePlacementSide
@@ -558,48 +623,69 @@
@discussion The expected value type is an NSNumber containing a HKDevicePlacementSide value. This key is expected to
be written for Walking Aymmetry Percentage.
*/
-HK_EXTERN NSString * const HKMetadataKeyDevicePlacementSide API_AVAILABLE(ios(14.0), watchos(7.0));
+HK_EXTERN NSString * const HKMetadataKeyDevicePlacementSide API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/*!
@constant HKMetadataKeyBarometricPressure
@abstract Represents the barometric pressure recorded at the time of a sample.
@discussion The expected value type is an HKQuantity representing a value in units of pressure (atmospheres, pascals, millimeters of Mercury).
*/
-HK_EXTERN NSString * const HKMetadataKeyBarometricPressure API_AVAILABLE(ios(14.0), watchos(7.0));
+HK_EXTERN NSString * const HKMetadataKeyBarometricPressure API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/*!
@constant HKMetadataKeyAppleDeviceCalibrated
@abstract Represents the calibration status of the devices used to generate this sample.
@discussion The expected value is a boolean NSNumber indicating whether the sample value was estimated using a sufficient set of device calibration data. The calibration status of a device may vary per data type. This key is read-only.
*/
-HK_EXTERN NSString * const HKMetadataKeyAppleDeviceCalibrated API_AVAILABLE(ios(14.0), watchos(7.0));
+HK_EXTERN NSString * const HKMetadataKeyAppleDeviceCalibrated API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
/*!
@constant HKMetadataKeyVO2MaxValue
@abstract Represents a VO2Max value that can be associated with, for example, Cardio Fitness Events
@discussion This key should be used to store an HKQuantity with a unit of `ml/kg·min`
*/
-HK_EXTERN NSString * const HKMetadataKeyVO2MaxValue API_AVAILABLE(ios(14.3), watchos(7.2));
+HK_EXTERN NSString * const HKMetadataKeyVO2MaxValue API_AVAILABLE(ios(14.3), watchos(7.2), macCatalyst(14.3), macos(13.0));
/*!
@constant HKMetadataKeyLowCardioFitnessEventThreshold
@abstract Can be used to store a snapshot of the threshold used to classify VO2Max values as "low"
@discussion This key should be used to store an HKQuantity, with a unit of `ml/kg·min`, representing the low fitness threshold.
*/
-HK_EXTERN NSString * const HKMetadataKeyLowCardioFitnessEventThreshold API_AVAILABLE(ios(14.3), watchos(7.2));
+HK_EXTERN NSString * const HKMetadataKeyLowCardioFitnessEventThreshold API_AVAILABLE(ios(14.3), watchos(7.2), macCatalyst(14.3), macos(13.0));
/*!
@constant HKMetadataKeyDateOfEarliestDataUsedForEstimate
@abstract Represents how far back an estimation algorithm incorporated data from.
@discussion The expected value is an NSDate indicating the earliest date of data used to produce an estimated value for an HKSample.
*/
-HK_EXTERN NSString * const HKMetadataKeyDateOfEarliestDataUsedForEstimate API_AVAILABLE(ios(15.0), watchos(8.0));
+HK_EXTERN NSString * const HKMetadataKeyDateOfEarliestDataUsedForEstimate API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
/*!
@constant HKMetadataKeyAlgorithmVersion
@abstract The version of the algorithm used to generate the sample.
@discussion The key for an NSNumber containing an NSInteger indicating the version of the algorithm used to generate the sample.
*/
-HK_EXTERN NSString * const HKMetadataKeyAlgorithmVersion API_AVAILABLE(ios(15.0), watchos(8.0));
+HK_EXTERN NSString * const HKMetadataKeyAlgorithmVersion API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
+
+/*!
+ @constant HKMetadataKeySWOLFScore
+ @abstract Represents sum of strokes per length and time for the length. Calculated for each lap event and segment event during swimming workout.
+ @discussion The expected value type is an NSNumber containing a score. This key may be set on an HKWorkout object to represent the SWOLF Score during the whole workout.
+ */
+HK_EXTERN NSString * const HKMetadataKeySWOLFScore API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @constant HKMetadataKeyQuantityClampedToLowerBound
+ @abstract Represents the quantity being clamped to a lower bound.
+ @discussion Value is a BOOL indicating whether or not the quantity value in the sample has been clamped to some lower bound
+ */
+HK_EXTERN NSString * const HKMetadataKeyQuantityClampedToLowerBound API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @constant HKMetadataKeyQuantityClampedToUpperBound
+ @abstract Represents the quantity being clamped to an upper bound.
+ @discussion Value is a BOOL indicating whether or not the quantity value in the sample has been clamped to some upper bound
+ */
+HK_EXTERN NSString * const HKMetadataKeyQuantityClampedToUpperBound API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObject.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObject.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObject.h 2022-02-23 07:59:09.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObject.h 2022-05-31 14:51:55.000000000 -0400
@@ -14,7 +14,7 @@
@class HKSourceRevision;
@class HKDevice;
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKObject : NSObject <NSSecureCoding>
/*!
@@ -29,13 +29,13 @@
@property sourceRevision
@abstract Represents the revision of the source responsible for saving the receiver.
*/
-@property (readonly, strong) HKSourceRevision *sourceRevision API_AVAILABLE(ios(9.0), watchos(2.0));
+@property (readonly, strong) HKSourceRevision *sourceRevision API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@property device
@abstract Represents the device that generated the data of the receiver.
*/
-@property (readonly, strong, nullable) HKDevice *device API_AVAILABLE(ios(9.0), watchos(2.0));
+@property (readonly, strong, nullable) HKDevice *device API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@property metadata
@@ -50,12 +50,12 @@
@end
// Predicate Key Paths
-HK_EXTERN NSString * const HKPredicateKeyPathUUID API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathSource API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathMetadata API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathCorrelation API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathWorkout API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathDevice API_AVAILABLE(ios(9.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathSourceRevision API_AVAILABLE(ios(9.0), watchos(2.0));
+HK_EXTERN NSString * const HKPredicateKeyPathUUID API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathSource API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathMetadata API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathCorrelation API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkout API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathDevice API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathSourceRevision API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObjectType.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObjectType.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObjectType.h 2022-02-23 07:55:55.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObjectType.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKObjectType.h
// HealthKit
//
-// Copyright (c) 2013-2017 Apple Inc. All rights reserved.
+// Copyright (c) 2013-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -28,7 +28,7 @@
@class HKObjectType
@abstract An abstract class representing a type of object that can be stored by HealthKit.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKObjectType : NSObject <NSSecureCoding, NSCopying>
/*!
@@ -40,7 +40,7 @@
- (instancetype)init NS_UNAVAILABLE;
-#if __swift__
+#if defined(__swift__) && __swift__
+ (nullable HKQuantityType *)quantityTypeForIdentifier:(HKQuantityTypeIdentifier)identifier API_DEPRECATED_WITH_REPLACEMENT("HKQuantityType(_:)", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
+ (nullable HKCategoryType *)categoryTypeForIdentifier:(HKCategoryTypeIdentifier)identifier API_DEPRECATED_WITH_REPLACEMENT("HKCategoryType(_:)", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
+ (nullable HKCharacteristicType *)characteristicTypeForIdentifier:(HKCharacteristicTypeIdentifier)identifier API_DEPRECATED_WITH_REPLACEMENT("HKCharacteristicType(_:)", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
@@ -51,13 +51,21 @@
+ (nullable HKCategoryType *)categoryTypeForIdentifier:(HKCategoryTypeIdentifier)identifier;
+ (nullable HKCharacteristicType *)characteristicTypeForIdentifier:(HKCharacteristicTypeIdentifier)identifier;
+ (nullable HKCorrelationType *)correlationTypeForIdentifier:(HKCorrelationTypeIdentifier)identifier;
-+ (nullable HKDocumentType *)documentTypeForIdentifier:(HKDocumentTypeIdentifier)identifier API_AVAILABLE(ios(10.0), watchos(3.0));
-#endif
-+ (nullable HKSeriesType *)seriesTypeForIdentifier:(NSString *)identifier API_AVAILABLE(ios(11.0), watchos(4.0));
++ (nullable HKDocumentType *)documentTypeForIdentifier:(HKDocumentTypeIdentifier)identifier API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
+#endif // defined(__swift__) && __swift__
+
++ (nullable HKSeriesType *)seriesTypeForIdentifier:(NSString *)identifier API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
+ (HKWorkoutType *)workoutType;
-+ (HKActivitySummaryType *)activitySummaryType API_AVAILABLE(ios(9.3), watchos(2.2));
-+ (HKAudiogramSampleType *)audiogramSampleType API_AVAILABLE(ios(13.0), watchos(6.0));
-+ (HKElectrocardiogramType *)electrocardiogramType API_AVAILABLE(ios(14.0), watchos(7.0));
++ (HKActivitySummaryType *)activitySummaryType API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(13.0), macos(13.0));
++ (HKAudiogramSampleType *)audiogramSampleType API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
++ (HKElectrocardiogramType *)electrocardiogramType API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0));
++ (HKPrescriptionType *)visionPrescriptionType API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @method requiresPerObjectAuthorization
+ @abstract Returns YES if the authorization for the object type needs to be requested on per object basis.
+ */
+- (BOOL)requiresPerObjectAuthorization;
@end
@@ -65,7 +73,7 @@
@class HKCharacteristicType
@abstract Represents a type of object that describes a characteristic of the user (such as date of birth).
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKCharacteristicType : HKObjectType
@end
@@ -73,14 +81,14 @@
@class HKSampleType
@abstract Represents a type of HKSample.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKSampleType : HKObjectType
/*!
@property isMaximumDurationRestricted
@abstract Returns YES if the start and end date for samples of this type are restricted by a maximum duration.
*/
-@property (nonatomic, readonly) BOOL isMaximumDurationRestricted API_AVAILABLE(ios(13.0), watchos(6.0));
+@property (nonatomic, readonly) BOOL isMaximumDurationRestricted API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
/*!
@property maximumAllowedDuration
@@ -88,13 +96,13 @@
calculated as the difference between end and start dates.
@discussion Throws an exception if there is no maximum restriction on duration for samples of this type.
*/
-@property (nonatomic, readonly) NSTimeInterval maximumAllowedDuration API_AVAILABLE(ios(13.0), watchos(6.0));
+@property (nonatomic, readonly) NSTimeInterval maximumAllowedDuration API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
/*!
@property isMinimumDurationRestricted
@abstract Returns YES if the start and end date for samples of this type are restricted by a minimum duration.
*/
-@property (nonatomic, readonly) BOOL isMinimumDurationRestricted API_AVAILABLE(ios(13.0), watchos(6.0));
+@property (nonatomic, readonly) BOOL isMinimumDurationRestricted API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
/*!
@property minimumAllowedDuration
@@ -102,14 +110,14 @@
calculated as the difference between end and start dates.
@discussion Throws an exception if there is no minimum restriction on duration for samples of this type.
*/
-@property (nonatomic, readonly) NSTimeInterval minimumAllowedDuration API_AVAILABLE(ios(13.0), watchos(6.0));
+@property (nonatomic, readonly) NSTimeInterval minimumAllowedDuration API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
/*!
@property allowsRecalibrationForEstimates
@abstract Returns YES if first-party samples of this type are produced using a prediction algorithm, and that algorithm supports recalibration. To recalibrate the
estimates for a sample type, see -[HKHealthStore recalibrateEstimatesForSampleType:atDate:completion:]
*/
-@property (nonatomic, readonly) BOOL allowsRecalibrationForEstimates API_AVAILABLE(ios(15.0), watchos(8.0));
+@property (nonatomic, readonly) BOOL allowsRecalibrationForEstimates API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
@end
@@ -117,7 +125,7 @@
@class HKCategoryType
@abstract Represent a type of HKCategorySample.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKCategoryType : HKSampleType
@end
@@ -125,7 +133,7 @@
@class HKCorrelationType
@abstract Represents a type of HKCorrelation
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKCorrelationType : HKSampleType
@end
@@ -133,7 +141,7 @@
@class HKDocumentType
@abstract Represents a type of HKDocument.
*/
-HK_EXTERN API_AVAILABLE(ios(10.0))
+HK_EXTERN API_AVAILABLE(ios(10.0), macCatalyst(13.0), macos(13.0))
@interface HKDocumentType : HKSampleType
@end
@@ -141,7 +149,7 @@
@class HKQuantityType
@abstract Represents types of HKQuantitySamples.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKQuantityType : HKSampleType
@property (readonly) HKQuantityAggregationStyle aggregationStyle;
@@ -159,7 +167,7 @@
@class HKWorkoutType
@abstract Represents a workout or exercise
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKWorkoutType : HKSampleType
@end
@@ -167,11 +175,11 @@
@class HKSeriesType
@abstract Represents a type of HKSeriesSample
*/
-HK_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0))
+HK_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0))
@interface HKSeriesType : HKSampleType
+ (instancetype)workoutRouteType;
-+ (instancetype)heartbeatSeriesType API_AVAILABLE(ios(13.0), watchos(6.0));
++ (instancetype)heartbeatSeriesType API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
@end
@@ -179,7 +187,7 @@
@class HKActivitySummaryType
@abstract Represents an HKActivitySummary
*/
-HK_EXTERN API_AVAILABLE(ios(9.3), watchos(2.2))
+HK_EXTERN API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(13.0), macos(13.0))
@interface HKActivitySummaryType : HKObjectType
@end
@@ -187,7 +195,7 @@
@class HKAudiogramSampleType
@abstract Represents an audiogram sample.
*/
-HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0))
+HK_EXTERN API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0))
@interface HKAudiogramSampleType : HKSampleType
@end
@@ -195,8 +203,16 @@
@class HKElectrocardiogramType
@abstract Represents an electrocardiogram sample.
*/
-HK_EXTERN API_AVAILABLE(ios(14.0), watchos(7.0))
+HK_EXTERN API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0))
@interface HKElectrocardiogramType : HKSampleType
@end
+/*!
+ @class HKPrescriptionType
+ @abstract Represents a prescription type
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKPrescriptionType : HKSampleType
+@end
+
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObserverQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObserverQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObserverQuery.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKObserverQuery.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKObserverQuery.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -12,7 +12,7 @@
typedef void(^HKObserverQueryCompletionHandler)(void);
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKObserverQuery : HKQuery
/*!
@@ -38,7 +38,7 @@
which you are interested in getting notified.
*/
- (instancetype)initWithQueryDescriptors:(NSArray<HKQueryDescriptor *> *)queryDescriptors
- updateHandler:(void(^)(HKObserverQuery *query, NSSet<HKSampleType *> * _Nullable sampleTypesAdded, HKObserverQueryCompletionHandler completionHandler, NSError * _Nullable error))updateHandler API_AVAILABLE(ios(15.0), watchos(8.0));
+ updateHandler:(void(^)(HKObserverQuery *query, NSSet<HKSampleType *> * _Nullable sampleTypesAdded, HKObserverQueryCompletionHandler completionHandler, NSError * _Nullable error))updateHandler API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
@end
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantity.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantity.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantity.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantity.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,7 +2,7 @@
// HKQuantity.h
// HealthKit
//
-// Copyright (c) 2013-2014 Apple Inc. All rights reserved.
+// Copyright (c) 2013-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -15,7 +15,7 @@
@class HKQuantity
@abstract The HKQuantity class provides an encapsulation of a quantity value and the unit of measurement.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKQuantity : NSObject <NSSecureCoding, NSCopying>
- (instancetype)init NS_UNAVAILABLE;
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantityAggregationStyle.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantityAggregationStyle.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantityAggregationStyle.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantityAggregationStyle.h 2022-05-31 14:51:55.000000000 -0400
@@ -2,11 +2,13 @@
// HKQuantityAggregationStyle.h
// HealthKit
//
-// Copyright (c) 2013-2018 Apple Inc. All rights reserved.
+// Copyright (c) 2013-2022 Apple Inc. All rights reserved.
//
#import <Foundation/Foundation.h>
+NS_ASSUME_NONNULL_BEGIN
+
/*!
@enum HKQuantityAggregationStyle
@discussion Describes how quantities can be aggregated over time.
@@ -19,8 +21,10 @@
*/
typedef NS_ENUM(NSInteger, HKQuantityAggregationStyle) {
HKQuantityAggregationStyleCumulative = 0,
- HKQuantityAggregationStyleDiscreteArithmetic API_AVAILABLE(ios(13.0), watchos(6.0)),
+ HKQuantityAggregationStyleDiscreteArithmetic API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)),
HKQuantityAggregationStyleDiscrete API_DEPRECATED_WITH_REPLACEMENT("HKQuantityAggregationStyleDiscreteArithmetic", ios(8.0, 13.0), watchos(2.0, 6.0)) = HKQuantityAggregationStyleDiscreteArithmetic,
- HKQuantityAggregationStyleDiscreteTemporallyWeighted API_AVAILABLE(ios(13.0), watchos(6.0)),
- HKQuantityAggregationStyleDiscreteEquivalentContinuousLevel API_AVAILABLE(ios(13.0), watchos(6.0)),
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+ HKQuantityAggregationStyleDiscreteTemporallyWeighted API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)),
+ HKQuantityAggregationStyleDiscreteEquivalentContinuousLevel API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)),
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySample.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySample.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySample.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySample.h 2022-05-31 14:51:52.000000000 -0400
@@ -2,7 +2,7 @@
// HKQuantitySample.h
// HealthKit
//
-// Copyright (c) 2013-2019 Apple Inc. All rights reserved.
+// Copyright (c) 2013-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKSample.h>
@@ -16,7 +16,7 @@
@class HKQuantitySample
@abstract An abstract HKSample subclass representing a quantity measurement.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKQuantitySample : HKSample
@property (readonly, copy) HKQuantityType *quantityType;
@@ -27,7 +27,7 @@
@abstract The number of individual values making up the receiver's quantity.
@discussion Requests for the individual series quantities can be made using HKQuantitySeriesSampleQuery.
*/
-@property (readonly, assign) NSInteger count API_AVAILABLE(ios(12.0), watchos(5.0));
+@property (readonly, assign) NSInteger count API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
/*!
@method quantitySampleWithType:quantity:startDate:endDate:
@@ -68,12 +68,12 @@
startDate:(NSDate *)startDate
endDate:(NSDate *)endDate
device:(nullable HKDevice *)device
- metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(9.0), watchos(2.0));
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
@end
// Predicate Key Paths
-HK_EXTERN NSString * const HKPredicateKeyPathQuantity API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathCount API_AVAILABLE(ios(13.0), watchos(6.0));
+HK_EXTERN NSString * const HKPredicateKeyPathQuantity API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathCount API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySeriesSampleBuilder.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySeriesSampleBuilder.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySeriesSampleBuilder.h 2022-02-23 07:55:58.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySeriesSampleBuilder.h 2022-05-31 15:04:06.000000000 -0400
@@ -2,7 +2,7 @@
// HKQuantitySeriesSampleBuilder.h
// HealthKit
//
-// Copyright © 2018 Apple. All rights reserved.
+// Copyright © 2018-2022 Apple. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -26,7 +26,7 @@
-finishSeriesWithMetadata:completion:. Calling -discard invalidates the series and
discards any data that was previously associated with it.
*/
-HK_EXTERN API_AVAILABLE(ios(12.0), watchos(5.0))
+HK_EXTERN API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0))
@interface HKQuantitySeriesSampleBuilder : NSObject
/*!
@@ -81,7 +81,7 @@
*/
- (BOOL)insertQuantity:(HKQuantity *)quantity
dateInterval:(NSDateInterval *)dateInterval
- error:(NSError **)error NS_SWIFT_NAME(insert(_:for:)) API_AVAILABLE(ios(13.0), watchos(6.0));
+ error:(NSError **)error NS_SWIFT_NAME(insert(_:for:)) API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
/*!
@method insertQuantity:date:completion:
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySeriesSampleQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySeriesSampleQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySeriesSampleQuery.h 2022-02-23 10:58:54.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuantitySeriesSampleQuery.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKQuantitySeriesSampleQuery.h
// HealthKit
//
-// Copyright © 2018 Apple. All rights reserved.
+// Copyright © 2018-2022 Apple. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -24,7 +24,7 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKQuantitySeriesSampleQueryDescriptor", ios(12.0, API_TO_BE_DEPRECATED), watchos(5.0, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(12.0), watchos(5.0))
+API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0))
#endif
@interface HKQuantitySeriesSampleQuery : HKQuery
@@ -37,7 +37,7 @@
Specifying this option has a performance cost.
This property may not be modified once the query has been executed.
*/
-@property (nonatomic, assign) BOOL includeSample API_AVAILABLE(ios(13.0), watchos(6.0));
+@property (nonatomic, assign) BOOL includeSample API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
/*!
@property orderByQuantitySampleStartDate
@@ -51,7 +51,7 @@
dateInterval.startDate order if more than one quantitySample overlap in time.
This property may not be modified once the query has been executed.
*/
-@property (nonatomic, assign) BOOL orderByQuantitySampleStartDate API_AVAILABLE(ios(13.0), watchos(6.0));
+@property (nonatomic, assign) BOOL orderByQuantitySampleStartDate API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
/*!
@method initWithSample:dataHandler:
@@ -77,7 +77,7 @@
*/
- (instancetype)initWithQuantityType:(HKQuantityType *)quantityType
predicate:(nullable NSPredicate *)predicate
- quantityHandler:(void(^)(HKQuantitySeriesSampleQuery *query, HKQuantity * _Nullable quantity, NSDateInterval * _Nullable dateInterval, __kindof HKQuantitySample * _Nullable quantitySample, BOOL done, NSError * _Nullable error))quantityHandler API_AVAILABLE(ios(13.0), watchos(6.0));
+ quantityHandler:(void(^)(HKQuantitySeriesSampleQuery *query, HKQuantity * _Nullable quantity, NSDateInterval * _Nullable dateInterval, __kindof HKQuantitySample * _Nullable quantitySample, BOOL done, NSError * _Nullable error))quantityHandler API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
- (instancetype)initWithSample:(HKQuantitySample *)quantitySample
quantityHandler:(void(^)(HKQuantitySeriesSampleQuery *query, HKQuantity * _Nullable quantity, NSDate * _Nullable date, BOOL done, NSError * _Nullable error))quantityHandler API_DEPRECATED_WITH_REPLACEMENT("initWithQuantityType:predicate:quantityHandler:", ios(12.0, 13.0), watchos(5.0, 6.0));
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuery.h 2022-02-23 07:55:57.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQuery.h 2022-05-31 15:02:42.000000000 -0400
@@ -2,7 +2,7 @@
// HKQuery.h
// HealthKit
//
-// Copyright (c) 2013-2014 Apple Inc. All rights reserved.
+// Copyright (c) 2013-2022 Apple Inc. All rights reserved.
//
#import <Foundation/Foundation.h>
@@ -18,10 +18,10 @@
@class HKSampleType;
@class HKSource;
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKQuery : NSObject
-@property (readonly, strong, nullable) HKObjectType *objectType API_AVAILABLE(ios(9.3), watchos(2.2));
+@property (readonly, strong, nullable) HKObjectType *objectType API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(13.0), macos(13.0));
@property (readonly, strong, nullable) HKSampleType *sampleType API_DEPRECATED_WITH_REPLACEMENT("objectType", ios(8.0, 9.3), watchos(2.0, 2.2));
@property (readonly, strong, nullable) NSPredicate *predicate;
@@ -43,7 +43,7 @@
HKQueryOptionNone = 0,
HKQueryOptionStrictStartDate = 1 << 0,
HKQueryOptionStrictEndDate = 1 << 1,
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
@interface HKQuery (HKObjectPredicates)
@@ -104,7 +104,7 @@
@param sourceRevisions The list of source revisions.
*/
-+ (NSPredicate *)predicateForObjectsFromSourceRevisions:(NSSet<HKSourceRevision *> *)sourceRevisions API_AVAILABLE(ios(9.0), watchos(2.0));
++ (NSPredicate *)predicateForObjectsFromSourceRevisions:(NSSet<HKSourceRevision *> *)sourceRevisions API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@method predicateForObjectsFromDevices:
@@ -115,7 +115,7 @@
@param devices The set of devices that generated data.
*/
-+ (NSPredicate *)predicateForObjectsFromDevices:(NSSet<HKDevice *> *)devices API_AVAILABLE(ios(9.0), watchos(2.0));
++ (NSPredicate *)predicateForObjectsFromDevices:(NSSet<HKDevice *> *)devices API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@method predicateForObjectsWithDeviceProperty:allowedValues:
@@ -128,7 +128,7 @@
@param allowedValues The set of values for which the device property can match. An empty set will match all
devices whose property value is nil.
*/
-+ (NSPredicate *)predicateForObjectsWithDeviceProperty:(NSString *)key allowedValues:(NSSet<NSString *> *)allowedValues API_AVAILABLE(ios(9.0), watchos(2.0));
++ (NSPredicate *)predicateForObjectsWithDeviceProperty:(NSString *)key allowedValues:(NSSet<NSString *> *)allowedValues API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@method predicateForObjectWithUUID:
@@ -222,7 +222,18 @@
@param value The value that the sample's value is being compared to. It is the right hand side of the
expression.
*/
+#if defined(__swift__) && __swift__
++ (NSPredicate *)predicateForCategorySamplesWithOperatorType:(NSPredicateOperatorType)operatorType value:(NSInteger)value API_DEPRECATED("Use HKCategoryValuePredicateProviding.predicateForSamples(_:value:)", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
+#else
+ (NSPredicate *)predicateForCategorySamplesWithOperatorType:(NSPredicateOperatorType)operatorType value:(NSInteger)value;
+#endif // defined(__swift__) && __swift__
+
+/*!
+ @method predicateForCategorySamplesEqualToValues:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches all specified category values.
+ */
++ (NSPredicate *)predicateForCategorySamplesEqualToValues:(NSSet<NSNumber *> *)values NS_REFINED_FOR_SWIFT;
@end
@@ -257,7 +268,7 @@
@param totalEnergyBurned The value that the workout's totalEnergyBurned is being compared to. It is the right hand side of the
expression. The unit for this value should be of type Energy.
*/
-+ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType totalEnergyBurned:(HKQuantity *)totalEnergyBurned;
++ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType totalEnergyBurned:(HKQuantity *)totalEnergyBurned API_DEPRECATED("Use predicateForWorkoutActivitiesWithOperatorType:quantityType:sumQuantity: passing the HKQuantityType for HKQuantityTypeIdentifierActiveEnergyBurned", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED), macCatalyst(13.0, API_TO_BE_DEPRECATED), macos(13.0, API_TO_BE_DEPRECATED));
/*!
@method predicateForWorkoutsWithOperatorType:totalDistance:
@@ -268,8 +279,7 @@
@param totalDistance The value that the workout's totalEnergyBurned is being compared to. It is the right hand side of the
expression. The unit for this value should be of type Distance.
*/
-+ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType totalDistance:(HKQuantity *)totalDistance;
-
++ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType totalDistance:(HKQuantity *)totalDistance API_DEPRECATED("Use predicateForWorkoutActivitiesWithOperatorType:quantityType:sumQuantity: passing the HKQuantityType for the desired distance type", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED), macCatalyst(13.0, API_TO_BE_DEPRECATED), macos(13.0, API_TO_BE_DEPRECATED));
/*!
@method predicateForWorkoutsWithOperatorType:totalSwimmingStrokeCount:
@abstract Creates a predicate for use with HKQuery subclasses.
@@ -280,7 +290,7 @@
It is the right hand side of the expression. The unit for this value should
be of type Count.
*/
-+ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType totalSwimmingStrokeCount:(HKQuantity *)totalSwimmingStrokeCount;
++ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType totalSwimmingStrokeCount:(HKQuantity *)totalSwimmingStrokeCount API_DEPRECATED("Use predicateForWorkoutActivitiesWithOperatorType:quantityType:sumQuantity:", ios(10.0, API_TO_BE_DEPRECATED), watchos(3.0, API_TO_BE_DEPRECATED), macCatalyst(13.0, API_TO_BE_DEPRECATED), macos(13.0, API_TO_BE_DEPRECATED));
/*!
@method predicateForWorkoutsWithOperatorType:totalFlightsClimbed:
@@ -292,7 +302,182 @@
It is the right hand side of the expression. The unit for this value should
be of type Count.
*/
-+ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType totalFlightsClimbed:(HKQuantity *)totalFlightsClimbed API_AVAILABLE(ios(11.0), watchos(4.0));
++ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType totalFlightsClimbed:(HKQuantity *)totalFlightsClimbed API_DEPRECATED("Use predicateForWorkoutActivitiesWithOperatorType:quantityType:sumQuantity: passing the HKQuantityType for HKQuantityTypeIdentifierSwimmingStrokeCount", ios(11.0, API_TO_BE_DEPRECATED), watchos(4.0, API_TO_BE_DEPRECATED), macCatalyst(13.0, API_TO_BE_DEPRECATED), macos(13.0, API_TO_BE_DEPRECATED));
+
+/*!
+ @method predicateForWorkoutsWithOperatorType:quantityType:sumQuantity:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkouts by the given operator type and sumQuantity in the statistics for
+ the specified type.
+
+ @param operatorType The operator type for the expression.
+ @param quantityType The quantity type to compare statistics for. Should be a cumulative quantity type.
+ @param sumQuantity The sum value that the workout statistics are being compared to. The unit for this value should
+ match the allowed values for the quantityType.
+ */
++ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType
+ quantityType:(HKQuantityType *)quantityType
+ sumQuantity:(HKQuantity *)sumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkouts(operatorType:quantityType:sumQuantity:));
+
+/*!
+ @method predicateForWorkoutsWithOperatorType:quantityType:minimumQuantity:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkouts by the given operator type and minimumQuantity in the statistics
+ for the specified type.
+
+ @param operatorType The operator type for the expression.
+ @param quantityType The quantity type to compare statistics for. Should be a discrete quantity type.
+ @param minimumQuantity The minumum value that the workout statistics are being compared to. The unit for this value should
+ match the allowed values for the quantityType.
+ */
++ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType
+ quantityType:(HKQuantityType *)quantityType
+ minimumQuantity:(HKQuantity *)minimumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkouts(operatorType:quantityType:minimumQuantity:));
+
+/*!
+ @method predicateForWorkoutsWithOperatorType:quantityType:maximumQuantity:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkouts by the given operator type and maximumQuantity in the statistics
+ for the specified type.
+
+ @param operatorType The operator type for the expression.
+ @param quantityType The quantity type to compare statistics for. Should be a discrete quantity type.
+ @param maximumQuantity The maximum value that the workout statistics are being compared to. The unit for this value should
+ match the allowed values for the quantityType.
+ */
++ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType
+ quantityType:(HKQuantityType *)quantityType
+ maximumQuantity:(HKQuantity *)maximumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkouts(operatorType:quantityType:maximumQuantity:));
+
+/*!
+ @method predicateForWorkoutsWithOperatorType:quantityType:averageQuantity:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkouts by the given operator type and averageQuantity in the statistics
+ for the specified type.
+
+ @param operatorType The operator type for the expression.
+ @param quantityType The quantity type to compare statistics for. Should be a discrete quantity type.
+ @param averageQuantity The average value that the workout statistics are being compared to. The unit for this value should
+ match the allowed values for the quantityType.
+ */
++ (NSPredicate *)predicateForWorkoutsWithOperatorType:(NSPredicateOperatorType)operatorType
+ quantityType:(HKQuantityType *)quantityType
+ averageQuantity:(HKQuantity *)averageQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkouts(operatorType:quantityType:averageQuantity:));
+
+@end
+
+@interface HKQuery (HKWorkoutActivityPredicates)
+
+/*!
+ @method predicateForWorkoutActivitiesWithWorkoutActivityType:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkoutActivity objects with the given HKWorkoutActivityType.
+ The resulting predicate should be wrapped using predicateForWorkoutsWithActivityPredicate: before being used in a query.
+
+ @param workoutActivityType The HKWorkoutActivity type of the workout
+ */
++ (NSPredicate *)predicateForWorkoutActivitiesWithWorkoutActivityType:(HKWorkoutActivityType)workoutActivityType API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkoutActivities(workoutActivityType:));
+
+/*!
+ @method predicateForWorkoutActivitiesWithOperatorType:duration:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkoutActivity objects by the given operator type and duration.
+ The resulting predicate should be wrapped using predicateForWorkoutsWithActivityPredicate: before being used in a query.
+
+ @param operatorType The operator type for the expression.
+ @param duration The value that the workout's duration is being compared to. It is the right hand side of the
+ expression.
+ */
++ (NSPredicate *)predicateForWorkoutActivitiesWithOperatorType:(NSPredicateOperatorType)operatorType
+ duration:(NSTimeInterval)duration API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkoutActivities(operatorType:duration:));
+
+/*!
+ @method predicateForWorkoutActivitiesWithStartDate:endDate:options:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkoutActivity objects with a startDate and an endDate that lie inside of a
+ given time interval. The resulting predicate should be wrapped using predicateForWorkoutsWithActivityPredicate:
+ before being used in a query.
+
+ @param startDate The start date of the predicate's time interval.
+ @param endDate The end date of the predicate's time interval.
+ @param options The rules for how a activity's time interval overlaps with the predicate's time interval.
+ */
++ (NSPredicate *)predicateForWorkoutActivitiesWithStartDate:(nullable NSDate *)startDate
+ endDate:(nullable NSDate *)endDate
+ options:(HKQueryOptions)options API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkoutActivities(start:end:options:));
+
+/*!
+ @method predicateForWorkoutActivitiesWithOperatorType:quantityType:sumQuantity:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkoutActivity objetcs by the given operator type and sumQuantity in the
+ statistics for the specified type. The resulting predicate should be wrapped using predicateForWorkoutsWithActivityPredicate:
+ before being used in a query.
+
+ @param operatorType The operator type for the expression.
+ @param quantityType The quantity type to compare statistics for. Should be a cumulative quantity type.
+ @param sumQuantity The sum value that the activity statistics are being compared to. The unit for this value should
+ match the allowed values for the quantityType.
+ */
++ (NSPredicate *)predicateForWorkoutActivitiesWithOperatorType:(NSPredicateOperatorType)operatorType
+ quantityType:(HKQuantityType *)quantityType
+ sumQuantity:(HKQuantity *)sumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkoutActivities(operatorType:quantityType:sumQuantity:));
+
+/*!
+ @method predicateForWorkoutActivitiesWithOperatorType:quantityType:minimumQuantity:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkoutActivity objetcs by the given operator type and minimumQuantity in the
+ statistics for the specified type. The resulting predicate should be wrapped using predicateForWorkoutsWithActivityPredicate:
+ before being used in a query.
+
+ @param operatorType The operator type for the expression.
+ @param quantityType The quantity type to compare statistics for. Should be a discrete quantity type.
+ @param minimumQuantity The minumum value that the activty statistics are being compared to. The unit for this value should
+ match the allowed values for the quantityType.
+ */
++ (NSPredicate *)predicateForWorkoutActivitiesWithOperatorType:(NSPredicateOperatorType)operatorType
+ quantityType:(HKQuantityType *)quantityType
+ minimumQuantity:(HKQuantity *)minimumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkoutActivities(operatorType:quantityType:minimumQuantity:));
+
+/*!
+ @method predicateForWorkoutActivitiesWithOperatorType:quantityType:maximumQuantity:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkoutActivity objetcs by the given operator type and maximumQuantity in the
+ statistics for the specified type. The resulting predicate should be wrapped using predicateForWorkoutsWithActivityPredicate:
+ before being used in a query.
+
+ @param operatorType The operator type for the expression.
+ @param quantityType The quantity type to compare statistics for. Should be a discrete quantity type.
+ @param maximumQuantity The maximum value that the activity statistics are being compared to. The unit for this value should
+ match the allowed values for the quantityType.
+ */
++ (NSPredicate *)predicateForWorkoutActivitiesWithOperatorType:(NSPredicateOperatorType)operatorType
+ quantityType:(HKQuantityType *)quantityType
+ maximumQuantity:(HKQuantity *)maximumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkoutActivities(operatorType:quantityType:maximumQuantity:));
+
+/*!
+ @method predicateForWorkoutActivitiesWithOperatorType:quantityType:averageQuantity:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches HKWorkoutActivity objetcs by the given operator type and averageQuantity in the
+ statistics for the specified type. The resulting predicate should be wrapped using predicateForWorkoutsWithActivityPredicate:
+ before being used in a query.
+
+ @param operatorType The operator type for the expression.
+ @param quantityType The quantity type to compare statistics for. Should be a discrete quantity type.
+ @param averageQuantity The average value that the activity statistics are being compared to. The unit for this value should
+ match the allowed values for the quantityType.
+ */
++ (NSPredicate *)predicateForWorkoutActivitiesWithOperatorType:(NSPredicateOperatorType)operatorType
+ quantityType:(HKQuantityType *)quantityType
+ averageQuantity:(HKQuantity *)averageQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkoutActivities(operatorType:quantityType:averageQuantity:));
+
+/*!
+ @method predicateForWorkoutsWithActivityPredicate:
+ @abstract Creates a predicate for use with HKQuery subclasses.
+ @discussion Creates a query predicate that matches workouts containing an activity matching the passed predicate.
+
+ @param activityPredicate The predicate on the activities of the workout
+ */
++ (NSPredicate *)predicateForWorkoutsWithActivityPredicate:(NSPredicate *)activityPredicate API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(predicateForWorkouts(activityPredicate:));
@end
@@ -306,7 +491,7 @@
@param dateComponents The date components of the activity summary. These date components should contain era, year, month,
and day components in the gregorian calendar.
*/
-+ (NSPredicate *)predicateForActivitySummaryWithDateComponents:(NSDateComponents *)dateComponents API_AVAILABLE(ios(9.3), watchos(2.2));
++ (NSPredicate *)predicateForActivitySummaryWithDateComponents:(NSDateComponents *)dateComponents API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(13.0), macos(13.0));
/*!
@method predicateForActivitySummariesBetweenStartDateComponents:endDateComponents:
@@ -319,7 +504,7 @@
@param endDateComponents The date components that define the end of the range. These date components should contain era,
year, month, and day components in the gregorian calendar.
*/
-+ (NSPredicate *)predicateForActivitySummariesBetweenStartDateComponents:(NSDateComponents *)startDateComponents endDateComponents:(NSDateComponents *)endDateComponents API_AVAILABLE(ios(9.3), watchos(2.2));
++ (NSPredicate *)predicateForActivitySummariesBetweenStartDateComponents:(NSDateComponents *)startDateComponents endDateComponents:(NSDateComponents *)endDateComponents API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(13.0), macos(13.0));
@end
@@ -332,7 +517,7 @@
@param resourceType The FHIR resource type.
*/
-+ (NSPredicate *)predicateForClinicalRecordsWithFHIRResourceType:(HKFHIRResourceType)resourceType API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
++ (NSPredicate *)predicateForClinicalRecordsWithFHIRResourceType:(HKFHIRResourceType)resourceType API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
/*!
@method predicateForClinicalRecordsFromSource:withFHIRResourceType:identifier:
@@ -345,7 +530,7 @@
*/
+ (NSPredicate *)predicateForClinicalRecordsFromSource:(HKSource *)source
FHIRResourceType:(HKFHIRResourceType)resourceType
- identifier:(NSString *)identifier API_AVAILABLE(ios(12.0)) API_UNAVAILABLE(watchos);
+ identifier:(NSString *)identifier API_AVAILABLE(ios(12.0), macCatalyst(13.0), macos(13.0)) API_UNAVAILABLE(watchos);
@end
@@ -358,7 +543,7 @@
@param classification The classification for the electrocardiogram.
*/
-+ (NSPredicate *)predicateForElectrocardiogramsWithClassification:(HKElectrocardiogramClassification)classification API_AVAILABLE(ios(14.0), watchos(7.0)) NS_SWIFT_NAME(predicateForElectrocardiograms(classification:));
++ (NSPredicate *)predicateForElectrocardiogramsWithClassification:(HKElectrocardiogramClassification)classification API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)) NS_SWIFT_NAME(predicateForElectrocardiograms(classification:));
/*!
@method predicateForElectrocardiogramsWithSymptomsStatus:
@@ -367,7 +552,7 @@
@param symptomsStatus The symptoms status for the electrocardiogram.
*/
-+ (NSPredicate *)predicateForElectrocardiogramsWithSymptomsStatus:(HKElectrocardiogramSymptomsStatus)symptomsStatus API_AVAILABLE(ios(14.0), watchos(7.0)) NS_SWIFT_NAME(predicateForElectrocardiograms(symptomsStatus:));
++ (NSPredicate *)predicateForElectrocardiogramsWithSymptomsStatus:(HKElectrocardiogramSymptomsStatus)symptomsStatus API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)) NS_SWIFT_NAME(predicateForElectrocardiograms(symptomsStatus:));
@end
@@ -380,7 +565,7 @@
@param dateInterval The date interval that the record's relevant date is in.
*/
-+ (NSPredicate *)predicateForVerifiableClinicalRecordsWithRelevantDateWithinDateInterval:(NSDateInterval *)dateInterval API_AVAILABLE(ios(15.0)) NS_SWIFT_NAME(predicateForVerifiableClinicalRecords(withRelevantDateWithin:));
++ (NSPredicate *)predicateForVerifiableClinicalRecordsWithRelevantDateWithinDateInterval:(NSDateInterval *)dateInterval API_AVAILABLE(ios(15.0), macCatalyst(15.0), macos(13.0)) NS_SWIFT_NAME(predicateForVerifiableClinicalRecords(withRelevantDateWithin:));
@end
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQueryAnchor.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQueryAnchor.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQueryAnchor.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQueryAnchor.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,7 +2,7 @@
// HKQueryAnchor.h
// HealthKit
//
-// Copyright © 2019 Apple. All rights reserved.
+// Copyright © 2019-2022 Apple. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -14,7 +14,7 @@
@class HKQueryAnchor
@discussion This object encapsulates the state of an HKAnchoredObjectQuery
*/
-HK_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKQueryAnchor : NSObject <NSSecureCoding, NSCopying>
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQueryDescriptor.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQueryDescriptor.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQueryDescriptor.h 2022-02-23 07:59:07.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKQueryDescriptor.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKQueryDescriptor.h
// HealthKit
//
-// Copyright © 2021 Apple. All rights reserved.
+// Copyright © 2021-2022 Apple. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -10,7 +10,7 @@
NS_ASSUME_NONNULL_BEGIN
-HK_EXTERN API_AVAILABLE(ios(15.0), watchos(8.0))
+HK_EXTERN API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0))
@interface HKQueryDescriptor : NSObject<NSCopying, NSSecureCoding>
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSample.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSample.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSample.h 2022-02-23 07:59:07.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSample.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,7 +2,7 @@
// HKSample.h
// HealthKit
//
-// Copyright (c) 2014-2018 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKObject.h>
@@ -15,7 +15,7 @@
@class HKSample
@abstract An abstract class representing measurements taken over a period of time.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKSample : HKObject
@property (readonly, copy) HKSampleType *sampleType;
@@ -28,17 +28,17 @@
@abstract Indicates whether a sample has an undetermined duration.
@discussion Computed based on the endDate of a sample.
*/
-@property (readonly) BOOL hasUndeterminedDuration API_AVAILABLE(ios(14.3), watchos(7.2));
+@property (readonly) BOOL hasUndeterminedDuration API_AVAILABLE(ios(14.3), watchos(7.2), macCatalyst(14.3), macos(13.0));
@end
// Sort Identifiers
-HK_EXTERN NSString * const HKSampleSortIdentifierStartDate API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKSampleSortIdentifierEndDate API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKSampleSortIdentifierStartDate API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKSampleSortIdentifierEndDate API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
// Predicate Key Paths
-HK_EXTERN NSString * const HKPredicateKeyPathStartDate API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathEndDate API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKPredicateKeyPathStartDate API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathEndDate API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSampleQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSampleQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSampleQuery.h 2022-02-23 10:58:55.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSampleQuery.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKSampleQuery.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -21,7 +21,7 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKSampleQueryDescriptor", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(8.0), watchos(2.0))
+API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
#endif
@interface HKSampleQuery : HKQuery
@@ -67,7 +67,7 @@
*/
- (instancetype)initWithQueryDescriptors:(NSArray<HKQueryDescriptor *> *)queryDescriptors
limit:(NSInteger)limit
- resultsHandler:(void(^)(HKSampleQuery *query, NSArray<__kindof HKSample *> * _Nullable results, NSError * _Nullable error))resultsHandler API_AVAILABLE(ios(15.0), watchos(8.0));
+ resultsHandler:(void(^)(HKSampleQuery *query, NSArray<__kindof HKSample *> * _Nullable results, NSError * _Nullable error))resultsHandler API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
/*!
@method initWithQueryDescriptors:limit:sortDescriptors:resultsHandler:
@@ -86,7 +86,7 @@
- (instancetype)initWithQueryDescriptors:(NSArray<HKQueryDescriptor *> *)queryDescriptors
limit:(NSInteger)limit
sortDescriptors:(NSArray<NSSortDescriptor *> *)sortDescriptors
- resultsHandler:(void(^)(HKSampleQuery *query, NSArray<__kindof HKSample *> * _Nullable results, NSError * _Nullable error))resultsHandler API_AVAILABLE(ios(15.0), watchos(8.0));
+ resultsHandler:(void(^)(HKSampleQuery *query, NSArray<__kindof HKSample *> * _Nullable results, NSError * _Nullable error))resultsHandler API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0));
@end
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSource.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSource.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSource.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSource.h 2022-05-31 14:51:52.000000000 -0400
@@ -2,7 +2,7 @@
// HKSource.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -13,7 +13,7 @@
@class HKSource
@abstract Represents the entity that created an object stored by HealthKit.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKSource : NSObject <NSSecureCoding, NSCopying>
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSourceQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSourceQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSourceQuery.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSourceQuery.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKSourceQuery.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -17,7 +17,7 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKSourceQueryDescriptor", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(8.0), watchos(2.0))
+API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
#endif
@interface HKSourceQuery : HKQuery
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSourceRevision.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSourceRevision.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSourceRevision.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKSourceRevision.h 2022-05-31 14:51:55.000000000 -0400
@@ -2,7 +2,7 @@
// HKSourceRevision.h
// HealthKit
//
-// Copyright © 2015 Apple. All rights reserved.
+// Copyright © 2015-2022 Apple. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -16,7 +16,7 @@
@abstract Represents a specific revision of an HKSource.
*/
-HK_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKSourceRevision : NSObject <NSSecureCoding, NSCopying>
/*!
@@ -37,7 +37,7 @@
@abstract Represents the product type of the device running HealthKit when the object was created.
@discussion This value may be nil for older data, which indicates an unknown product type.
*/
-@property (readonly, copy, nullable) NSString *productType API_AVAILABLE(ios(11.0), watchos(4.0));
+@property (readonly, copy, nullable) NSString *productType API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@property operatingSystemVersion
@@ -45,7 +45,7 @@
@discussion iOS versions after 8.0 but prior to 8.2 are saved as 8.0, and iOS version after 8.2 but prior to 9.0
are saved as 8.2.
*/
-@property (readonly, assign) NSOperatingSystemVersion operatingSystemVersion API_AVAILABLE(ios(11.0), watchos(4.0));
+@property (readonly, assign) NSOperatingSystemVersion operatingSystemVersion API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@method initWithSource:version:productType:operatingSystemVersion:
@@ -55,7 +55,7 @@
- (instancetype)initWithSource:(HKSource *)source
version:(nullable NSString *)version
productType:(nullable NSString *)productType
- operatingSystemVersion:(NSOperatingSystemVersion)operatingSystemVersion API_AVAILABLE(ios(11.0), watchos(4.0));
+ operatingSystemVersion:(NSOperatingSystemVersion)operatingSystemVersion API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@method initWithSource:version:
@@ -68,8 +68,8 @@
@end
// Constants to match on any value of that property when querying for samples from an HKSourceRevision
-HK_EXTERN NSString * const HKSourceRevisionAnyVersion API_AVAILABLE(ios(11.0), watchos(4.0));
-HK_EXTERN NSString * const HKSourceRevisionAnyProductType API_AVAILABLE(ios(11.0), watchos(4.0));
-HK_EXTERN NSOperatingSystemVersion const HKSourceRevisionAnyOperatingSystem API_AVAILABLE(ios(11.0), watchos(4.0));
+HK_EXTERN NSString * const HKSourceRevisionAnyVersion API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKSourceRevisionAnyProductType API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSOperatingSystemVersion const HKSourceRevisionAnyOperatingSystem API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatistics.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatistics.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatistics.h 2022-02-23 07:13:47.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatistics.h 2022-05-31 15:02:17.000000000 -0400
@@ -2,7 +2,7 @@
// HKStatistics.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -39,16 +39,16 @@
HKStatisticsOptionDiscreteMin = 1 << 2,
HKStatisticsOptionDiscreteMax = 1 << 3,
HKStatisticsOptionCumulativeSum = 1 << 4,
- HKStatisticsOptionMostRecent API_AVAILABLE(ios(13.0), watchos(6.0)) = 1 << 5,
+ HKStatisticsOptionMostRecent API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)) = 1 << 5,
HKStatisticsOptionDiscreteMostRecent API_DEPRECATED_WITH_REPLACEMENT("HKStatisticsOptionMostRecent", ios(12.0, 13.0), watchos(5.0, 6.0)) = HKStatisticsOptionMostRecent,
- HKStatisticsOptionDuration API_AVAILABLE(ios(13.0), watchos(6.0)) = 1 << 6,
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+ HKStatisticsOptionDuration API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)) = 1 << 6,
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@class HKStatistics
@abstract Represents statistics for quantity samples over a period of time.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKStatistics : NSObject <NSSecureCoding, NSCopying>
@property (readonly, strong) HKQuantityType *quantityType;
@@ -105,13 +105,13 @@
@abstract Returns the most recent quantity for the given source in the time period represented by the receiver.
@discussion If HKStatisticsOptionSeparateBySource is not specified, then this will always be nil.
*/
-- (nullable HKQuantity *)mostRecentQuantityForSource:(HKSource *)source API_AVAILABLE(ios(12.0), watchos(5.0));
+- (nullable HKQuantity *)mostRecentQuantityForSource:(HKSource *)source API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
/*!
@method mostRecentQuantity
@abstract Returns the most recent quantity in the time period represented by the receiver.
*/
-- (nullable HKQuantity *)mostRecentQuantity API_AVAILABLE(ios(12.0), watchos(5.0));
+- (nullable HKQuantity *)mostRecentQuantity API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
/*!
@method mostRecentQuantityDateIntervalForSource:
@@ -119,13 +119,13 @@
represented by the receiver.
@discussion If HKStatisticsOptionSeparateBySource is not specified, then this will always be nil.
*/
-- (nullable NSDateInterval *)mostRecentQuantityDateIntervalForSource:(HKSource *)source API_AVAILABLE(ios(12.0), watchos(5.0));
+- (nullable NSDateInterval *)mostRecentQuantityDateIntervalForSource:(HKSource *)source API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
/*!
@method mostRecentQuantityDateInterval
@abstract Returns the date interval of the most recent quantity in the time period represented by the receiver.
*/
-- (nullable NSDateInterval *)mostRecentQuantityDateInterval API_AVAILABLE(ios(12.0), watchos(5.0));
+- (nullable NSDateInterval *)mostRecentQuantityDateInterval API_AVAILABLE(ios(12.0), watchos(5.0), macCatalyst(13.0), macos(13.0));
/* Cumulative Quantities */
@@ -149,14 +149,14 @@
@abstract Total duration, as a time-unit compatible quantity, covered by the samples represented by these statistics.
@discussion Only present if HKStatisticsOptionDuration is is specified.
*/
-- (nullable HKQuantity *)duration API_AVAILABLE(ios(13.0), watchos(6.0));
+- (nullable HKQuantity *)duration API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
/*!
@method durationForSource:
@abstract Returns the duration, as a time-unit compatible quantity, for the given source in the time period represented by the receiver.
@discussion If HKStatisticsOptionSeparateBySource is not specified, then this will always be nil.
*/
-- (nullable HKQuantity *)durationForSource:(HKSource *)source API_AVAILABLE(ios(13.0), watchos(6.0));
+- (nullable HKQuantity *)durationForSource:(HKSource *)source API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
@end
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatisticsCollectionQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatisticsCollectionQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatisticsCollectionQuery.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatisticsCollectionQuery.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKStatisticsCollectionQuery.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKStatistics.h>
@@ -12,7 +12,7 @@
@class HKStatistics;
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKStatisticsCollection : NSObject
- (instancetype)init NS_UNAVAILABLE;
@@ -53,7 +53,7 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKStatisticsCollectionQueryDescriptor", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(8.0), watchos(2.0))
+API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
#endif
@interface HKStatisticsCollectionQuery : HKQuery
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatisticsQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatisticsQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatisticsQuery.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKStatisticsQuery.h 2022-05-31 14:51:52.000000000 -0400
@@ -2,7 +2,7 @@
// HKStatisticsQuery.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -20,7 +20,7 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKStatisticsQueryDescriptor", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(8.0), watchos(2.0))
+API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
#endif
@interface HKStatisticsQuery : HKQuery
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKTypeIdentifiers.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKTypeIdentifiers.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKTypeIdentifiers.h 2022-02-23 07:55:55.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKTypeIdentifiers.h 2022-05-31 15:02:16.000000000 -0400
@@ -2,7 +2,7 @@
// HKTypeIdentifiers
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -17,112 +17,122 @@
typedef NSString * HKQuantityTypeIdentifier NS_STRING_ENUM;
// Body Measurements
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBodyMassIndex API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Count), Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBodyFatPercentage API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierHeight API_AVAILABLE(ios(8.0), watchos(2.0)); // Length, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBodyMass API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierLeanBodyMass API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWaistCircumference API_AVAILABLE(ios(11.0), watchos(4.0)); // Length, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBodyMassIndex API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBodyFatPercentage API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierHeight API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Length, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBodyMass API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierLeanBodyMass API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWaistCircumference API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)); // Length, Discrete
// Fitness
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierStepCount API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Count), Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDistanceWalkingRunning API_AVAILABLE(ios(8.0), watchos(2.0)); // Length, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDistanceCycling API_AVAILABLE(ios(8.0), watchos(2.0)); // Length, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDistanceWheelchair API_AVAILABLE(ios(10.0), watchos(3.0)); // Length, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBasalEnergyBurned API_AVAILABLE(ios(8.0), watchos(2.0)); // Energy, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierActiveEnergyBurned API_AVAILABLE(ios(8.0), watchos(2.0)); // Energy, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierFlightsClimbed API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Count), Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierNikeFuel API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Count), Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierAppleExerciseTime API_AVAILABLE(ios(9.3), watchos(2.2)); // Time Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierPushCount API_AVAILABLE(ios(10.0), watchos(3.0)); // Scalar(Count), Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDistanceSwimming API_AVAILABLE(ios(10.0), watchos(3.0)); // Length, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierSwimmingStrokeCount API_AVAILABLE(ios(10.0), watchos(3.0)); // Scalar(Count), Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierVO2Max API_AVAILABLE(ios(11.0), watchos(4.0)); // ml/(kg*min) Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDistanceDownhillSnowSports API_AVAILABLE(ios(11.2), watchos(4.2)); // Length, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierAppleStandTime API_AVAILABLE(ios(13.0), watchos(6.0)); // Time, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWalkingSpeed API_AVAILABLE(ios(14.0), watchos(7.0)); // m/s, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWalkingDoubleSupportPercentage API_AVAILABLE(ios(14.0), watchos(7.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWalkingAsymmetryPercentage API_AVAILABLE(ios(14.0), watchos(7.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWalkingStepLength API_AVAILABLE(ios(14.0), watchos(7.0)); // Length, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierSixMinuteWalkTestDistance API_AVAILABLE(ios(14.0), watchos(7.0)); // Length, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierStairAscentSpeed API_AVAILABLE(ios(14.0), watchos(7.0)); // m/s, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierStairDescentSpeed API_AVAILABLE(ios(14.0), watchos(7.0)); // m/s), Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierAppleMoveTime API_AVAILABLE(ios(14.5), watchos(7.4)); // Time, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierAppleWalkingSteadiness API_AVAILABLE(ios(15.0), watchos(8.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierStepCount API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count), Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDistanceWalkingRunning API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Length, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDistanceCycling API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Length, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDistanceWheelchair API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)); // Length, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBasalEnergyBurned API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Energy, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierActiveEnergyBurned API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Energy, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierFlightsClimbed API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count), Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierNikeFuel API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count), Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierAppleExerciseTime API_AVAILABLE(ios(9.3), watchos(2.2), macCatalyst(13.0), macos(13.0)); // Time Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierPushCount API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count), Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDistanceSwimming API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)); // Length, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierSwimmingStrokeCount API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count), Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierVO2Max API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)); // ml/(kg*min) Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDistanceDownhillSnowSports API_AVAILABLE(ios(11.2), watchos(4.2), macCatalyst(13.0), macos(13.0)); // Length, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierAppleStandTime API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)); // Time, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWalkingSpeed API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // m/s, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWalkingDoubleSupportPercentage API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWalkingAsymmetryPercentage API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWalkingStepLength API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // Length, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierSixMinuteWalkTestDistance API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // Length, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierStairAscentSpeed API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // m/s, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierStairDescentSpeed API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // m/s), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierAppleMoveTime API_AVAILABLE(ios(14.5), watchos(7.4), macCatalyst(14.5), macos(13.0)); // Time, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierAppleWalkingSteadiness API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierRunningStrideLength API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // Length, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierRunningVerticalOscillation API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // Length, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierRunningGroundContactTime API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // Time, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierRunningPower API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // Power Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierRunningSpeed API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // m/s, Discrete
// Vitals
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierHeartRate API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Count)/Time, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBodyTemperature API_AVAILABLE(ios(8.0), watchos(2.0)); // Temperature, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBasalBodyTemperature API_AVAILABLE(ios(9.0), watchos(2.0)); // Basal Body Temperature, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBloodPressureSystolic API_AVAILABLE(ios(8.0), watchos(2.0)); // Pressure, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBloodPressureDiastolic API_AVAILABLE(ios(8.0), watchos(2.0)); // Pressure, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierRespiratoryRate API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Count)/Time, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierHeartRate API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count)/Time, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBodyTemperature API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Temperature, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBasalBodyTemperature API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Basal Body Temperature, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBloodPressureSystolic API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Pressure, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBloodPressureDiastolic API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Pressure, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierRespiratoryRate API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count)/Time, Discrete
// Beats per minute estimate of a user's lowest heart rate while at rest
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierRestingHeartRate API_AVAILABLE(ios(11.0), watchos(4.0)); // Scalar(Count)/Time, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierRestingHeartRate API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count)/Time, Discrete
// Average heartbeats per minute captured by an Apple Watch while a user is walking
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWalkingHeartRateAverage API_AVAILABLE(ios(11.0), watchos(4.0)); // Scalar(Count)/Time, Discrete
-// The standard deviation of heart beat-to-beat intevals (Standard Deviation of Normal to Normal)
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierHeartRateVariabilitySDNN API_AVAILABLE(ios(11.0), watchos(4.0)); // Time (ms), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierWalkingHeartRateAverage API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count)/Time, Discrete
+// The standard deviation of heart beat-to-beat intervals (Standard Deviation of Normal to Normal)
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierHeartRateVariabilitySDNN API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)); // Time (ms), Discrete
+// The decrease in heart rate from the rate at peak exercise to the rate 1 minute after the cessation of exercise. Always a positive value.
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierHeartRateRecoveryOneMinute API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // Scalar(Count)/Time, Discrete
// Results
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierOxygenSaturation API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierPeripheralPerfusionIndex API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBloodGlucose API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass/Volume, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierNumberOfTimesFallen API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Count), Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierElectrodermalActivity API_AVAILABLE(ios(8.0), watchos(2.0)); // Conductance, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierInhalerUsage API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Count), Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierInsulinDelivery API_AVAILABLE(ios(11.0), watchos(4.0)); // Pharmacology (IU) Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBloodAlcoholContent API_AVAILABLE(ios(8.0), watchos(2.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierForcedVitalCapacity API_AVAILABLE(ios(8.0), watchos(2.0)); // Volume, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierForcedExpiratoryVolume1 API_AVAILABLE(ios(8.0), watchos(2.0)); // Volume, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierPeakExpiratoryFlowRate API_AVAILABLE(ios(8.0), watchos(2.0)); // Volume/Time, Discrete
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierEnvironmentalAudioExposure API_AVAILABLE(ios(13.0), watchos(6.0)); // Pressure, DiscreteEquivalentContinuousLevel
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierHeadphoneAudioExposure API_AVAILABLE(ios(13.0), watchos(6.0)); // Pressure, DiscreteEquivalentContinuousLevel
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierNumberOfAlcoholicBeverages API_AVAILABLE(ios(15.0), watchos(8.0)); // Scalar(Count), Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierOxygenSaturation API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierPeripheralPerfusionIndex API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBloodGlucose API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass/Volume, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierNumberOfTimesFallen API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count), Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierElectrodermalActivity API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Conductance, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierInhalerUsage API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count), Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierInsulinDelivery API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)); // Pharmacology (IU) Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierBloodAlcoholContent API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Percent, 0.0 - 1.0), Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierForcedVitalCapacity API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Volume, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierForcedExpiratoryVolume1 API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Volume, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierPeakExpiratoryFlowRate API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Volume/Time, Discrete
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierEnvironmentalAudioExposure API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)); // Pressure, DiscreteEquivalentContinuousLevel
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierHeadphoneAudioExposure API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)); // Pressure, DiscreteEquivalentContinuousLevel
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierNumberOfAlcoholicBeverages API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0)); // Scalar(Count), Cumulative
+
// Nutrition
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFatTotal API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFatPolyunsaturated API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFatMonounsaturated API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFatSaturated API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryCholesterol API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietarySodium API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryCarbohydrates API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFiber API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietarySugar API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryEnergyConsumed API_AVAILABLE(ios(8.0), watchos(2.0)); // Energy, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryProtein API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminA API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminB6 API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminB12 API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminC API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminD API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminE API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminK API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryCalcium API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryIron API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryThiamin API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryRiboflavin API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryNiacin API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFolate API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryBiotin API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryPantothenicAcid API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryPhosphorus API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryIodine API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryMagnesium API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryZinc API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietarySelenium API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryCopper API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryManganese API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryChromium API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryMolybdenum API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryChloride API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryPotassium API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryCaffeine API_AVAILABLE(ios(8.0), watchos(2.0)); // Mass, Cumulative
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryWater API_AVAILABLE(ios(9.0), watchos(2.0)); // Volume, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFatTotal API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFatPolyunsaturated API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFatMonounsaturated API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFatSaturated API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryCholesterol API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietarySodium API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryCarbohydrates API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFiber API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietarySugar API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryEnergyConsumed API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Energy, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryProtein API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminA API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminB6 API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminB12 API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminC API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminD API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminE API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryVitaminK API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryCalcium API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryIron API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryThiamin API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryRiboflavin API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryNiacin API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryFolate API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryBiotin API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryPantothenicAcid API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryPhosphorus API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryIodine API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryMagnesium API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryZinc API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietarySelenium API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryCopper API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryManganese API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryChromium API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryMolybdenum API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryChloride API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryPotassium API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryCaffeine API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Mass, Cumulative
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierDietaryWater API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Volume, Cumulative
+
+HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierUVExposure API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // Scalar(Count), Discrete
+
-HK_EXTERN HKQuantityTypeIdentifier const HKQuantityTypeIdentifierUVExposure API_AVAILABLE(ios(9.0), watchos(2.0)); // Scalar(Count), Discrete
/*--------------------------------*/
/* HKCategoryType Identifiers */
@@ -130,71 +140,71 @@
typedef NSString * HKCategoryTypeIdentifier NS_STRING_ENUM;
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSleepAnalysis API_AVAILABLE(ios(8.0), watchos(2.0)); // HKCategoryValueSleepAnalysis
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAppleStandHour API_AVAILABLE(ios(9.0), watchos(2.0)); // HKCategoryValueAppleStandHour
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierCervicalMucusQuality API_AVAILABLE(ios(9.0), watchos(2.0)); // HKCategoryValueCervicalMucusQuality
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierOvulationTestResult API_AVAILABLE(ios(9.0), watchos(2.0)); // HKCategoryValueOvulationTestResult
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierPregnancyTestResult API_AVAILABLE(ios(15.0), watchos(8.0)); // HKCategoryValuePregnancyTestResult
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierProgesteroneTestResult API_AVAILABLE(ios(15.0), watchos(8.0)); // HKCategoryValueProgesteroneTestResult
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierMenstrualFlow API_AVAILABLE(ios(9.0), watchos(2.0)); // HKCategoryValueMenstrualFlow
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierIntermenstrualBleeding API_AVAILABLE(ios(9.0), watchos(2.0)); // (Spotting) HKCategoryValue
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSexualActivity API_AVAILABLE(ios(9.0), watchos(2.0)); // HKCategoryValue
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierMindfulSession API_AVAILABLE(ios(10.0), watchos(3.0)); // HKCategoryValue
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHighHeartRateEvent API_AVAILABLE(ios(12.2), watchos(5.2)); // HKCategoryValue
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLowHeartRateEvent API_AVAILABLE(ios(12.2), watchos(5.2)); // HKCategoryValue
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierIrregularHeartRhythmEvent API_AVAILABLE(ios(12.2), watchos(5.2)); // HKCategoryValue
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSleepAnalysis API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // HKCategoryValueSleepAnalysis
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAppleStandHour API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // HKCategoryValueAppleStandHour
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierCervicalMucusQuality API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // HKCategoryValueCervicalMucusQuality
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierOvulationTestResult API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // HKCategoryValueOvulationTestResult
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierPregnancyTestResult API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0)); // HKCategoryValuePregnancyTestResult
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierProgesteroneTestResult API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0)); // HKCategoryValueProgesteroneTestResult
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierMenstrualFlow API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // HKCategoryValueMenstrualFlow
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierIntermenstrualBleeding API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // (Spotting) HKCategoryValue
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSexualActivity API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // HKCategoryValue
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierMindfulSession API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)); // HKCategoryValue
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHighHeartRateEvent API_AVAILABLE(ios(12.2), watchos(5.2), macCatalyst(13.0), macos(13.0)); // HKCategoryValue
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLowHeartRateEvent API_AVAILABLE(ios(12.2), watchos(5.2), macCatalyst(13.0), macos(13.0)); // HKCategoryValue
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierIrregularHeartRhythmEvent API_AVAILABLE(ios(12.2), watchos(5.2), macCatalyst(13.0), macos(13.0)); // HKCategoryValue
HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAudioExposureEvent // HKCategoryValueAudioExposureEvent
API_DEPRECATED_WITH_REPLACEMENT("HKCategoryTypeIdentifierEnvironmentalAudioExposureEvent", ios(13.0, 14.0), watchos(6.0, 7.0));
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierToothbrushingEvent API_AVAILABLE(ios(13.0), watchos(6.0)); // HKCategoryValue
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierPregnancy API_AVAILABLE(ios(14.3), watchos(7.2)); // HKCategoryValue
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLactation API_AVAILABLE(ios(14.3), watchos(7.2)); // HKCategoryValue
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierContraceptive API_AVAILABLE(ios(14.3), watchos(7.2)); // HKCategoryValueContraceptive
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierEnvironmentalAudioExposureEvent API_AVAILABLE(ios(14.0), watchos(7.0)); // HKCategoryValueEnvironmentalAudioExposureEvent
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHeadphoneAudioExposureEvent API_AVAILABLE(ios(14.2), watchos(7.1)); // HKCategoryValueHeadphoneAudioExposureEvent
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHandwashingEvent API_AVAILABLE(ios(14.0), watchos(7.0)); // HKCategoryValue
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLowCardioFitnessEvent API_AVAILABLE(ios(14.3), watchos(7.2));
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAppleWalkingSteadinessEvent API_AVAILABLE(ios(15.0), watchos(8.0)); // HKCategoryValueAppleWalkingSteadinessEvent
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierToothbrushingEvent API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)); // HKCategoryValue
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierPregnancy API_AVAILABLE(ios(14.3), watchos(7.2), macCatalyst(14.3), macos(13.0)); // HKCategoryValue
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLactation API_AVAILABLE(ios(14.3), watchos(7.2), macCatalyst(14.3), macos(13.0)); // HKCategoryValue
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierContraceptive API_AVAILABLE(ios(14.3), watchos(7.2), macCatalyst(13.0), macos(13.0)); // HKCategoryValueContraceptive
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierEnvironmentalAudioExposureEvent API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // HKCategoryValueEnvironmentalAudioExposureEvent
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHeadphoneAudioExposureEvent API_AVAILABLE(ios(14.2), watchos(7.1), macCatalyst(14.2), macos(13.0)); // HKCategoryValueHeadphoneAudioExposureEvent
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHandwashingEvent API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // HKCategoryValue
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLowCardioFitnessEvent API_AVAILABLE(ios(14.3), watchos(7.2), macCatalyst(14.3), macos(13.0));
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAppleWalkingSteadinessEvent API_AVAILABLE(ios(15.0), watchos(8.0), macCatalyst(15.0), macos(13.0)); // HKCategoryValueAppleWalkingSteadinessEvent
// Symptoms
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAbdominalCramps API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAcne API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAppetiteChanges API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueAppetiteChanges
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierBladderIncontinence API_AVAILABLE(ios(14.0), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierBloating API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierBreastPain API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierChestTightnessOrPain API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierChills API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierConstipation API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierCoughing API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierDiarrhea API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierDizziness API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierDrySkin API_AVAILABLE(ios(14.0), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierFainting API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierFatigue API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierFever API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierGeneralizedBodyAche API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHairLoss API_AVAILABLE(ios(14.0), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHeadache API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHeartburn API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHotFlashes API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLossOfSmell API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLossOfTaste API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLowerBackPain API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierMemoryLapse API_AVAILABLE(ios(14.0), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierMoodChanges API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValuePresence
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierNausea API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierNightSweats API_AVAILABLE(ios(14.0), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierPelvicPain API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierRapidPoundingOrFlutteringHeartbeat API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierRunnyNose API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierShortnessOfBreath API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSinusCongestion API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSkippedHeartbeat API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSleepChanges API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValuePresence
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSoreThroat API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierVaginalDryness API_AVAILABLE(ios(14.0), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierVomiting API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
-HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierWheezing API_AVAILABLE(ios(13.6), watchos(7.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAbdominalCramps API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAcne API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierAppetiteChanges API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueAppetiteChanges
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierBladderIncontinence API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierBloating API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierBreastPain API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierChestTightnessOrPain API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierChills API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierConstipation API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierCoughing API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierDiarrhea API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierDizziness API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierDrySkin API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierFainting API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierFatigue API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierFever API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierGeneralizedBodyAche API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHairLoss API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHeadache API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHeartburn API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierHotFlashes API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLossOfSmell API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLossOfTaste API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierLowerBackPain API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierMemoryLapse API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierMoodChanges API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValuePresence
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierNausea API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierNightSweats API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierPelvicPain API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierRapidPoundingOrFlutteringHeartbeat API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierRunnyNose API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierShortnessOfBreath API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSinusCongestion API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSkippedHeartbeat API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSleepChanges API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValuePresence
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierSoreThroat API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierVaginalDryness API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierVomiting API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
+HK_EXTERN HKCategoryTypeIdentifier const HKCategoryTypeIdentifierWheezing API_AVAILABLE(ios(13.6), watchos(7.0), macCatalyst(13.6), macos(13.0)); // HKCategoryValueSeverity
/*--------------------------------------*/
@@ -203,12 +213,12 @@
typedef NSString * HKCharacteristicTypeIdentifier NS_STRING_ENUM;
-HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierBiologicalSex API_AVAILABLE(ios(8.0), watchos(2.0)); // HKBiologicalSexObject
-HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierBloodType API_AVAILABLE(ios(8.0), watchos(2.0)); // HKBloodTypeObject
-HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierDateOfBirth API_AVAILABLE(ios(8.0), watchos(2.0)); // NSDateComponents
-HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierFitzpatrickSkinType API_AVAILABLE(ios(9.0), watchos(2.0)); // HKFitzpatrickSkinTypeObject
-HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierWheelchairUse API_AVAILABLE(ios(10.0), watchos(3.0)); // HKWheelchairUseObject
-HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierActivityMoveMode API_AVAILABLE(ios(14.0), watchos(7.0)); // HKActivityMoveModeObject
+HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierBiologicalSex API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // HKBiologicalSexObject
+HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierBloodType API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // HKBloodTypeObject
+HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierDateOfBirth API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // NSDateComponents
+HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierFitzpatrickSkinType API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // HKFitzpatrickSkinTypeObject
+HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierWheelchairUse API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)); // HKWheelchairUseObject
+HK_EXTERN HKCharacteristicTypeIdentifier const HKCharacteristicTypeIdentifierActivityMoveMode API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // HKActivityMoveModeObject
/*-----------------------------------*/
/* HKCorrelationType Identifiers */
@@ -216,8 +226,8 @@
typedef NSString * HKCorrelationTypeIdentifier NS_STRING_ENUM;
-HK_EXTERN HKCorrelationTypeIdentifier const HKCorrelationTypeIdentifierBloodPressure API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN HKCorrelationTypeIdentifier const HKCorrelationTypeIdentifierFood API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN HKCorrelationTypeIdentifier const HKCorrelationTypeIdentifierBloodPressure API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN HKCorrelationTypeIdentifier const HKCorrelationTypeIdentifierFood API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*--------------------------------*/
/* HKDocumentType Identifiers */
@@ -225,19 +235,26 @@
typedef NSString * HKDocumentTypeIdentifier NS_STRING_ENUM;
-HK_EXTERN HKDocumentTypeIdentifier const HKDocumentTypeIdentifierCDA API_AVAILABLE(ios(10.0), watchos(3.0));
+HK_EXTERN HKDocumentTypeIdentifier const HKDocumentTypeIdentifierCDA API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*------------------------------*/
/* HKWorkoutType Identifier */
/*------------------------------*/
-HK_EXTERN NSString * const HKWorkoutTypeIdentifier API_AVAILABLE(ios(8.0), watchos(2.0));
+HK_EXTERN NSString * const HKWorkoutTypeIdentifier API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*--------------------------------*/
/* HKSeriesSample Identifiers */
/*--------------------------------*/
-HK_EXTERN NSString * const HKWorkoutRouteTypeIdentifier API_AVAILABLE(ios(11.0), watchos(4.0));
-HK_EXTERN NSString * const HKDataTypeIdentifierHeartbeatSeries API_AVAILABLE(ios(13.0), watchos(6.0));
+HK_EXTERN NSString * const HKWorkoutRouteTypeIdentifier API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKDataTypeIdentifierHeartbeatSeries API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0));
+
+/*-----------------------------------*/
+/* HKVisionPrescription Identifier */
+/*-----------------------------------*/
+
+HK_EXTERN NSString * const HKVisionPrescriptionTypeIdentifier API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKUnit.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKUnit.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKUnit.h 2022-02-23 07:15:55.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKUnit.h 2022-05-31 15:02:17.000000000 -0400
@@ -2,14 +2,14 @@
// HKUnit.h
// HealthKit
//
-// Copyright (c) 2013-2014 Apple Inc. All rights reserved.
+// Copyright (c) 2013-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKDefines.h>
NS_ASSUME_NONNULL_BEGIN
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKUnit : NSObject <NSSecureCoding, NSCopying>
/// Returns a unique string representation for the unit that could be used with +unitFromString:
@@ -32,6 +32,8 @@
// Hz (hertz) [Frequency]
// mol<molar mass> (moles) [Mass] <molar mass> is the number of grams per mole. For example, mol<180.1558>
// V (volts) [Electrical Potential Difference]
+// W (watts) [Power]
+// rad (radians) [Angle]
// SI units can be prefixed as follows:
// da (deca-) = 10 d (deci-) = 1/10
@@ -116,7 +118,7 @@
typedef NS_ENUM(NSInteger, HKMetricPrefix) {
HKMetricPrefixNone = 0, //10^0
- HKMetricPrefixFemto API_AVAILABLE(ios(13.0), watchos(6.0)) = 13, //10^-15
+ HKMetricPrefixFemto API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)) = 13, //10^-15
HKMetricPrefixPico = 1, //10^-12
HKMetricPrefixNano = 2, //10^-9
HKMetricPrefixMicro = 3, //10^-6
@@ -129,7 +131,7 @@
HKMetricPrefixMega = 10, //10^6
HKMetricPrefixGiga = 11, //10^9
HKMetricPrefixTera = 12, //10^12
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/* Mass Units */
@interface HKUnit (Mass)
@@ -148,7 +150,7 @@
+ (instancetype)meterUnit; // m
+ (instancetype)inchUnit; // in
+ (instancetype)footUnit; // ft
-+ (instancetype)yardUnit API_AVAILABLE(ios(9.0), watchos(2.0)); // yd
++ (instancetype)yardUnit API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // yd
+ (instancetype)mileUnit; // mi
@end
@@ -160,8 +162,8 @@
+ (instancetype)fluidOunceImperialUnit; // fl_oz_imp
+ (instancetype)pintUSUnit; // pt_us
+ (instancetype)pintImperialUnit; // pt_imp
-+ (instancetype)cupUSUnit API_AVAILABLE(ios(9.0), watchos(2.0)); // cup_us
-+ (instancetype)cupImperialUnit API_AVAILABLE(ios(9.0), watchos(2.0)); // cup_imp
++ (instancetype)cupUSUnit API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // cup_us
++ (instancetype)cupImperialUnit API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0)); // cup_imp
@end
/* Pressure Units */
@@ -171,8 +173,8 @@
+ (instancetype)millimeterOfMercuryUnit; // mmHg
+ (instancetype)centimeterOfWaterUnit; // cmAq
+ (instancetype)atmosphereUnit; // atm
-+ (instancetype)decibelAWeightedSoundPressureLevelUnit API_AVAILABLE(ios(13.0), watchos(6.0)); // dBASPL
-+ (instancetype)inchesOfMercuryUnit API_AVAILABLE(ios(14.0), watchos(7.0)); // inHg
++ (instancetype)decibelAWeightedSoundPressureLevelUnit API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)); // dBASPL
++ (instancetype)inchesOfMercuryUnit API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // inHg
@end
/* Time Units */
@@ -189,8 +191,8 @@
+ (instancetype)jouleUnitWithMetricPrefix:(HKMetricPrefix)prefix; // J
+ (instancetype)jouleUnit; // J
+ (instancetype)kilocalorieUnit; // 1 kcal = 4184.0 J
-+ (instancetype)smallCalorieUnit API_AVAILABLE(ios(11.0), watchos(4.0)); // 1 cal = 4.1840 J
-+ (instancetype)largeCalorieUnit API_AVAILABLE(ios(11.0), watchos(4.0)); // 1 Cal = 4184.0 J
++ (instancetype)smallCalorieUnit API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)); // 1 cal = 4.1840 J
++ (instancetype)largeCalorieUnit API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)); // 1 Cal = 4184.0 J
+ (instancetype)calorieUnit API_DEPRECATED("Use smallCalorieUnit or largeCalorieUnit, depending on which you mean", ios(8.0, 11.0), watchos(2.0, 4.0));
@end
@@ -209,7 +211,7 @@
/* Pharmacology Units */
@interface HKUnit (Pharmacology)
-+ (instancetype)internationalUnit NS_SWIFT_NAME(internationalUnit()) API_AVAILABLE(ios(11.0), watchos(4.0)); // IU
++ (instancetype)internationalUnit NS_SWIFT_NAME(internationalUnit()) API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)); // IU
@end
/* Scalar Units */
@@ -220,7 +222,7 @@
/* Hearing Sensitivity */
@interface HKUnit (HearingSensitivity)
-+ (instancetype)decibelHearingLevelUnit API_AVAILABLE(ios(13.0), watchos(6.0)); // dBHL
++ (instancetype)decibelHearingLevelUnit API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)); // dBHL
@end
@interface HKUnit (Math)
@@ -232,14 +234,33 @@
/* Frequency Units */
@interface HKUnit (Frequency)
-+ (instancetype)hertzUnitWithMetricPrefix:(HKMetricPrefix)prefix API_AVAILABLE(ios(13.0), watchos(6.0)); // Hz
-+ (instancetype)hertzUnit API_AVAILABLE(ios(13.0), watchos(6.0)); // Hz
++ (instancetype)hertzUnitWithMetricPrefix:(HKMetricPrefix)prefix API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)); // Hz
++ (instancetype)hertzUnit API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)); // Hz
@end
/* Electrical Potential Difference Units */
@interface HKUnit (ElectricPotentialDifference)
-+ (instancetype)voltUnitWithMetricPrefix:(HKMetricPrefix)prefix API_AVAILABLE(ios(14.0), watchos(7.0)); // V
-+ (instancetype)voltUnit API_AVAILABLE(ios(14.0), watchos(7.0)); // V
++ (instancetype)voltUnitWithMetricPrefix:(HKMetricPrefix)prefix API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // V
++ (instancetype)voltUnit API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)); // V
+@end
+
+/* Power Units */
+@interface HKUnit (Power)
++ (instancetype)wattUnitWithMetricPrefix:(HKMetricPrefix)prefix API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // W
++ (instancetype)wattUnit API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // W
+@end
+
+/* Optical Power */
+@interface HKUnit (OpticalPower)
++ (instancetype)diopterUnit API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // D
++ (instancetype)prismDiopterUnit API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // pD
+@end
+
+/* Angle Units */
+@interface HKUnit (Angle)
++ (instancetype)radianAngleUnitWithMetricPrefix:(HKMetricPrefix)prefix API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // rad
++ (instancetype)radianAngleUnit API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // rad
++ (instancetype)degreeAngleUnit API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)); // deg
@end
/* Mole Constants */
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecord.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecord.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecord.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecord.h 2022-05-31 14:49:27.000000000 -0400
@@ -2,7 +2,7 @@
// HKVerifiableClinicalRecord.h
// HealthKit
//
-// Copyright © 2021 Apple. All rights reserved.
+// Copyright © 2021-2022 Apple. All rights reserved.
//
#import <HealthKit/HKSample.h>
@@ -55,7 +55,7 @@
@class HKVerifiableClinicalRecord
@abstract An NSObject that represents a verifiable clinical record.
*/
-HK_EXTERN API_AVAILABLE(ios(15.0)) __WATCHOS_PROHIBITED
+HK_EXTERN API_AVAILABLE(ios(15.0), macCatalyst(15.0), macos(13.0)) __WATCHOS_PROHIBITED
@interface HKVerifiableClinicalRecord : HKSample
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecordQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecordQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecordQuery.h 2022-02-23 07:59:05.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecordQuery.h 2022-05-31 14:51:52.000000000 -0400
@@ -2,7 +2,7 @@
// HKVerifiableClinicalRecordQuery.h
// HealthKit
//
-// Copyright © 2021 Apple. All rights reserved.
+// Copyright © 2021-2022 Apple. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -18,7 +18,7 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKVerifiableClinicalRecordQueryDescriptor", ios(15.0, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(15.0))
+API_AVAILABLE(ios(15.0), macCatalyst(15.0), macos(13.0))
#endif
API_UNAVAILABLE(watchos)
@interface HKVerifiableClinicalRecordQuery : HKQuery
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecordSubject.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecordSubject.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecordSubject.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVerifiableClinicalRecordSubject.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKVerifiableClinicalRecordSubject.h
// HealthKit
//
-// Copyright © 2021 Apple. All rights reserved.
+// Copyright © 2021-2022 Apple. All rights reserved.
//
#import <HealthKit/HKDefines.h>
@@ -13,7 +13,7 @@
@class HKVerifiableClinicalRecordSubject
@abstract An NSObject that represents a verifiable clinical record subject.
*/
-HK_EXTERN API_AVAILABLE(ios(15.0)) __WATCHOS_PROHIBITED
+HK_EXTERN API_AVAILABLE(ios(15.0), macCatalyst(15.0), macos(13.0)) __WATCHOS_PROHIBITED
@interface HKVerifiableClinicalRecordSubject : NSObject <NSSecureCoding, NSCopying>
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVisionPrescription.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVisionPrescription.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVisionPrescription.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVisionPrescription.h 2022-05-31 14:51:52.000000000 -0400
@@ -0,0 +1,69 @@
+//
+// HKVisionPrescription.h
+// HealthKit
+//
+// Copyright © 2022 Apple. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HealthKit/HKSample.h>
+
+@class HKDevice;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ @enum HKVisionPrescriptionType
+ @abstract Represents a vision prescription type
+ */
+typedef NS_ENUM(NSUInteger, HKVisionPrescriptionType) {
+ HKVisionPrescriptionTypeGlasses = 1,
+ HKVisionPrescriptionTypeContacts,
+} API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @class HKVisionPrescription
+ @abstract An HKObject subclass representing a vision prescription
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKVisionPrescription : HKSample
+
+/*!
+ @property prescriptionType
+ @abstract A vision prescription type (glasses or contacts)
+ */
+@property (nonatomic, assign, readonly) HKVisionPrescriptionType prescriptionType;
+
+/*!
+ @property dateIssued
+ @abstract The date the prescription was issued
+ */
+@property (nonatomic, copy, readonly) NSDate *dateIssued;
+
+/*!
+ @property expirationDate
+ @abstract The date the prescription will expire
+ */
+@property (nonatomic, copy, readonly, nullable) NSDate *expirationDate;
+
+/*!
+ @method prescriptionWithType:dateIssued:expirationDate:device:metadata
+
+ @param type The prescription type
+ @param dateIssued The date the prescription was issued
+ @param expirationDate The date the prescription expires
+ @param device The device that generated the sample
+ @param metadata The metadata for the sample
+ */
++ (instancetype)prescriptionWithType:(HKVisionPrescriptionType)type
+ dateIssued:(NSDate *)dateIssued
+ expirationDate:(nullable NSDate *)expirationDate
+ device:(nullable HKDevice *)device
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVisionPrism.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVisionPrism.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVisionPrism.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKVisionPrism.h 2022-05-31 15:02:40.000000000 -0400
@@ -0,0 +1,121 @@
+//
+// HKVisionPrism.h
+// HealthKit
+//
+// Copyright © 2022 Apple. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HealthKit/HKDefines.h>
+
+@class HKQuantity;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ @enum HKPrismBase
+ @abstract Represents the prism base for rectangular coordinates
+ */
+typedef NS_ENUM(NSInteger, HKPrismBase) {
+ HKPrismBaseNone = 0,
+ HKPrismBaseUp,
+ HKPrismBaseDown,
+ HKPrismBaseIn,
+ HKPrismBaseOut,
+} API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @enum HKVisionEye
+ @abstract Represents an eye
+ */
+typedef NS_ENUM(NSInteger, HKVisionEye) {
+ HKVisionEyeLeft = 1,
+ HKVisionEyeRight,
+} API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @class HKVisionPrism
+ @abstract An object subclass representing prism vision fields used in eye glasses to correct double vision.
+ The prism aligns the two images so only one is seen.
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKVisionPrism : NSObject <NSSecureCoding, NSCopying>
+
+/*!
+ @property amount
+ @abstract The compensation in prism diopters to correct eye misalignment [polar coordinates]
+ */
+@property (nonatomic, copy, readonly) HKQuantity *amount;
+
+/*!
+ @property angle
+ @abstract The direction of the prism base [polar coordinates]
+ */
+@property (nonatomic, copy, readonly) HKQuantity *angle;
+
+/*!
+ @property verticalAmount
+ @abstract The vertical component of compensation in prism diopters [rectangular coordinates]
+ */
+@property (nonatomic, copy, readonly) HKQuantity *verticalAmount;
+
+/*!
+ @property horizontalAmount
+ @abstract The horizontal component of compensation in prism diopters [rectangular coordinates]
+ */
+@property (nonatomic, copy, readonly) HKQuantity *horizontalAmount;
+
+/*!
+ @property verticalBase
+ @abstract The direction of the prism base relative to the vertical axis of the lens;
+ base up or base down. [rectangular coordinates]
+ */
+@property (nonatomic, readonly) HKPrismBase verticalBase;
+
+/*!
+ @property horizontalBase
+ @abstract The direction of the prism base relative to the horizontal axis of the lens;
+ base in (toward the nose) or base out (away from the nose). [rectangular coordinates]
+ */
+@property (nonatomic, readonly) HKPrismBase horizontalBase;
+
+/*!
+ @property eye
+ @abstract Which eye (left or right)
+ */
+@property (nonatomic, assign, readonly) HKVisionEye eye;
+
+/*!
+ @method initWithAmount:angle:eye
+
+ @param amount The compensation for amount eye misalignment
+ @param angle The angle of the lens required to correct diplopia
+ @param eye The eye associated with the prism values
+ */
+- (instancetype)initWithAmount:(HKQuantity *)amount
+ angle:(HKQuantity *)angle
+ eye:(HKVisionEye)eye;
+
+/*!
+ @method initWithVerticalAmount:verticalBase:horizontalAmount:horizontalBase:eye
+
+ @param verticalAmount The vertical component of compensation in prism diopters
+ @param verticalBase The direction of the prism base relative to the vertical axis of the lens;
+ base up or base down.
+ @param horizontalAmount The horizontal component of compensation in prism diopters
+ @param horizontalBase The direction of the prism base relative to the horizontal axis of the lens;
+ base in (toward the nose) or base out (away from the nose).
+ @param eye The eye associated with the prism values
+ */
+- (instancetype)initWithVerticalAmount:(HKQuantity *)verticalAmount
+ verticalBase:(HKPrismBase)verticalBase
+ horizontalAmount:(HKQuantity *)horizontalAmount
+ horizontalBase:(HKPrismBase)horizontalBase
+ eye:(HKVisionEye)eye;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkout.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkout.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkout.h 2022-02-23 10:58:55.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkout.h 2022-05-31 14:49:26.000000000 -0400
@@ -2,7 +2,7 @@
// HKWorkout.h
// HealthKit
//
-// Copyright (c) 2014 Apple Inc. All rights reserved.
+// Copyright (c) 2014-2022 Apple Inc. All rights reserved.
//
#import <HealthKit/HKSample.h>
@@ -10,6 +10,9 @@
NS_ASSUME_NONNULL_BEGIN
@class HKQuantity;
+@class HKQuantityType;
+@class HKStatistics;
+@class HKWorkoutActivity;
/*!
@enum HKWorkoutActivityType
@@ -74,49 +77,51 @@
HKWorkoutActivityTypeWrestling,
HKWorkoutActivityTypeYoga,
- HKWorkoutActivityTypeBarre API_AVAILABLE(ios(10.0), watchos(3.0)), // HKWorkoutActivityTypeDanceInspiredTraining
- HKWorkoutActivityTypeCoreTraining API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeCrossCountrySkiing API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeDownhillSkiing API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeFlexibility API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeHighIntensityIntervalTraining API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeJumpRope API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeKickboxing API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypePilates API_AVAILABLE(ios(10.0), watchos(3.0)), // HKWorkoutActivityTypeDanceInspiredTraining
- HKWorkoutActivityTypeSnowboarding API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeStairs API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeStepTraining API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeWheelchairWalkPace API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeWheelchairRunPace API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutActivityTypeTaiChi API_AVAILABLE(ios(11.0), watchos(4.0)),
- HKWorkoutActivityTypeMixedCardio API_AVAILABLE(ios(11.0), watchos(4.0)), // HKWorkoutActivityTypeMixedMetabolicCardioTraining
- HKWorkoutActivityTypeHandCycling API_AVAILABLE(ios(11.0), watchos(4.0)),
- HKWorkoutActivityTypeDiscSports API_AVAILABLE(ios(13.0), watchos(6.0)),
- HKWorkoutActivityTypeFitnessGaming API_AVAILABLE(ios(13.0), watchos(6.0)),
- HKWorkoutActivityTypeCardioDance API_AVAILABLE(ios(14.0), watchos(7.0)),
- HKWorkoutActivityTypeSocialDance API_AVAILABLE(ios(14.0), watchos(7.0)), // Dances done in social settings like swing, salsa and folk dances from different world regions.
- HKWorkoutActivityTypePickleball API_AVAILABLE(ios(14.0), watchos(7.0)),
- HKWorkoutActivityTypeCooldown API_AVAILABLE(ios(14.0), watchos(7.0)), // Low intensity stretching and mobility exercises following a more vigorous workout type
+ HKWorkoutActivityTypeBarre API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)), // HKWorkoutActivityTypeDanceInspiredTraining
+ HKWorkoutActivityTypeCoreTraining API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeCrossCountrySkiing API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeDownhillSkiing API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeFlexibility API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeHighIntensityIntervalTraining API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeJumpRope API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeKickboxing API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypePilates API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)), // HKWorkoutActivityTypeDanceInspiredTraining
+ HKWorkoutActivityTypeSnowboarding API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeStairs API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeStepTraining API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeWheelchairWalkPace API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeWheelchairRunPace API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeTaiChi API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeMixedCardio API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)), // HKWorkoutActivityTypeMixedMetabolicCardioTraining
+ HKWorkoutActivityTypeHandCycling API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeDiscSports API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeFitnessGaming API_AVAILABLE(ios(13.0), watchos(6.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutActivityTypeCardioDance API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)),
+ HKWorkoutActivityTypeSocialDance API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)), // Dances done in social settings like swing, salsa and folk dances from different world regions.
+ HKWorkoutActivityTypePickleball API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)),
+ HKWorkoutActivityTypeCooldown API_AVAILABLE(ios(14.0), watchos(7.0), macCatalyst(14.0), macos(13.0)), // Low intensity stretching and mobility exercises following a more vigorous workout type
+ HKWorkoutActivityTypeSwimBikeRun API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) = 82,
+ HKWorkoutActivityTypeTransition API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)),
HKWorkoutActivityTypeOther = 3000,
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
typedef NS_ENUM(NSInteger, HKWorkoutEventType) {
HKWorkoutEventTypePause = 1,
HKWorkoutEventTypeResume,
- HKWorkoutEventTypeLap API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutEventTypeMarker API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutEventTypeMotionPaused API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutEventTypeMotionResumed API_AVAILABLE(ios(10.0), watchos(3.0)),
- HKWorkoutEventTypeSegment API_AVAILABLE(ios(11.0), watchos(4.0)),
- HKWorkoutEventTypePauseOrResumeRequest API_AVAILABLE(ios(11.0), watchos(4.0)),
-} API_AVAILABLE(ios(8.0), watchos(2.0));
+ HKWorkoutEventTypeLap API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutEventTypeMarker API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutEventTypeMotionPaused API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutEventTypeMotionResumed API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutEventTypeSegment API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)),
+ HKWorkoutEventTypePauseOrResumeRequest API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0)),
+} API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@class HKWorkoutEvent
@abstract Represents a particular event that occurred during a workout.
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKWorkoutEvent : NSObject <NSSecureCoding, NSCopying>
/*!
@@ -133,7 +138,7 @@
@discussion Most event types only support date intervals with zero duration. Events of type HKWorkoutEventTypeLap
and HKWorkoutEventTypeSegment are currently the only events that support a nonzero duration.
*/
-@property (readonly, copy) NSDateInterval *dateInterval API_AVAILABLE(ios(11.0), watchos(4.0));
+@property (readonly, copy) NSDateInterval *dateInterval API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
/*!
@property metadata
@@ -141,7 +146,7 @@
@discussion Keys must be NSString and values must be either NSString, NSNumber, NSDate, or
HKQuantity. See HKMetadata.h for potential metadata keys and values.
*/
-@property (readonly, copy, nullable) NSDictionary<NSString *, id> *metadata API_AVAILABLE(ios(10.0), watchos(3.0));
+@property (readonly, copy, nullable) NSDictionary<NSString *, id> *metadata API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
+ (instancetype)workoutEventWithType:(HKWorkoutEventType)type date:(NSDate *)date API_DEPRECATED_WITH_REPLACEMENT("workoutEventWithType:dateInterval:metadata:", ios(8.0, 11.0), watchos(2.0, 4.0));
@@ -154,7 +159,7 @@
@param dateInterval The dateInterval over which the event occurs
@param metadata Dictionary of metadata associated with the event, nullable
*/
-+ (instancetype)workoutEventWithType:(HKWorkoutEventType)type dateInterval:(NSDateInterval *)dateInterval metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(11.0), watchos(4.0));
++ (instancetype)workoutEventWithType:(HKWorkoutEventType)type dateInterval:(NSDateInterval *)dateInterval metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
- (instancetype)init NS_UNAVAILABLE;
@@ -164,7 +169,7 @@
@class HKWorkout
@abstract An HKObject subclass representing a workout or activity
*/
-HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0))
+HK_EXTERN API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0))
@interface HKWorkout : HKSample
/*!
@@ -183,6 +188,14 @@
@property (readonly, copy, nullable) NSArray<HKWorkoutEvent *> *workoutEvents;
/*!
+ @property workoutActivities
+ @abstract An array of HKWorkoutActivities that were performed during a workout.
+ @discussion These activities will be ordered by date in ascending order. All activities must take place
+ between the start date and end date of the workout.
+ */
+@property (readonly, copy) NSArray<HKWorkoutActivity *> *workoutActivities API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
@property duration
@abstract The length of time that a workout was recording
@discussion The duration is derived from the start and end dates of the workout and takes into account periods that the
@@ -196,14 +209,14 @@
@discussion This metric should represent the total active energy burned during the course of the workout. It should be a
quantity with a unit representing energy.
*/
-@property (readonly, strong, nullable) HKQuantity *totalEnergyBurned;
+@property (readonly, strong, nullable) HKQuantity *totalEnergyBurned API_DEPRECATED("Use statisticsForType: passing the HKQuantityType for HKQuantityTypeIdentifierActiveEnergyBurned", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED), macCatalyst(13.0, API_TO_BE_DEPRECATED), macos(13.0, API_TO_BE_DEPRECATED));
/*!
@property totalDistance
@abstract The total distance that was traveled during a workout
@discussion This metric should represent the total distance traveled during the course of the workout. It should be a
quantity with a unit representing length.
*/
-@property (readonly, strong, nullable) HKQuantity *totalDistance;
+@property (readonly, strong, nullable) HKQuantity *totalDistance API_DEPRECATED("Use statisticsForType: passing the HKQuantityType for the desired distance type", ios(8.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED), macCatalyst(13.0, API_TO_BE_DEPRECATED), macos(13.0, API_TO_BE_DEPRECATED));
/*!
@property totalSwimmingStrokeCount
@@ -211,15 +224,32 @@
@discussion This metric should represent the total count of swimming strokes accumulated during the course of the
workout. It should be a quantity with a unit representing count.
*/
-@property (readonly, strong, nullable) HKQuantity *totalSwimmingStrokeCount API_AVAILABLE(ios(10.0), watchos(3.0));
+@property (readonly, strong, nullable) HKQuantity *totalSwimmingStrokeCount API_DEPRECATED("Use statisticsForType: passing the HKQuantityType for HKQuantityTypeIdentifierSwimmingStrokeCount", ios(10.0, API_TO_BE_DEPRECATED), watchos(3.0, API_TO_BE_DEPRECATED), macCatalyst(13.0, API_TO_BE_DEPRECATED), macos(13.0, API_TO_BE_DEPRECATED));
/*!
@property totalFlightsClimbed
@abstract The total count of flights climbed during a workout
@discussion This metric should represent the total count of flights accumulated during the course of the
- workout. It should be a quantity with a unit representing count.
+ workout. It should be a quantity with a unit representing count.
+ */
+@property (readonly, strong, nullable) HKQuantity *totalFlightsClimbed API_DEPRECATED("Use statisticsForType: passing the HKQuantityType for HKQuantityTypeIdentifierFlightClimbed", ios(11.0, API_TO_BE_DEPRECATED), watchos(4.0, API_TO_BE_DEPRECATED), macCatalyst(13.0, API_TO_BE_DEPRECATED), macos(13.0, API_TO_BE_DEPRECATED));
+
+/*!
+ @property allStatistics
+ @abstract A dictionary of statistics per quantity type during the workout
+ @discussion This dictionary will contain HKStatistics objects containing the statistics by quantity
+ sample type for all of the samples that have been added to the workout.
+ */
+@property (readonly, copy) NSDictionary<HKQuantityType *, HKStatistics *> *allStatistics API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @method statisticsForType:
+ @discussion Returns an HKStatistics object containing the statistics for all the samples of the given type that
+ have been added to the workout. If there are no samples of the given type then nil is returned.
+
+ @param quantityType The quantity type to gather statistics about.
*/
-@property (readonly, strong, nullable) HKQuantity *totalFlightsClimbed API_AVAILABLE(ios(11.0), watchos(4.0));
+- (nullable HKStatistics *)statisticsForType:(HKQuantityType *)quantityType API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
/*!
@method workoutWithActivityType:startDate:endDate:
@@ -274,7 +304,7 @@
totalEnergyBurned:(nullable HKQuantity *)totalEnergyBurned
totalDistance:(nullable HKQuantity *)totalDistance
device:(nullable HKDevice *)device
- metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(9.0), watchos(2.0));
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@method workoutWithActivityType:startDate:endDate:duration:totalEnergyBurned:totalDistance:metadata:
@@ -318,7 +348,7 @@
totalEnergyBurned:(nullable HKQuantity *)totalEnergyBurned
totalDistance:(nullable HKQuantity *)totalDistance
device:(nullable HKDevice *)device
- metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(9.0), watchos(2.0));
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(9.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@method workoutWithActivityType:startDate:endDate:workoutEvents:totalEnergyBurned:totalDistance:totalSwimmingStrokeCount:device:metadata:
@@ -343,7 +373,7 @@
totalDistance:(nullable HKQuantity *)totalDistance
totalSwimmingStrokeCount:(nullable HKQuantity *)totalSwimmingStrokeCount
device:(nullable HKDevice *)device
- metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(10.0), watchos(3.0));
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
/*!
@method workoutWithActivityType:startDate:endDate:workoutEvents:totalEnergyBurned:totalDistance:totalFlightsClimbed:device:metadata:
@@ -369,24 +399,28 @@
totalDistance:(nullable HKQuantity *)totalDistance
totalFlightsClimbed:(nullable HKQuantity *)totalFlightsClimbed
device:(nullable HKDevice *)device
- metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(11.0), watchos(4.0));
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
@end
// Predicate Key Paths
-HK_EXTERN NSString * const HKPredicateKeyPathWorkoutDuration API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathWorkoutTotalDistance API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathWorkoutTotalEnergyBurned API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathWorkoutType API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKPredicateKeyPathWorkoutTotalSwimmingStrokeCount API_AVAILABLE(ios(10.0), watchos(3.0));
-HK_EXTERN NSString * const HKPredicateKeyPathWorkoutTotalFlightsClimbed API_AVAILABLE(ios(11.0), watchos(4.0));
-
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutDuration API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutTotalDistance API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutTotalEnergyBurned API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutType API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutTotalSwimmingStrokeCount API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutTotalFlightsClimbed API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutSumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutMinimumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutMaximumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutAverageQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutActivity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
// Sort Identifiers
-HK_EXTERN NSString * const HKWorkoutSortIdentifierDuration API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKWorkoutSortIdentifierTotalDistance API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKWorkoutSortIdentifierTotalEnergyBurned API_AVAILABLE(ios(8.0), watchos(2.0));
-HK_EXTERN NSString * const HKWorkoutSortIdentifierTotalSwimmingStrokeCount API_AVAILABLE(ios(10.0), watchos(3.0));
-HK_EXTERN NSString * const HKWorkoutSortIdentifierTotalFlightsClimbed API_AVAILABLE(ios(11.0), watchos(4.0));
+HK_EXTERN NSString * const HKWorkoutSortIdentifierDuration API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKWorkoutSortIdentifierTotalDistance API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKWorkoutSortIdentifierTotalEnergyBurned API_AVAILABLE(ios(8.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKWorkoutSortIdentifierTotalSwimmingStrokeCount API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0));
+HK_EXTERN NSString * const HKWorkoutSortIdentifierTotalFlightsClimbed API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0));
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutActivity.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutActivity.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutActivity.h 1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutActivity.h 2022-05-31 14:51:54.000000000 -0400
@@ -0,0 +1,124 @@
+//
+// HKWorkoutActivity.h
+// HKWorkoutActivity
+//
+// Copyright © 2022 Apple. All rights reserved.
+//
+
+#import <HealthKit/HKDefines.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class HKQuantityType;
+@class HKStatistics;
+@class HKWorkoutConfiguration;
+@class HKWorkoutEvent;
+
+/*!
+ @class HKWorkoutActivity
+ @abstract An HKWorkoutActivity is an object describing the properties of an activity within an HKWorkout.
+ */
+HK_EXTERN API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0))
+@interface HKWorkoutActivity : NSObject
+
+/*!
+ @property UUID
+ @abstract A unique identifier of the activity in the HealthKit database.
+ */
+@property (copy, readonly) NSUUID *UUID;
+
+/*!
+ @property workoutConfiguration
+ @abstract The configuration object describing the workout activity.
+ */
+@property (copy, readonly) HKWorkoutConfiguration *workoutConfiguration;
+
+/*!
+ @property startDate
+ @abstract The point in time when the workout activity was started.
+ */
+@property (copy, readonly) NSDate *startDate;
+
+/*!
+ @property endDate
+ @abstract The point in time when the workout activity was ended.
+ @discussion This value is nil when a workout activity is in progress.
+ */
+@property (copy, readonly, nullable) NSDate *endDate;
+
+/*!
+ @property metadata
+ @abstract Extra information describing properties of the workout activity.
+ @discussion Keys must be NSString and values must be either NSString, NSNumber, NSDate, or
+ HKQuantity. See HKMetadata.h for potential metadata keys and values.
+ */
+@property (copy, readonly, nullable) NSDictionary<NSString *, id> *metadata;
+
+/*!
+ @property duration
+ @abstract The length of time that the workout activity was recording
+ @discussion The duration is derived from the start and end dates of the activity and takes
+ into account periods that the activity was paused. Periods that the activity was
+ paused are based off of the workoutEvents property of the parent workout object.
+ */
+@property (readonly, assign) NSTimeInterval duration;
+
+/*!
+ @property workoutEvents
+ @abstract An array of HKWorkoutEvents that occurred during the workout activity.
+ @discussion These events will be ordered by date in ascending order. These events are a subset
+ of the workout events that take place between the start date and end date of the
+ activity. This includes any event that overlaps the activity, even partially.
+ Consequently, some events may be included in more than one activity.
+ */
+@property (readonly, copy) NSArray<HKWorkoutEvent *> *workoutEvents;
+
+/*!
+ @property allStatistics
+ @abstract A dictionary of statistics per quantity type during the activity
+ @discussion This dictionary will contain HKStatistics objects containing the statistics by quantity
+ sample type for all of the samples that have been added to the workout within the date
+ interval of this activity.
+ */
+@property (readonly, copy) NSDictionary<HKQuantityType *, HKStatistics *> *allStatistics API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @method statisticsForType:
+ @discussion Returns an HKStatistics object containing the statistics for all the samples of the given type that
+ have been added to the workout within the date interval of this activity. If there are no samples of
+ the given type then nil is returned.
+
+ @param quantityType The quantity type to gather statistics about.
+ */
+- (nullable HKStatistics *)statisticsForType:(HKQuantityType *)quantityType;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+/*!
+ @method initWithWorkoutConfiguration:startDate:endDate:metadata:
+ @abstract Initialize a new HKWorkoutActivity with the specified values.
+
+ @param workoutConfiguration The configuration object describing the workout activity.
+ @param startDate The point in time when the workout activity was started.
+ @param endDate The point in time when the workout activity was ended.
+ @param metadata Metadata for the workout activity. (Optional)
+ */
+- (instancetype)initWithWorkoutConfiguration:(HKWorkoutConfiguration *)workoutConfiguration
+ startDate:(NSDate *)startDate
+ endDate:(nullable NSDate *)endDate
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata;
+
+@end
+
+// Predicate Key Paths
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutActivityType API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutActivityDuration API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutActivityStartDate API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutActivityEndDate API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutActivitySumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutActivityMinimumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutActivityMaximumQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+HK_EXTERN NSString * const HKPredicateKeyPathWorkoutActivityAverageQuantity API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutBuilder.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutBuilder.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutBuilder.h 2022-02-23 07:55:56.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutBuilder.h 2022-05-31 15:04:04.000000000 -0400
@@ -2,7 +2,7 @@
// HKWorkoutBuilder.h
// HealthKit
//
-// Copyright © 2017-2018 Apple. All rights reserved.
+// Copyright © 2017-2022 Apple. All rights reserved.
//
#import <Foundation/Foundation.h>
@@ -67,6 +67,22 @@
@property (copy, readonly) NSArray<HKWorkoutEvent *> *workoutEvents;
/*!
+ @property workoutActivities
+ @abstract Workout activities that have been added to the builder.
+ @discussion New activities that are added using addWorkoutActivity:completion: will be appended to this array once the
+ completion is called.
+ */
+@property (copy, readonly) NSArray<HKWorkoutActivity *> *workoutActivities API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
+ @property allStatistics
+ @abstract A dictionary of statistics per quantity type added to the builder
+ @discussion This dictionary will contain HKStatistics objects containing the statistics by quantity
+ sample type for all of the samples that have been added to the builder.
+ */
+@property (readonly, copy) NSDictionary<HKQuantityType *, HKStatistics *> *allStatistics API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
+
+/*!
@method initWithHealthStore:configuration:device:
@abstract The designated initializer to create an HKWorkoutBuilder.
@discussion Creates a new HKWorkoutBuilder unconnected to any HKWorkoutSession or any sources of data.
@@ -136,6 +152,56 @@
- (void)addMetadata:(NSDictionary<NSString *, id> *)metadata completion:(void (^)(BOOL success, NSError * _Nullable error))completion NS_SWIFT_ASYNC_NAME(addMetadata(_:)) NS_SWIFT_ASYNC_THROWS_ON_FALSE(1);
/*!
+ @method addWorkoutActivity:completion:
+ @discussion Adds a new workout activity to the builder instance. This method can be called many times to add workout
+ activities incrementally to the builder. It is an error to call this method after
+ finishWorkoutWithCompletion: has been called. This operation is performed asynchronously and the
+ completion will be executed on an arbitrary background queue.
+
+ @param workoutActivity The activity to add to the builder.
+ @param completion Block to be called when the addition of the activity to the builder is complete. If success is
+ YES, the activity was added to the builder successfully. If success is NO, error will be
+ non-null and will contain the error encountered during the insertion operation.
+ */
+- (void)addWorkoutActivity:(HKWorkoutActivity *)workoutActivity
+ completion:(void (^)(BOOL success, NSError * _Nullable error))completion API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_ASYNC_NAME(addWorkoutActivity(_:)) NS_SWIFT_ASYNC_THROWS_ON_FALSE(1);
+
+/*!
+ @method updateActivityWithUUID:endDate:completion:
+ @discussion Sets the end date on an already added activity. It is an error to call this method after
+ finishWorkoutWithCompletion: has been called. This operation is performed asynchronously and the
+ completion will be executed on an arbitrary background queue.
+
+ @param UUID The UUID of the workout activity to update.
+ @param endDate The end date to set on the activity
+ @param completion Block to be called when the update of the end date on the activity is complete. If success is
+ YES, the end date was set to the actvity successfully. If success is NO, error will be
+ non-null and will contain the error encountered during the update operation.
+ */
+- (void)updateActivityWithUUID:(NSUUID *)UUID
+ endDate:(NSDate *)endDate
+ completion:(void (^)(BOOL success, NSError * _Nullable error))completion API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(updateActivity(uuid:end:completion:)) NS_SWIFT_ASYNC_THROWS_ON_FALSE(1);
+
+/*!
+ @method updateActivityWithUUID:addMetadata:completion:
+ @discussion Adds new metadata to an already added activity. This method can be called more than once; each time
+ the newly provided metadata will be merged with previously added metadata in the same manner as
+ -[NSMutableDictionary addEntriesFromDictionary:]. It is an error to call this method after
+ finishWorkoutWithCompletion: has been called. This operation is performed asynchronously and the
+ completion will be executed on an arbitrary background queue.
+
+ @param UUID The UUID of the workout activity to update.
+ @param metadata The metadata to add to the workout activity.
+ @param completion Block to be called when the addition of metadata to the activity is complete. If success is
+ YES, the metadata has been added to the activity successfully. If success is NO, error will
+ be non-null and will contain the error encountered during the insertion operation. When an
+ error occurs, the activity's metadata property will remain unchanged.
+ */
+- (void)updateActivityWithUUID:(NSUUID *)UUID
+ addMedatata:(NSDictionary<NSString *, id> *)metadata
+ completion:(void (^)(BOOL success, NSError * _Nullable error))completion API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0)) NS_SWIFT_NAME(updateActivity(uuid:adding:completion:)) NS_SWIFT_ASYNC_THROWS_ON_FALSE(1);
+
+/*!
@method endCollectionWithEndDate:error:
@abstract Sets the workout end date and deactivates the workout builer.
@discussion Calling this method is required before you finish a workout builder.
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutConfiguration.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutConfiguration.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutConfiguration.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutConfiguration.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,7 +2,7 @@
// HKWorkoutConfiguration.h
// HealthKit
//
-// Copyright © 2018 Apple. All rights reserved.
+// Copyright © 2018-2022 Apple. All rights reserved.
//
#import <HealthKit/HKMetadata.h>
@@ -19,13 +19,13 @@
HKWorkoutSessionLocationTypeUnknown = 1,
HKWorkoutSessionLocationTypeIndoor,
HKWorkoutSessionLocationTypeOutdoor,
-} API_AVAILABLE(ios(10.0), watchos(2.0));
+} API_AVAILABLE(ios(10.0), watchos(2.0), macCatalyst(13.0), macos(13.0));
/*!
@class HKWorkoutConfiguration
@abstract An HKWorkoutConfiguration is an object that can be used to describe the workout activity.
*/
-HK_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0))
+HK_EXTERN API_AVAILABLE(ios(10.0), watchos(3.0), macCatalyst(13.0), macos(13.0))
@interface HKWorkoutConfiguration : NSObject <NSCopying, NSSecureCoding>
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRoute.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRoute.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRoute.h 2022-02-23 07:59:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRoute.h 2022-05-31 14:51:54.000000000 -0400
@@ -2,14 +2,14 @@
// HKWorkoutRoute.h
// HealthKit
//
-// Copyright © 2017 Apple. All rights reserved.
+// Copyright © 2017-2022 Apple. All rights reserved.
//
#import <HealthKit/HKSeriesSample.h>
NS_ASSUME_NONNULL_BEGIN
-HK_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0))
+HK_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0))
@interface HKWorkoutRoute : HKSeriesSample
@end
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRouteBuilder.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRouteBuilder.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRouteBuilder.h 2022-02-23 07:13:47.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRouteBuilder.h 2022-05-31 15:02:17.000000000 -0400
@@ -2,7 +2,7 @@
// HKWorkoutRouteBuilder.h
// HealthKit
//
-// Copyright © 2017 Apple. All rights reserved.
+// Copyright © 2017-2022 Apple. All rights reserved.
//
#import <HealthKit/HKSeriesBuilder.h>
@@ -24,7 +24,7 @@
Calling finishRouteWithWorkout:metadata: will stop and complete the route. If the builder is deleted,
or the client goes away before calling the finish method, data will be lost.
*/
-HK_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0))
+HK_EXTERN API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0))
@interface HKWorkoutRouteBuilder : HKSeriesBuilder
/*!
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRouteQuery.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRouteQuery.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRouteQuery.h 2022-02-23 07:59:06.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutRouteQuery.h 2022-05-31 14:51:53.000000000 -0400
@@ -2,7 +2,7 @@
// HKWorkoutRouteQuery.h
// HealthKit
//
-// Copyright © 2017 Apple. All rights reserved.
+// Copyright © 2017-2022 Apple. All rights reserved.
//
#import <HealthKit/HKQuery.h>
@@ -22,16 +22,33 @@
#if defined(__swift__) && __swift__
API_DEPRECATED("Use HKWorkoutRouteQueryDescriptor", ios(11.0, API_TO_BE_DEPRECATED), watchos(4.0, API_TO_BE_DEPRECATED));
#else
-API_AVAILABLE(ios(11.0), watchos(4.0))
+API_AVAILABLE(ios(11.0), watchos(4.0), macCatalyst(13.0), macos(13.0))
#endif
@interface HKWorkoutRouteQuery : HKQuery
/*!
- @method initWithRoute:handler:
- @abstract Returns a query that will retrieve CLLocation objects for the specified
- workoutRoute.
-
+ @method initWithRoute:dataHandler:
+ @abstract Returns a query that will retrieve CLLocation objects for the specified workoutRoute.
+
+ @param workoutRoute The HKWorkoutRoute for which the location data will be returned.
+ @param dataHandler The block to invoke with results from the query. It is called repeatedly with an array of
+ CLLocation objects until all data is returned and the done parameter is YES or if HKHealthStore
+ stopQuery: is called. The stopQuery call can be made within the dataHandler block. The number of
+ objects returned in routeData per dataHandler call is unspecified. Once done is YES, or
+ stopQuery called, the query is complete and no more calls to the handler will be made.
+ */
+- (instancetype)initWithRoute:(HKWorkoutRoute *)workoutRoute
+ dataHandler:(void(^)(HKWorkoutRouteQuery *query, NSArray<CLLocation *> * _Nullable routeData, BOOL done, NSError * _Nullable error))dataHandler;
+
+/*!
+ @method initWithRoute:dateInterval:dataHandler:
+ @abstract Returns a query that will retrieve CLLocation objects for the specified workoutRoute and dateInterval.
+
@param workoutRoute The HKWorkoutRoute for which the location data will be returned.
+ @param dateInterval The date interval for which the location data will be returned. If the requested interval does
+ not overlap with the specified workout route sample, an empty array of results is returned. If
+ the requested interval partially overlaps with the specified workout route sample, only location
+ data from within that overlapping time period is returned.
@param dataHandler The block to invoke with results from the query. It is called repeatedly with an array of
CLLocation objects until all data is returned and the done parameter is YES or if HKHealthStore
stopQuery: is called. The stopQuery call can be made within the dataHandler block. The number of
@@ -39,7 +56,8 @@
stopQuery called, the query is complete and no more calls to the handler will be made.
*/
- (instancetype)initWithRoute:(HKWorkoutRoute *)workoutRoute
- dataHandler:(void(^)(HKWorkoutRouteQuery *query, NSArray<CLLocation *> * _Nullable routeData, BOOL done, NSError * _Nullable error))dataHandler NS_DESIGNATED_INITIALIZER;
+ dateInterval:(NSDateInterval *)dateInterval
+ dataHandler:(void(^)(HKWorkoutRouteQuery *query, NSArray<CLLocation *> * _Nullable routeData, BOOL done, NSError * _Nullable error))dataHandler API_AVAILABLE(ios(16.0), watchos(9.0), macCatalyst(16.0), macos(13.0));
@end
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutSession.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutSession.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutSession.h 2022-02-23 07:15:54.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HKWorkoutSession.h 2022-05-31 15:02:17.000000000 -0400
@@ -2,12 +2,13 @@
// HKWorkoutSession.h
// HealthKit
//
-// Copyright (c) 2015-2018 Apple. All rights reserved.
+// Copyright (c) 2015-2022 Apple. All rights reserved.
//
#import <HealthKit/HKLiveWorkoutBuilder.h>
#import <HealthKit/HKMetadata.h>
#import <HealthKit/HKWorkout.h>
+#import <HealthKit/HKWorkoutActivity.h>
#import <HealthKit/HKWorkoutBuilder.h>
#import <HealthKit/HKWorkoutConfiguration.h>
@@ -92,6 +93,15 @@
@property (readonly, nullable) NSDate *endDate;
/*!
+ @property currentActivity
+ @abstract The current workout activity.
+ @discussion This returns a copy of the session's current workout activity. It will return
+ a copy of the main workout activity if no new activity has begun. Changes made
+ to the returned object have no impact on the HKWorkoutSession.
+ */
+@property (readonly, copy) HKWorkoutActivity *currentActivity API_AVAILABLE(watchos(9.0));
+
+/*!
@method initWithActivityType:locationType:
@param activityType The activity type of the workout session.
@@ -194,8 +204,27 @@
*/
- (HKLiveWorkoutBuilder *)associatedWorkoutBuilder API_AVAILABLE(watchos(5.0));
-@end
+/*!
+ @method beginNewActivityWithConfiguration:date:metadata:
+ @abstract Begins a new workout activity for this session.
+ @discussion This method will asynchronously begin the workout activity. The delegate for this session would be
+ informed once the activity effectively begins. Sensor algorithms to generate data would be updated
+ to match the new activity.
+ */
+- (void)beginNewActivityWithConfiguration:(HKWorkoutConfiguration *)workoutConfiguration
+ date:(NSDate *)date
+ metadata:(nullable NSDictionary<NSString *, id> *)metadata API_AVAILABLE(watchos(9.0)) NS_SWIFT_NAME(beginNewActivity(configuration:date:metadata:));
+
+/*!
+ @method endCurrentActivityOnDate:
+ @abstract Ends the current workout activity.
+ @discussion This method will end the current activity, reverting to the main session activity. The delegate for this session
+ would be informed once the activity effectively ends. Sensor algorithms to generate data would be updated to
+ match the main session activity.
+ */
+- (void)endCurrentActivityOnDate:(NSDate *)date API_AVAILABLE(watchos(9.0));
+@end
/*!
@enum HKWorkoutSessionStateDelegate
@@ -236,6 +265,28 @@
*/
- (void)workoutSession:(HKWorkoutSession *)workoutSession didGenerateEvent:(HKWorkoutEvent *)event API_AVAILABLE(ios(10.0), watchos(3.0));
+/*!
+ @method workoutSession:didBeginActivityWithConfiguration:date:
+ @abstract This method is called whenever a new activity begins.
+ @discussion Whenever a new workout activity begins, the new configuration would be passed to the session delegate
+ via this method. Clients may use this data to create a workout activity to save when building an HKWorkout
+ object.
+ */
+- (void)workoutSession:(HKWorkoutSession *)workoutSession
+didBeginActivityWithConfiguration:(HKWorkoutConfiguration *)workoutConfiguration
+ date:(NSDate *)date API_AVAILABLE(watchos(9.0));
+
+/*!
+ @method workoutSession:didEndActivityWithConfiguration:date:
+ @abstract This method is called whenever the current workout activity ends.
+ @discussion Whenever a new workout activity ends, the new configuration would be passed to the session delegate
+ via this method. Clients may use this data to create a workout activity to save when building an HKWorkout
+ object.
+ */
+- (void)workoutSession:(HKWorkoutSession *)workoutSession
+didEndActivityWithConfiguration:(HKWorkoutConfiguration *)workoutConfiguration
+ date:(NSDate *)date API_AVAILABLE(watchos(9.0));
+
@end
NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HealthKit.h /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HealthKit.h
--- /Applications/Xcode_13.3.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HealthKit.h 2022-02-23 00:34:08.000000000 -0500
+++ /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HealthKit.framework/Headers/HealthKit.h 2022-05-28 01:29:42.000000000 -0400
@@ -9,12 +9,16 @@
#import <HealthKit/HKActivitySummaryQuery.h>
#import <HealthKit/HKAnchoredObjectQuery.h>
#import <HealthKit/HKAppleWalkingSteadinessClassification.h>
+#import <HealthKit/HKAttachment.h>
+#import <HealthKit/HKAttachmentStore.h>
#import <HealthKit/HKAudiogramSample.h>
#import <HealthKit/HKCDADocumentSample.h>
#import <HealthKit/HKCategorySample.h>
#import <HealthKit/HKCharacteristicObjects.h>
#import <HealthKit/HKClinicalRecord.h>
#import <HealthKit/HKClinicalType.h>
+#import <HealthKit/HKContactsLensSpecification.h>
+#import <HealthKit/HKContactsPrescription.h>
#import <HealthKit/HKCorrelation.h>
#import <HealthKit/HKCorrelationQuery.h>
#import <HealthKit/HKCumulativeQuantitySample.h>
@@ -30,10 +34,13 @@
#import <HealthKit/HKFHIRRelease.h>
#import <HealthKit/HKFHIRResource.h>
#import <HealthKit/HKFHIRVersion.h>
+#import <HealthKit/HKGlassesLensSpecification.h>
+#import <HealthKit/HKGlassesPrescription.h>
#import <HealthKit/HKHealthStore.h>
#import <HealthKit/HKHeartbeatSeriesBuilder.h>
#import <HealthKit/HKHeartbeatSeriesQuery.h>
#import <HealthKit/HKHeartbeatSeriesSample.h>
+#import <HealthKit/HKLensSpecification.h>
#import <HealthKit/HKLiveWorkoutBuilder.h>
#import <HealthKit/HKLiveWorkoutDataSource.h>
#import <HealthKit/HKMetadata.h>
@@ -59,10 +66,13 @@
#import <HealthKit/HKStatisticsQuery.h>
#import <HealthKit/HKTypeIdentifiers.h>
#import <HealthKit/HKUnit.h>
+#import <HealthKit/HKVisionPrescription.h>
+#import <HealthKit/HKVisionPrism.h>
#import <HealthKit/HKVerifiableClinicalRecord.h>
#import <HealthKit/HKVerifiableClinicalRecordQuery.h>
#import <HealthKit/HKVerifiableClinicalRecordSubject.h>
#import <HealthKit/HKWorkout.h>
+#import <HealthKit/HKWorkoutActivity.h>
#import <HealthKit/HKWorkoutBuilder.h>
#import <HealthKit/HKWorkoutConfiguration.h>
#import <HealthKit/HKWorkoutRoute.h>
- README
- xcode13.0 Binding Status
- xcode13.1 Binding Status
- xcode13.2 Binding Status
- xcode13.3 Binding Status
- xcode13.4 Binding Status
- xcode14.0 Binding Status
- xcode14.1 Binding Status
- xcode14.2 Binding Status
- xcode14.3 Binding Status
- xcode15.0 Binding Status
- xcode15.1 Binding Status
- xcode15.3 Binding Status
- xcode15.4 Binding Status