Skip to content

DO NOT MERGE: firestore.cmake: point at HEAD commit in master branch: https://githu… #950

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

Closed
wants to merge 5 commits into from
Closed

DO NOT MERGE: firestore.cmake: point at HEAD commit in master branch: https://githu… #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d91c390
firestore.cmake: point at HEAD commit in master branch: https://githu…
dconeybe May 10, 2022
1b9beed
CMakeLists.txt: set(RE2_BUILD_TESTING OFF CACHE BOOL "")
dconeybe May 11, 2022
7343ab5
lambda_event_listener.h: change path to firestore_errors.h include to…
dconeybe May 11, 2022
541047f
build_scripts/android/build.sh: reduce retries from 10 to 1, so CI do…
dconeybe May 11, 2022
2e79f97
Revert "lambda_event_listener.h: change path to firestore_errors.h in…
dconeybe May 11, 2022
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ endif()
# firebase-ios-sdk since it's not needed and can sometimes fail to build.
set(FIRESTORE_INCLUDE_OBJC OFF CACHE BOOL "Disabled for the CPP SDK")

# Disable re2 build tests
set(RE2_BUILD_TESTING OFF CACHE BOOL "")

if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
# Quote meta characters in ${CMAKE_CURRENT_LIST_DIR} so we can
# match it in a regex.
Expand Down
2 changes: 1 addition & 1 deletion build_scripts/android/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ set +e
# network connectivity issues that cause the download to fail.
gradleparams="-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false\
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120"
for retry in {1..10} error; do
for retry in {1..1} error; do
if [[ $retry == "error" ]]; then exit 5; fi
./gradlew assembleRelease "${gradleparams}" && break
sleep 300
Expand Down
8 changes: 2 additions & 6 deletions cmake/external/firestore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,13 @@ if(TARGET firestore)
return()
endif()

# If the format of the line below changes, then be sure to update
# https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
set(version CocoaPods-9.0.0)

function(GetReleasedDep)
message("Getting released firebase-ios-sdk @ ${version}")
ExternalProject_Add(
firestore

DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
URL https://github.com/firebase/firebase-ios-sdk/archive/${version}.tar.gz
GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git"
GIT_TAG c4c3d2f33c44c5fab79e4008ae086fa5bc7c0028

PREFIX ${PROJECT_BINARY_DIR}

Expand Down