Merge pull request #577 from firebase/mrschmidt/fieldvalue

Author: schmidt-sebastian

Android/firebase_dependencies.gradle

@@ -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',
                      'com.google.android.gms:play-services-base:17.6.0'],
   'storage' : ['com.google.firebase:firebase-storage:20.0.0'],
   'testlab' : []

admob/integration_test/Podfile

@@ -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
 

analytics/integration_test/Podfile

@@ -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|

app/integration_test/Podfile

@@ -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|

auth/integration_test/Podfile

@@ -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|

cmake/external/firestore.cmake

@@ -18,7 +18,7 @@ if(TARGET firestore)
   return()
 endif()
 
-set(version CocoaPods-8.4.0)
+set(version CocoaPods-8.5.0)
 ExternalProject_Add(
   firestore
 

cpp_sdk_version.json

@@ -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"
 }

database/integration_test/Podfile

@@ -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|

dynamic_links/integration_test/Podfile

@@ -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|

firestore/CMakeLists.txt

@@ -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
   )
@@ -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)