From 0373d0bf40b3d29c10d75e5904a388f65f61be88 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Fri, 12 Aug 2022 12:06:15 -0400 Subject: [PATCH] [AppCheck] App Attest provider is supported by tvOS 15.0+ (#10093) * [AppCheck] Update supported targets for AppAttestProvider * CHANGELOG update --- FirebaseAppCheck/CHANGELOG.md | 1 + .../FIRAppCheckAvailability.h | 24 ++----------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/FirebaseAppCheck/CHANGELOG.md b/FirebaseAppCheck/CHANGELOG.md index 3dc03fd5f33..b22492bd24b 100644 --- a/FirebaseAppCheck/CHANGELOG.md +++ b/FirebaseAppCheck/CHANGELOG.md @@ -1,4 +1,5 @@ # 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+. # 9.0.0 diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckAvailability.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckAvailability.h index 19857ea91b3..8c92cb34378 100644 --- a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckAvailability.h +++ b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckAvailability.h @@ -46,29 +46,9 @@ #pragma mark - App Attest -// App Attest availability was extended to macOS and Mac Catalyst in Xcode 12.5. -#if (defined(__IPHONE_14_5) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_5) || \ - (defined(__MAC_11_3) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_11_3) || \ - (defined(__TVOS_14_5) && __TV_OS_VERSION_MAX_ALLOWED >= __TVOS_14_5) - -// Targets where `DCAppAttestService` is available to be used in preprocessor conditions. -#define FIR_APP_ATTEST_SUPPORTED_TARGETS TARGET_OS_IOS || TARGET_OS_OSX - -// `AppAttestProvider` availability annotations -#define FIR_APP_ATTEST_PROVIDER_AVAILABILITY \ - API_AVAILABLE(macos(11.0), ios(14.0)) API_UNAVAILABLE(tvos, watchos) - -#else // (defined(__IPHONE_14_5) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_5) || \ - (defined(__MAC_11_3) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_11_3) || \ - (defined(__TVOS_14_5) && __TV_OS_VERSION_MAX_ALLOWED >= __TVOS_14_5) - // Targets where `DCAppAttestService` is available to be used in preprocessor conditions. -#define FIR_APP_ATTEST_SUPPORTED_TARGETS TARGET_OS_IOS && !TARGET_OS_MACCATALYST +#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(ios(14.0)) API_UNAVAILABLE(macos, tvos, watchos) - -#endif // (defined(__IPHONE_14_5) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_5) || \ - (defined(__MAC_11_3) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_11_3) || \ - (defined(__TVOS_14_5) && __TV_OS_VERSION_MAX_ALLOWED >= __TVOS_14_5) + API_AVAILABLE(macos(11.0), ios(14.0), tvos(15.0)) API_UNAVAILABLE(watchos)