Skip to content

Commit 4725fa6

Browse files
schmidt-sebastianschmidt-sebastian
authored
Merge pull request #577 from firebase/mrschmidt/fieldvalue
2 parents b5504d2 + 2495ac3 commit 4725fa6

File tree

31 files changed

+529
-321
lines changed

31 files changed

+529
-321
lines changed

‎Android/firebase_dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def firebaseDependenciesMap = [
3737
'com.google.flatbuffers:flatbuffers-java:1.12.0',
3838
'com.google.android.gms:play-services-base:17.6.0'],
3939
'performance' : ['com.google.firebase:firebase-perf:20.0.2'],
40-
'remote_config' : ['com.google.firebase:firebase-config:21.0.0',
40+
'remote_config' : ['com.google.firebase:firebase-config:21.0.1',
4141
'com.google.android.gms:play-services-base:17.6.0'],
4242
'storage' : ['com.google.firebase:firebase-storage:20.0.0'],
4343
'testlab' : []

‎admob/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ platform :ios, '10.0'
33
# Firebase AdMob test application.
44

55
target 'integration_test' do
6-
pod 'Firebase/Analytics', '8.4.0'
6+
pod 'Firebase/Analytics', '8.5.0'
77
pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk'
88
end
99

‎analytics/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '10.0'
44
# Firebase Analytics test application.
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '8.4.0'
7+
pod 'Firebase/Analytics', '8.5.0'
88
end
99

1010
post_install do |installer|

‎app/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '10.0'
44
# Firebase App test application.
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '8.4.0'
7+
pod 'Firebase/Analytics', '8.5.0'
88
end
99

1010
post_install do |installer|

‎auth/integration_test/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ source 'https://github.com/CocoaPods/Specs.git'
44

55
target 'integration_test' do
66
platform :ios, '10.0'
7-
pod 'Firebase/Auth', '8.4.0'
7+
pod 'Firebase/Auth', '8.5.0'
88
end
99

1010
target 'integration_test_tvos' do
1111
platform :tvos, '10.0'
12-
pod 'Firebase/Auth', '8.4.0'
12+
pod 'Firebase/Auth', '8.5.0'
1313
end
1414

1515
post_install do |installer|

‎cmake/external/firestore.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if(TARGET firestore)
1818
return()
1919
endif()
2020

21-
set(version CocoaPods-8.4.0)
21+
set(version CocoaPods-8.5.0)
2222
ExternalProject_Add(
2323
firestore
2424

‎cpp_sdk_version.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"released": "8.3.0",
3-
"stable": "8.3.0",
4-
"head": "8.3.0"
2+
"released": "8.4.0",
3+
"stable": "8.4.0",
4+
"head": "8.4.0"
55
}

‎database/integration_test/Podfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git'
44

55
target 'integration_test' do
66
platform :ios, '10.0'
7-
pod 'Firebase/Database', '8.4.0'
8-
pod 'Firebase/Auth', '8.4.0'
7+
pod 'Firebase/Database', '8.5.0'
8+
pod 'Firebase/Auth', '8.5.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '10.0'
13-
pod 'Firebase/Database', '8.4.0'
14-
pod 'Firebase/Auth', '8.4.0'
13+
pod 'Firebase/Database', '8.5.0'
14+
pod 'Firebase/Auth', '8.5.0'
1515
end
1616

1717
post_install do |installer|

‎dynamic_links/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '10.0'
44
# Firebase Dynamic Links test application.
55

66
target 'integration_test' do
7-
pod 'Firebase/DynamicLinks', '8.4.0'
7+
pod 'Firebase/DynamicLinks', '8.5.0'
88
end
99

1010
post_install do |installer|

‎firestore/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ target_link_libraries(firebase_firestore
281281

282282
if(FIRESTORE_USE_EXTERNAL_CMAKE_BUILD)
283283
target_link_libraries(firebase_firestore
284-
PRIVATE
284+
PUBLIC
285285
firestore_core
286286
absl_variant
287287
)
@@ -366,6 +366,11 @@ target_compile_definitions(firebase_firestore
366366
${FIREBASE_FIRESTORE_CPP_DEFINES}
367367
)
368368

369+
# Set the Nanopb preprocessor definitions to match those used by the iOS SDK.
370+
target_compile_definitions(firebase_firestore
371+
PUBLIC -DPB_FIELD_32BIT -DPB_ENABLE_MALLOC -DPB_NO_PACKED_STRUCTS
372+
)
373+
369374
if(ANDROID)
370375
firebase_cpp_proguard_file(firestore)
371376

‎firestore/integration_test/Podfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git'
44

55
target 'integration_test' do
66
platform :ios, '10.0'
7-
pod 'Firebase/Firestore', '8.4.0'
8-
pod 'Firebase/Auth', '8.4.0'
7+
pod 'Firebase/Firestore', '8.5.0'
8+
pod 'Firebase/Auth', '8.5.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '10.0'
13-
pod 'Firebase/Firestore', '8.4.0'
14-
pod 'Firebase/Auth', '8.4.0'
13+
pod 'Firebase/Firestore', '8.5.0'
14+
pod 'Firebase/Auth', '8.5.0'
1515
end
1616

1717
post_install do |installer|

‎firestore/integration_test_internal/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ include_directories(src)
205205
include_directories(${FIREBASE_CPP_SDK_DIR})
206206
# Additional public headers from Firestore core SDK.
207207
include_directories(${PROJECT_BINARY_DIR}/bin/external/src/firestore)
208+
include_directories(${PROJECT_BINARY_DIR}/bin/external/src/nanopb)
209+
include_directories(${PROJECT_BINARY_DIR}/bin/external/src/firestore/Firestore/Protos/nanopb)
208210
# Additional public headers for absl.
209211
include_directories(${ABSEIL_CPP_ROOT})
210212
# Allow testing internal Firebase APIs.

‎firestore/integration_test_internal/Podfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ platform :ios, '10.0'
44

55
target 'integration_test' do
66
platform :ios, '10.0'
7-
pod 'Firebase/Firestore', '8.4.0'
8-
pod 'Firebase/Auth', '8.4.0'
7+
pod 'Firebase/Firestore', '8.5.0'
8+
pod 'Firebase/Auth', '8.5.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '10.0'
13-
pod 'Firebase/Firestore', '8.4.0'
14-
pod 'Firebase/Auth', '8.4.0'
13+
pod 'Firebase/Firestore', '8.5.0'
14+
pod 'Firebase/Auth', '8.5.0'
1515
end
1616

1717
post_install do |installer|

‎firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,7 @@
726726
"\"$(SRCROOT)/external/googletest/src/googletest\"",
727727
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
728728
"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
729+
"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
729730
"\"$(SRCROOT)/../..\"",
730731
);
731732
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
@@ -768,6 +769,7 @@
768769
"\"$(SRCROOT)/external/googletest/src/googletest\"",
769770
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
770771
"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
772+
"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
771773
"\"$(SRCROOT)/../..\"",
772774
);
773775
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
@@ -829,6 +831,7 @@
829831
"\"$(SRCROOT)/external/googletest/src/googletest\"",
830832
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
831833
"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
834+
"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
832835
"\"$(SRCROOT)/../..\"",
833836
);
834837
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
@@ -894,6 +897,7 @@
894897
"\"$(SRCROOT)/external/googletest/src/googletest\"",
895898
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
896899
"\"$(SRCROOT)/Pods/FirebaseFirestore\"",
900+
"\"$(SRCROOT)/Pods/FirebaseFirestore/Firestore/Protos/nanopb\"",
897901
"\"$(SRCROOT)/../..\"",
898902
);
899903
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";

0 commit comments

Comments
 (0)