Skip to content

Migrate CPP SDK from FieldValue to Protobuf #577

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 46 commits into from
Aug 18, 2021
Merged

Migrate CPP SDK from FieldValue to Protobuf #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
e5c1837
FieldValue port
schmidt-sebastian Jul 27, 2021
baed896
Feedback
schmidt-sebastian Jul 28, 2021
0ed529e
Lint
schmidt-sebastian Jul 28, 2021
273171b
Update source to master
schmidt-sebastian Jul 28, 2021
ab8b574
Fix compile
schmidt-sebastian Jul 28, 2021
a19d7cc
Add nanopb
schmidt-sebastian Jul 28, 2021
2206809
Use header
schmidt-sebastian Jul 28, 2021
147d5a8
Fix build
schmidt-sebastian Jul 29, 2021
f139608
Merge branch 'main' into mrschmidt/fieldvalue
schmidt-sebastian Jul 29, 2021
0b200d3
Updated Android and iOS dependencies for 8.4.0 release
schmidt-sebastian Aug 10, 2021
a511c1b
Merge
schmidt-sebastian Aug 10, 2021
30a4590
Merge branch 'main' into mrschmidt/fieldvalue
schmidt-sebastian Aug 10, 2021
4c572f7
Add header back
schmidt-sebastian Aug 11, 2021
fd4e5c2
Merge branch 'main' into mrschmidt/fieldvalue
schmidt-sebastian Aug 11, 2021
fb68ec7
Update CMakeLists.txt
schmidt-sebastian Aug 11, 2021
e12fb04
Fix test
schmidt-sebastian Aug 12, 2021
97c2a9c
Merge branch 'mrschmidt/fieldvalue' of github.com:firebase/firebase-c…
schmidt-sebastian Aug 12, 2021
b55a85f
Fix server timestamp
schmidt-sebastian Aug 12, 2021
2214b24
Add the nanopb header path to the internal testapp xcode project
a-maurice Aug 12, 2021
f24e3f7
More ServerTimestamp fixes
schmidt-sebastian Aug 12, 2021
36b4088
Merge branch 'mrschmidt/fieldvalue' of github.com:firebase/firebase-c…
schmidt-sebastian Aug 12, 2021
90918ca
Fix logic
schmidt-sebastian Aug 12, 2021
2c73631
Use valid values
schmidt-sebastian Aug 12, 2021
b898ab2
Missing break
schmidt-sebastian Aug 13, 2021
bb85fae
Merge branch 'main' into mrschmidt/fieldvalue
schmidt-sebastian Aug 13, 2021
322622a
Enable debug logging
schmidt-sebastian Aug 13, 2021
1e0c794
Only run one test
schmidt-sebastian Aug 13, 2021
e57cd53
Merge branch 'mrschmidt/fieldvalue' of github.com:firebase/firebase-c…
schmidt-sebastian Aug 13, 2021
6ac8e12
More tests
schmidt-sebastian Aug 13, 2021
929a343
Only run Firestore
schmidt-sebastian Aug 13, 2021
59b2f99
Don't crash
schmidt-sebastian Aug 13, 2021
91898df
More logging
schmidt-sebastian Aug 13, 2021
a655e31
More logging
schmidt-sebastian Aug 16, 2021
ee65f4e
Fix build
schmidt-sebastian Aug 16, 2021
38b6729
Merge branch 'main' into mrschmidt/fieldvalue
schmidt-sebastian Aug 16, 2021
10e6769
Display more test results
schmidt-sebastian Aug 16, 2021
89cb07b
Merge branch 'mrschmidt/fieldvalue' of github.com:firebase/firebase-c…
schmidt-sebastian Aug 16, 2021
cedfa82
Temporarily comment out the tests that fail on tvOS.
var-const Aug 17, 2021
d60bf24
Merge branch 'mrschmidt/fieldvalue' of https://github.com/firebase/fi…
var-const Aug 17, 2021
60b0dc1
Comment out `query_snapshot_test.cc` for good measure.
var-const Aug 17, 2021
cd23164
Merge branch 'mrschmidt/fieldvalue' of https://github.com/firebase/fi…
var-const Aug 17, 2021
55e61ed
Make sure the CMake build uses the same Nanopb definitions as the iOS
var-const Aug 18, 2021
268b1e9
Restore the commented out tests.
var-const Aug 18, 2021
e024ee1
Revert debugging changes
schmidt-sebastian Aug 18, 2021
7899926
Merge branch 'mrschmidt/fieldvalue' of github.com:firebase/firebase-c…
schmidt-sebastian Aug 18, 2021
2495ac3
Revert
schmidt-sebastian Aug 18, 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
2 changes: 1 addition & 1 deletion Android/firebase_dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def firebaseDependenciesMap = [
'com.google.flatbuffers:flatbuffers-java:1.12.0',
'com.google.android.gms:play-services-base:17.6.0'],
'performance' : ['com.google.firebase:firebase-perf:20.0.2'],
'remote_config' : ['com.google.firebase:firebase-config:21.0.0',
'remote_config' : ['com.google.firebase:firebase-config:21.0.1',
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this change intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, this is part of the version update that we want to release.

'com.google.android.gms:play-services-base:17.6.0'],
'storage' : ['com.google.firebase:firebase-storage:20.0.0'],
'testlab' : []
Expand Down
2 changes: 1 addition & 1 deletion admob/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ platform :ios, '10.0'
# Firebase AdMob test application.

target 'integration_test' do
pod 'Firebase/Analytics', '8.4.0'
pod 'Firebase/Analytics', '8.5.0'
pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk'
end

Expand Down
2 changes: 1 addition & 1 deletion analytics/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'
# Firebase Analytics test application.

target 'integration_test' do
pod 'Firebase/Analytics', '8.4.0'
pod 'Firebase/Analytics', '8.5.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion app/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'
# Firebase App test application.

target 'integration_test' do
pod 'Firebase/Analytics', '8.4.0'
pod 'Firebase/Analytics', '8.5.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions auth/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ source 'https://github.com/CocoaPods/Specs.git'

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Auth', '8.4.0'
pod 'Firebase/Auth', '8.5.0'
end

target 'integration_test_tvos' do
platform :tvos, '10.0'
pod 'Firebase/Auth', '8.4.0'
pod 'Firebase/Auth', '8.5.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/firestore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(TARGET firestore)
return()
endif()

set(version CocoaPods-8.4.0)
set(version CocoaPods-8.5.0)
ExternalProject_Add(
firestore

Expand Down
6 changes: 3 additions & 3 deletions cpp_sdk_version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"released": "8.3.0",
"stable": "8.3.0",
"head": "8.3.0"
"released": "8.4.0",
"stable": "8.4.0",
"head": "8.4.0"
}
8 changes: 4 additions & 4 deletions database/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git'

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Database', '8.4.0'
pod 'Firebase/Auth', '8.4.0'
pod 'Firebase/Database', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
end

target 'integration_test_tvos' do
platform :tvos, '10.0'
pod 'Firebase/Database', '8.4.0'
pod 'Firebase/Auth', '8.4.0'
pod 'Firebase/Database', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion dynamic_links/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'
# Firebase Dynamic Links test application.

target 'integration_test' do
pod 'Firebase/DynamicLinks', '8.4.0'
pod 'Firebase/DynamicLinks', '8.5.0'
end

post_install do |installer|
Expand Down
7 changes: 6 additions & 1 deletion firestore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ target_link_libraries(firebase_firestore

if(FIRESTORE_USE_EXTERNAL_CMAKE_BUILD)
target_link_libraries(firebase_firestore
PRIVATE
PUBLIC
firestore_core
absl_variant
)
Expand Down Expand Up @@ -366,6 +366,11 @@ target_compile_definitions(firebase_firestore
${FIREBASE_FIRESTORE_CPP_DEFINES}
)

# Set the Nanopb preprocessor definitions to match those used by the iOS SDK.
target_compile_definitions(firebase_firestore
PUBLIC -DPB_FIELD_32BIT -DPB_ENABLE_MALLOC -DPB_NO_PACKED_STRUCTS
)

if(ANDROID)
firebase_cpp_proguard_file(firestore)

Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git'

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Firestore', '8.4.0'
pod 'Firebase/Auth', '8.4.0'
pod 'Firebase/Firestore', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
end

target 'integration_test_tvos' do
platform :tvos, '10.0'
pod 'Firebase/Firestore', '8.4.0'
pod 'Firebase/Auth', '8.4.0'
pod 'Firebase/Firestore', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
end

post_install do |installer|
Expand Down
2 changes: 2 additions & 0 deletions firestore/integration_test_internal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ include_directories(src)
include_directories(${FIREBASE_CPP_SDK_DIR})
# Additional public headers from Firestore core SDK.
include_directories(${PROJECT_BINARY_DIR}/bin/external/src/firestore)
include_directories(${PROJECT_BINARY_DIR}/bin/external/src/nanopb)
include_directories(${PROJECT_BINARY_DIR}/bin/external/src/firestore/Firestore/Protos/nanopb)
# Additional public headers for absl.
include_directories(${ABSEIL_CPP_ROOT})
# Allow testing internal Firebase APIs.
Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test_internal/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ platform :ios, '10.0'

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Firestore', '8.4.0'
pod 'Firebase/Auth', '8.4.0'
pod 'Firebase/Firestore', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
end

target 'integration_test_tvos' do
platform :tvos, '10.0'
pod 'Firebase/Firestore', '8.4.0'
pod 'Firebase/Auth', '8.4.0'
pod 'Firebase/Firestore', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
end

post_install do |installer|
Expand Down
4 changes: 4 additions & 0 deletions firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,7 @@
"\"$(SRCROOT)/external/googletest/src/googletest\"",
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
"\"$(SRCROOT)/../..\"",
);
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
Expand Down Expand Up @@ -768,6 +769,7 @@
"\"$(SRCROOT)/external/googletest/src/googletest\"",
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
"\"$(SRCROOT)/../..\"",
);
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
Expand Down Expand Up @@ -829,6 +831,7 @@
"\"$(SRCROOT)/external/googletest/src/googletest\"",
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
"\"$(SRCROOT)/../..\"",
);
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
Expand Down Expand Up @@ -894,6 +897,7 @@
"\"$(SRCROOT)/external/googletest/src/googletest\"",
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
"\"$(SRCROOT)/../..\"",
);
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
Expand Down
Loading