Skip to content

Fix Firestore visionOS build on Xcode 15.1 #12029

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 2 commits into from
Oct 31, 2023
Merged

Fix Firestore visionOS build on Xcode 15.1 #12029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acb315d
Fix Firestore visionOS build on Xcode 15.1
paulb777 Oct 31, 2023
2f38885
style
paulb777 Oct 31, 2023
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
3 changes: 3 additions & 0 deletions Firestore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Unreleased
- [fixed] Fix Firestore build for visionOS on Xcode 15.1. (#12023)

# 10.17.0
- [feature] Add support for sum and average aggregate queries.
- [feature] The `FirebaseFirestore` module now contains Firebase Firestore's
Expand Down
17 changes: 11 additions & 6 deletions Firestore/core/src/remote/connectivity_monitor_apple.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

#if defined(__APPLE__)

#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || \
(defined(TARGET_OS_VISION) && TARGET_OS_VISION)
#import <UIKit/UIKit.h>
#endif

Expand Down Expand Up @@ -49,7 +50,7 @@ NetworkStatus ToNetworkStatus(SCNetworkReachabilityFlags flags) {
return NetworkStatus::Unavailable;
}

#if TARGET_OS_IPHONE
#if TARGET_OS_IPHONE || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
if (flags & kSCNetworkReachabilityFlagsIsWWAN) {
return NetworkStatus::AvailableViaCellular;
}
Expand Down Expand Up @@ -112,7 +113,8 @@ explicit ConnectivityMonitorApple(
return;
}

#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || \
(defined(TARGET_OS_VISION) && TARGET_OS_VISION)
this->observer_ = [[NSNotificationCenter defaultCenter]
addObserverForName:UIApplicationWillEnterForegroundNotification
object:nil
Expand All @@ -124,7 +126,8 @@ explicit ConnectivityMonitorApple(
}

~ConnectivityMonitorApple() {
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || \
(defined(TARGET_OS_VISION) && TARGET_OS_VISION)
[[NSNotificationCenter defaultCenter] removeObserver:this->observer_];
#endif

Expand All @@ -139,7 +142,8 @@ explicit ConnectivityMonitorApple(
}
}

#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || \
(defined(TARGET_OS_VISION) && TARGET_OS_VISION)
void OnEnteredForeground() {
SCNetworkReachabilityFlags flags{};
if (!SCNetworkReachabilityGetFlags(reachability_, &flags)) return;
Expand Down Expand Up @@ -167,7 +171,8 @@ void OnReachabilityChanged(SCNetworkReachabilityFlags flags) {

private:
SCNetworkReachabilityRef reachability_ = nil;
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || \
(defined(TARGET_OS_VISION) && TARGET_OS_VISION)
id<NSObject> observer_ = nil;
#endif
};
Expand Down
5 changes: 3 additions & 2 deletions Firestore/core/src/util/filesystem_apple.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
}

StatusOr<Path> Filesystem::AppDataDir(absl::string_view app_name) {
#if TARGET_OS_IOS || TARGET_OS_OSX
#if TARGET_OS_IOS || TARGET_OS_OSX || \
(defined(TARGET_OS_VISION) && TARGET_OS_VISION)
NSArray<NSString*>* directories = NSSearchPathForDirectoriesInDomains(
NSApplicationSupportDirectory, NSUserDomainMask, YES);
return Path::FromNSString(directories[0]).AppendUtf8(app_name);
Expand All @@ -60,7 +61,7 @@
}

StatusOr<Path> Filesystem::LegacyDocumentsDir(absl::string_view app_name) {
#if TARGET_OS_IOS
#if TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
NSArray<NSString*>* directories = NSSearchPathForDirectoriesInDomains(
NSDocumentDirectory, NSUserDomainMask, YES);
return Path::FromNSString(directories[0]).AppendUtf8(app_name);
Expand Down