Skip to content

Remove conditional compilation in app check headers #8493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 4, 2021
Merged

Remove conditional compilation in app check headers #8493

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35cba53
Remove conditional compilation in app check headers
morganchen12 Aug 4, 2021
c4a4fcf
Fix missing symbols in build
morganchen12 Aug 4, 2021
f0dc8a6
throw exception
morganchen12 Aug 4, 2021
88ad2d0
update headerdocs
morganchen12 Aug 4, 2021
0676853
Revert changes except doc comments
morganchen12 Aug 4, 2021
9be5625
Update changelog
morganchen12 Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion FirebaseAppCheck/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# v8.5.0 -- Unreleased
# v8.6.0 -- M102
- [changed] Replaced conditionally-compiled APIs with `API_UNAVAILABLE` annotations on unsupported platforms (#8493).

# v8.5.0 -- M101
- [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)
# v8.4.0 -- M100
Expand Down
3 changes: 0 additions & 3 deletions FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckAvailability.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@

#pragma mark - DeviceCheck

// Targets where DeviceCheck framework is available to be used in preprocessor conditions.
#define FIR_DEVICE_CHECK_SUPPORTED_TARGETS TARGET_OS_IOS || TARGET_OS_OSX || TARGET_OS_TV

// `DeviceCheckProvider` availability.
#define FIR_DEVICE_CHECK_PROVIDER_AVAILABILITY \
API_AVAILABLE(ios(11.0), macos(10.15), tvos(11.0)) API_UNAVAILABLE(watchos)
Expand Down
8 changes: 2 additions & 6 deletions FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@

#import <Foundation/Foundation.h>

#import "FIRAppCheckProvider.h"

#import "FIRAppCheckAvailability.h"

#if FIR_DEVICE_CHECK_SUPPORTED_TARGETS
#import "FIRAppCheckProvider.h"

@class FIRApp;
@protocol FIRDeviceCheckAPIServiceProtocol;
Expand All @@ -30,6 +27,7 @@ NS_ASSUME_NONNULL_BEGIN

/// Firebase App Check provider that verifies app integrity using the
/// [DeviceCheck](https://developer.apple.com/documentation/devicecheck) API.
/// This class is available on iOS, macOS Catalyst, and macOS only.
FIR_DEVICE_CHECK_PROVIDER_AVAILABILITY
NS_SWIFT_NAME(DeviceCheckProvider)
@interface FIRDeviceCheckProvider : NSObject <FIRAppCheckProvider>
Expand All @@ -45,5 +43,3 @@ NS_SWIFT_NAME(DeviceCheckProvider)
@end

NS_ASSUME_NONNULL_END

#endif // FIR_DEVICE_CHECK_SUPPORTED_TARGETS
8 changes: 2 additions & 6 deletions FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProviderFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@
* limitations under the License.
*/

#import "FIRAppCheckAvailability.h"

#if FIR_DEVICE_CHECK_SUPPORTED_TARGETS

#import <Foundation/Foundation.h>

#import "FIRAppCheckAvailability.h"
#import "FIRAppCheckProviderFactory.h"

NS_ASSUME_NONNULL_BEGIN
Expand All @@ -28,12 +25,11 @@ NS_ASSUME_NONNULL_BEGIN
/// `DeviceCheckProvider` for the specified `FirebaseApp` on request. Currently
/// `DeviceCheckProviderFactory` is the default that will be used by Firebase App Check if no other
/// provider is specified. See `AppCheck` class for more details.
/// This class is available on iOS, macOS Catalyst, and macOS only.
FIR_DEVICE_CHECK_PROVIDER_AVAILABILITY
NS_SWIFT_NAME(DeviceCheckProviderFactory)
@interface FIRDeviceCheckProviderFactory : NSObject <FIRAppCheckProviderFactory>

@end

NS_ASSUME_NONNULL_END

#endif // FIR_DEVICE_CHECK_SUPPORTED_TARGETS