diff options
| author |  Rich Gowman <rgowman@google.com> | 2018-06-12 10:27:17 -0400 |
|---|---|---|
| committer | Rich Gowman <rgowman@google.com> | 2018-06-12 10:27:17 -0400 |
| commit | cf2899a085f7ceca3fad2d1fb5336be25cecd7ff (patch) | |
| tree | 38c835a29fcda279c8dd220781d2b5c726da307f /FirebaseFirestore.podspec | |
| parent | 1597765af8c897ab73d21d6d404f8eeede7890b1 (diff) | |
| parent | 9307f4893008f7d6cf9473e906d4c896546c5c8c (diff) | |
Merge remote-tracking branch 'origin/master' into rsgowman/protobuf_cpp
Also "fixed" BadFieldValueTagWithOtherValidTagsPresent test by changing
'false' to 'true'. Details: Depending on the version of nanopb, nanopb
would explicitly encode 'false', which shouldn't be done in proto3. When
it's explicitly encoded, the test worked properly. But when it was
(properly) dropped, the invalid tag is the only field that's actually
encoded, thus violating the assumptions of the test, leading to a test
failure. s/false/true fixes it, as now the boolean_value field is
(properly) encoded regardless of version.
Diffstat (limited to 'FirebaseFirestore.podspec')
| -rw-r--r-- | FirebaseFirestore.podspec | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index 7f4f340..339f87f 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseFirestore' - s.version = '0.12.1' + s.version = '0.12.2' s.summary = 'Google Cloud Firestore for iOS' s.description = <<-DESC @@ -55,17 +55,18 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, s.frameworks = 'MobileCoreServices' s.library = 'c++' s.pod_target_xcconfig = { - 'GCC_PREPROCESSOR_DEFINITIONS' => 'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ', + 'GCC_PREPROCESSOR_DEFINITIONS' => 'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ' + + 'FIRFirestore_VERSION=' + s.version.to_s + ' PB_FIELD_16BIT', 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}" ' + '"${PODS_TARGET_SRCROOT}/Firestore/third_party/abseil-cpp" ' + '"${PODS_ROOT}/nanopb" ' + '"${PODS_TARGET_SRCROOT}/Firestore/Protos/nanopb"', - 'OTHER_CFLAGS' => '-DFIRFirestore_VERSION=' + s.version.to_s + ' ' + - # The nanopb pod (which is pulled in indirectly) sets these defs, so we must too. - # (We *do* require 16bit (or larger) fields, so we'd have to set at least - # PB_FIELD_16BIT anyways.) - '-DPB_FIELD_32BIT -DPB_NO_PACKED_STRUCTS=1' + + # The nanopb pod (which is pulled in indirectly) sets these defs, so we + # must too. (We *do* require 16bit (or larger) fields, so we'd have to set + # at least PB_FIELD_16BIT anyways.) + 'OTHER_CFLAGS' => '-DPB_FIELD_32BIT -DPB_NO_PACKED_STRUCTS=1' } s.prepare_command = <<-CMD |