Skip to content

Fix Firestore builds under Xcode 8 #3647

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
Aug 22, 2019
Merged

Fix Firestore builds under Xcode 8 #3647

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
0fa0613
Fix Firestore builds under Xcode 8
wilhuff Aug 21, 2019
f043a86
FirebaseCore must be a local pod
wilhuff Aug 21, 2019
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/Example/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ target 'Firestore_Example_iOS' do
pod 'Firebase/CoreOnly', '6.6.0'

pod 'FirebaseFirestore', :path => '../../'
pod 'FirebaseCore', :path => '../../'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest adding GoogleUtilities back as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#3648 effectively does that for CI purposes.

target 'Firestore_Tests_iOS' do
inherit! :search_paths
Expand Down Expand Up @@ -86,6 +87,7 @@ target 'Firestore_Example_macOS' do
platform :osx, '10.11'

pod 'FirebaseFirestore', :path => '../../'
pod 'FirebaseCore', :path => '../../'

target 'Firestore_Tests_macOS' do
inherit! :search_paths
Expand Down Expand Up @@ -115,6 +117,7 @@ target 'Firestore_Example_tvOS' do
platform :tvos, '10.0'

pod 'FirebaseFirestore', :path => '../../'
pod 'FirebaseCore', :path => '../../'

target 'Firestore_Tests_tvOS' do
inherit! :search_paths
Expand Down
12 changes: 12 additions & 0 deletions scripts/install_prereqs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,18 @@ case "$PROJECT-$PLATFORM-$METHOD" in
;;

Firestore-*-xcodebuild | Firestore-*-fuzz)
if [[ $XCODE_VERSION == "8."* ]]; then
# Firestore still compiles with Xcode 8 to help verify general
# conformance with C++11 by using an older compiler that doesn't have as
# many extensions from later versions of the language. However, Firebase
# as a whole does not support this environment and @available checks in
# GoogleDataTransport would otherwise break this build.
#
# This drops the dependency that adds GoogleDataTransport into
# Firestore's dependencies.
sed -i.bak "/s.dependency 'FirebaseCoreDiagnostics'/d" FirebaseCore.podspec
fi

gem install xcpretty
bundle exec pod install --project-directory=Firestore/Example --repo-update
;;
Expand Down