|
21 | 21 |
|
22 | 22 | #pragma mark - DeviceCheck
|
23 | 23 |
|
24 |
| -// DeviceCheck availability was extended to watchOS in Xcode 14. |
25 |
| -#if defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0 |
26 |
| - |
27 | 24 | // Targets where DeviceCheck framework is available to be used in preprocessor conditions.
|
28 | 25 | #define FIR_DEVICE_CHECK_SUPPORTED_TARGETS \
|
29 | 26 | TARGET_OS_IOS || TARGET_OS_OSX || TARGET_OS_TV || TARGET_OS_WATCH
|
30 | 27 |
|
31 | 28 | // `DeviceCheckProvider` availability.
|
32 | 29 | #define FIR_DEVICE_CHECK_PROVIDER_AVAILABILITY \
|
33 |
| - API_AVAILABLE(ios(11.0), macos(10.15), tvos(11.0), watchos(9.0)) |
34 |
| - |
35 |
| -// TODO(ncooke3): Remove `#else` clause when Xcode 14 is the minimum supported Xcode. |
36 |
| -#else // defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0 |
37 |
| - |
38 |
| -// Targets where DeviceCheck framework is available to be used in preprocessor conditions. |
39 |
| -#define FIR_DEVICE_CHECK_SUPPORTED_TARGETS TARGET_OS_IOS || TARGET_OS_OSX || TARGET_OS_TV |
40 |
| - |
41 |
| -// `DeviceCheckProvider` availability. |
42 |
| -#define FIR_DEVICE_CHECK_PROVIDER_AVAILABILITY \ |
43 |
| - API_AVAILABLE(ios(11.0), macos(10.15), tvos(11.0)) API_UNAVAILABLE(watchos) |
44 |
| - |
45 |
| -#endif // defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0 |
| 30 | + API_AVAILABLE(ios(11.0), macos(10.15), macCatalyst(13.0), tvos(11.0), watchos(9.0)) |
46 | 31 |
|
47 | 32 | #pragma mark - App Attest
|
48 | 33 |
|
49 |
| -#if defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0 |
50 |
| - |
51 | 34 | // Targets where `DCAppAttestService` is available to be used in preprocessor conditions.
|
52 | 35 | #define FIR_APP_ATTEST_SUPPORTED_TARGETS \
|
53 | 36 | TARGET_OS_IOS || TARGET_OS_OSX || TARGET_OS_TV || TARGET_OS_WATCH
|
54 | 37 |
|
55 | 38 | // `AppAttestProvider` availability annotations
|
56 | 39 | #define FIR_APP_ATTEST_PROVIDER_AVAILABILITY \
|
57 |
| - API_AVAILABLE(macos(11.0), ios(14.0), tvos(15.0), watchos(9.0)) |
58 |
| - |
59 |
| -// TODO(ncooke3): Remove `#else` clause when Xcode 14 is the minimum supported Xcode. |
60 |
| -#else // defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0 |
61 |
| - |
62 |
| -// Targets where `DCAppAttestService` is available to be used in preprocessor conditions. |
63 |
| -#define FIR_APP_ATTEST_SUPPORTED_TARGETS TARGET_OS_IOS || TARGET_OS_OSX || TARGET_OS_TV |
64 |
| - |
65 |
| -// `AppAttestProvider` availability annotations |
66 |
| -#define FIR_APP_ATTEST_PROVIDER_AVAILABILITY \ |
67 |
| - API_AVAILABLE(macos(11.0), ios(14.0), tvos(15.0)) API_UNAVAILABLE(watchos) |
68 |
| - |
69 |
| -#endif // defined(__WATCHOS_9_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_9_0 |
| 40 | + API_AVAILABLE(ios(14.0), macos(11.3), macCatalyst(14.5), tvos(15.0), watchos(9.0)) |
0 commit comments