Skip to content

Remove the Firestore Snappy patch #932

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 40 commits into from
Closed

Remove the Firestore Snappy patch #932

Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
83306fd
firestore.cmake: remove the snappy patch and just update the leveldb …
dconeybe May 6, 2022
346a4a4
REVERT ME: Pin firebase-ios-sdk to https://github.com/firebase/fireba…
dconeybe May 9, 2022
e8f77a4
Merge branch 'main' into dconeybe/SnappyPatchRevert
jonsimantov May 9, 2022
6557527
Merge branch 'main' into dconeybe/SnappyPatchRevert
dconeybe May 10, 2022
12bc437
Merge remote-tracking branch 'origin/main' into SnappyPatchRevert
dconeybe May 20, 2022
57d03a9
firestore.cmake: updated pinned firebase-ios-sdk to HEAD now that the…
dconeybe May 20, 2022
bdcbbbc
CMakeLists.txt: set(RE2_BUILD_TESTING OFF CACHE BOOL "")
dconeybe May 11, 2022
c9dbc89
Merge remote-tracking branch 'origin/main' into SnappyPatchRevert
dconeybe May 26, 2022
ce9ca4f
firestore.cmake: update pinned commit to https://github.com/firebase/…
dconeybe May 26, 2022
c834bc6
firestore.cmake: update pinned commit to https://github.com/firebase/…
dconeybe May 27, 2022
b39452a
cherry-pick bundle_test.cc: Disable LoadBundleWithDocumentsAlreadyPul…
dconeybe May 27, 2022
f8e38b1
bundle_test.cc: disable ALL of the tests
dconeybe May 27, 2022
61d6ff9
Support git longpaths (#967)
wu-hui May 27, 2022
2a481ec
firestore.cmake: update pinned commit to HEAD, now that the fixes in …
dconeybe May 27, 2022
1880093
integration_tests.yml: explicitly install java so that we get a new e…
dconeybe May 28, 2022
a88bcb0
integration_tests.yml: install java 8 for the test run, overriding ja…
dconeybe May 28, 2022
ea31746
leveldb.cmake: add URL_HASH to improve security
dconeybe May 30, 2022
bbe4b3f
Merge remote-tracking branch 'origin/main' into LevelDbUrlHash
dconeybe May 30, 2022
04b5d8f
Merge remote-tracking branch 'origin/main' into SnappyPatchRevert
dconeybe May 30, 2022
0848e7a
Revert "bundle_test.cc: disable ALL of the tests"
dconeybe May 30, 2022
14b574a
Revert "cherry-pick bundle_test.cc: Disable LoadBundleWithDocumentsAl…
dconeybe May 30, 2022
0c78a7b
Merge remote-tracking branch 'origin/dconeybe/LevelDbUrlHash' into Sn…
dconeybe May 30, 2022
ca9eb56
Merge branch 'main' into dconeybe/SnappyPatchRevert
dconeybe May 31, 2022
1dfa36f
Update iOS dependencies - Tue May 31 2022
May 31, 2022
94b5f05
CMakeLists.txt: set(RE2_BUILD_TESTING OFF CACHE BOOL "")
dconeybe May 31, 2022
23e1096
Merge remote-tracking branch 'origin/workflow/auto-update-deps-111-20…
dconeybe May 31, 2022
2589c43
firestore.cmake: bump pinned commit
dconeybe May 31, 2022
895126f
value_util.cc: Fix MaxValue() to no longer use designated initializat…
dconeybe Jun 1, 2022
59db396
Merge branch 'main' into workflow/auto-update-deps-111-20220531-181942
dconeybe Jun 1, 2022
daa6c72
Merge remote-tracking branch 'origin/workflow/auto-update-deps-111-20…
dconeybe Jun 1, 2022
3888037
firestore.cmake: bump pinned commit
dconeybe May 31, 2022
a0a0f30
Merge remote-tracking branch 'origin/main' into SnappyPatchRevert
dconeybe Jun 1, 2022
655b7b6
Merge remote-tracking branch 'origin/main' into SnappyPatchRevert
dconeybe Jun 3, 2022
f033074
Merge remote-tracking branch 'origin/main' into SnappyPatchRevert
dconeybe Jun 7, 2022
6a7e47d
replace the fancy python script with a simple patch
dconeybe Jun 7, 2022
5e75846
leveldb.cmake: fix comment: firestore.patch -> firestore.patch.txt
dconeybe Jun 7, 2022
e145df3
Merge remote-tracking branch 'origin/main' into SnappyPatchRevert
dconeybe Jun 21, 2022
68d3768
Update iOS dependencies - Wed Jun 22 2022
Jun 22, 2022
1f15efb
Merge remote-tracking branch 'origin/workflow/auto-update-deps-116-20…
dconeybe Jun 22, 2022
1fcbbeb
remove pinned firebase-ios-sdk commit
dconeybe Jun 22, 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
8 changes: 5 additions & 3 deletions cmake/external/firestore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,17 @@ function(GetReleasedDep)
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"
# Pinned HEAD commit as of June 01, 2022 @ 10:51 EDT.
GIT_TAG 89c38d1ed908dbc10d5f9f7aded4cf271113773f
Copy link
Contributor

@jonsimantov jonsimantov Jun 8, 2022

Choose a reason for hiding this comment

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

Shouldn't GIT_TAG be ${version}, which will be updated to 9.2.0 or whatever when the time comes?

Copy link
Contributor Author

@dconeybe dconeybe Jun 9, 2022

Choose a reason for hiding this comment

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

Ahh yes, this particular part of the PR will be reverted. It's just here so I can test again the HEAD of the firebase-ios-sdk.


PREFIX ${PROJECT_BINARY_DIR}

CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore_snappy.patch.txt
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore.patch.txt
HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
)
endfunction()
Expand All @@ -57,7 +59,7 @@ function(GetTag t)
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore_snappy.patch.txt
PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore.patch.txt
HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
)
endfunction()
Expand Down
25 changes: 25 additions & 0 deletions cmake/external/firestore.patch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
index 920bf2928..c5c9cc7ee 100644
--- a/cmake/external/leveldb.cmake
+++ b/cmake/external/leveldb.cmake
@@ -24,7 +24,10 @@ if(TARGET leveldb)
return()
endif()

-set(version 1.22)
+# This version must be kept in sync with cmake/external/leveldb.cmake
+# in the firebase-cpp-sdk. If this version ever changes then make sure
+# to update leveldb.cmake in the firebase-cpp-sdk accordingly.
+set(version 1.23)

ExternalProject_Get_property(snappy SOURCE_DIR)
set(snappy_source_dir "${SOURCE_DIR}")
@@ -39,7 +42,7 @@ ExternalProject_Add(
DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
DOWNLOAD_NAME leveldb-${version}.tar.gz
URL https://github.com/google/leveldb/archive/${version}.tar.gz
- URL_HASH SHA256=55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2
+ URL_HASH SHA256=9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76

PREFIX ${PROJECT_BINARY_DIR}

Loading