Merge ff4a32c into 0373d0b

Author: ncooke3

FirebaseAppCheck/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 9.5.0
-- [added] AppCheck's App Attest provider is available for tvOS 15.0+.
-- [added] AppCheck's DeviceCheck provider is available for watchOS 9.0+.
+- [added] DeviceCheck and App Attest providers are supported by watchOS 9.0+
+- [added] App Attest provider availability updated to support tvOS 15.0+.
 
 # 9.0.0
 - [added] **Breaking change:** `FirebaseAppCheck` has exited beta and is now
@@ -21,13 +21,17 @@
 # 8.5.0
 - [changed] App Check SDK available for all supported platforms/OS versions, but App Attest and
 DeviceCheck providers availability changed to match underlying platfrom API availability. (#8388)
+
 # 8.4.0
 - [fixed] Fixed build issues introduced in Xcode 13 beta 3. (#8401)
 - [fixed] Bump Promises dependency. (#8365)
+
 # 8.3.0
 - [added] Token API for 3P use. (#8266)
+
 # 8.2.0
 - [added] Apple's App Attest attestation provider support. (#8133)
 - [changed] Token auto-refresh optimizations. (#8232)
+
 # 8.0.0
 - [added] Firebase abuse reduction support SDK. (#7928, #7937, #7948)

FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckAvailability.h

@@ -46,9 +46,24 @@
 
 #pragma mark - App Attest
 
+#if defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0
+
+// Targets where `DCAppAttestService` is available to be used in preprocessor conditions.
+#define FIR_APP_ATTEST_SUPPORTED_TARGETS \
+  TARGET_OS_IOS || TARGET_OS_OSX || TARGET_OS_TV || TARGET_OS_WATCH
+
+// `AppAttestProvider` availability annotations
+#define FIR_APP_ATTEST_PROVIDER_AVAILABILITY \
+  API_AVAILABLE(macos(11.0), ios(14.0), tvos(15.0), watchos(9.0))
+
+// TODO(ncooke3): Remove `#else` clause when Xcode 14 is the minimum supported Xcode.
+#else  // defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0
+
 // Targets where `DCAppAttestService` is available to be used in preprocessor conditions.
 #define FIR_APP_ATTEST_SUPPORTED_TARGETS TARGET_OS_IOS || TARGET_OS_OSX || TARGET_OS_TV
 
 // `AppAttestProvider` availability annotations
 #define FIR_APP_ATTEST_PROVIDER_AVAILABILITY \
   API_AVAILABLE(macos(11.0), ios(14.0), tvos(15.0)) API_UNAVAILABLE(watchos)
+
+#endif  // defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0