Skip to content

Commit 2b81a0e

Browse files
firebase-workflow-trigger[bot]firebase-workflow-trigger-botdconeybe
authored
Update iOS dependencies - Tue May 31 2022 (#977)
* Update iOS dependencies - Tue May 31 2022 ### iOS - Firebase/Analytics → 9.1.0 - Firebase/Auth → 9.1.0 - Firebase/Core → 9.1.0 - Firebase/Crashlytics → 9.1.0 - Firebase/Database → 9.1.0 - Firebase/DynamicLinks → 9.1.0 - Firebase/Firestore → 9.1.0 - Firebase/Functions → 9.1.0 - Firebase/Installations → 9.1.0 - Firebase/Messaging → 9.1.0 - Firebase/RemoteConfig → 9.1.0 - Firebase/Storage → 9.1.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/2416912624). * CMakeLists.txt: set(RE2_BUILD_TESTING OFF CACHE BOOL "") This fixes the following build error: ``` The following tests FAILED: 1 - charclass_test (Not Run) 2 - compile_test (Not Run) 3 - filtered_re2_test (Not Run) 4 - mimics_pcre_test (Not Run) ... ``` e.g. https://github.com/firebase/firebase-cpp-sdk/runs/6676610733 This is caused by the addition of re2 to the firebase-ios-sdk in firebase/firebase-ios-sdk#9488. I'm not sure _why_ these tests can't be found; but they're superfluous anyways. So just disable them. * value_util.cc: Fix MaxValue() to no longer use designated initialization. This ports firebase/firebase-ios-sdk#9868 to the firebase-cpp-sdk repository by patching the firebase-ios-sdk when it is cloned. Once the dependency on the firebase-ios-sdk is updated to a version that already includes firebase/firebase-ios-sdk#9868 then this commit should be reverted. Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: Denver Coneybeare <[email protected]>
1 parent 21e79cd commit 2b81a0e

File tree

32 files changed

+492
-291
lines changed

32 files changed

+492
-291
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ endif()
214214
# firebase-ios-sdk since it's not needed and can sometimes fail to build.
215215
set(FIRESTORE_INCLUDE_OBJC OFF CACHE BOOL "Disabled for the CPP SDK")
216216

217+
# Disable re2 build tests
218+
set(RE2_BUILD_TESTING OFF CACHE BOOL "")
219+
217220
if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
218221
# Quote meta characters in ${CMAKE_CURRENT_LIST_DIR} so we can
219222
# match it in a regex.

‎admob/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
use_frameworks! :linkage => :static
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '9.0.0'
7+
pod 'Firebase/Analytics', '9.1.0'
88
pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2'
99
end
1010

‎analytics/integration_test/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
55

66
target 'integration_test' do
77
platform :ios, '10.0'
8-
pod 'Firebase/Analytics', '9.0.0'
8+
pod 'Firebase/Analytics', '9.1.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '12.0'
13-
pod 'Firebase/Analytics', '9.0.0'
13+
pod 'Firebase/Analytics', '9.1.0'
1414
end
1515

1616
post_install do |installer|

‎analytics/ios_headers/FIREventNames.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2022 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 9.0.0.
3+
// Copied from Firebase Analytics iOS SDK 9.1.0.
44

55
/// @file FIREventNames.h
66
///

‎analytics/ios_headers/FIRParameterNames.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2022 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 9.0.0.
3+
// Copied from Firebase Analytics iOS SDK 9.1.0.
44

55
/// @file FIRParameterNames.h
66
///

‎analytics/ios_headers/FIRUserPropertyNames.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2022 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 9.0.0.
3+
// Copied from Firebase Analytics iOS SDK 9.1.0.
44

55
/// @file FIRUserPropertyNames.h
66
///

‎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
use_frameworks! :linkage => :static
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '9.0.0'
7+
pod 'Firebase/Analytics', '9.1.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 @@ use_frameworks! :linkage => :static
44

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

1010
target 'integration_test_tvos' do
1111
platform :tvos, '12.0'
12-
pod 'Firebase/Auth', '9.0.0'
12+
pod 'Firebase/Auth', '9.1.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
@@ -20,7 +20,7 @@ endif()
2020

2121
# If the format of the line below changes, then be sure to update
2222
# https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
23-
set(version CocoaPods-9.0.0)
23+
set(version CocoaPods-9.1.0)
2424

2525
function(GetReleasedDep)
2626
message("Getting released firebase-ios-sdk @ ${version}")

‎cmake/external/firestore_snappy.patch.txt‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -617,3 +617,68 @@ index 000000000..28bfb0837
617617
+ const uint8_t*& ip = *ip_p;
618618
+ // This section is crucial for the throughput of the decompression loop.
619619
+ // The latency of an iteration is fundamentally constrained by the
620+
diff --git a/Firestore/core/src/model/value_util.cc b/Firestore/core/src/model/value_util.cc
621+
index 1b6bf07e0..41d1d6d26 100644
622+
--- a/Firestore/core/src/model/value_util.cc
623+
+++ b/Firestore/core/src/model/value_util.cc
624+
@@ -53,26 +53,6 @@ const char* kRawMaxValueFieldValue = "__max__";
625+
pb_bytes_array_s* kMaxValueFieldValue =
626+
nanopb::MakeBytesArray(kRawMaxValueFieldValue);
627+
628+
-/** The special map field value entry of a maximum proto value. */
629+
-google_firestore_v1_MapValue_FieldsEntry kMaxValueFieldEntry = {
630+
- .key = kMaxValueFieldKey,
631+
- .value = {
632+
- .which_value_type = google_firestore_v1_Value_string_value_tag,
633+
- .string_value = const_cast<pb_bytes_array_t*>(kMaxValueFieldValue)}};
634+
-
635+
-/** The special map value of a maximum proto value. */
636+
-_google_firestore_v1_MapValue kMaxValueMapValue = {
637+
- .fields_count = 1, .fields = &kMaxValueFieldEntry};
638+
-
639+
-/**
640+
- * A maximum value that is larger than any other Firestore values. Underlying it
641+
- * is a map value with a special map field that SDK user cannot possibly
642+
- * construct.
643+
- */
644+
-google_firestore_v1_Value kMaxValue = {
645+
- .which_value_type = google_firestore_v1_Value_map_value_tag,
646+
- .map_value = kMaxValueMapValue};
647+
-
648+
} // namespace
649+
650+
using nanopb::Message;
651+
@@ -703,8 +683,32 @@ bool IsMinValue(const google_firestore_v1_Value& value) {
652+
return IsNullValue(value);
653+
}
654+
655+
+/**
656+
+ * Creates and returns a maximum value that is larger than any other Firestore
657+
+ * values. Underlying it is a map value with a special map field that SDK user
658+
+ * cannot possibly construct.
659+
+ */
660+
google_firestore_v1_Value MaxValue() {
661+
- return kMaxValue;
662+
+ google_firestore_v1_Value value;
663+
+ value.which_value_type = google_firestore_v1_Value_string_value_tag;
664+
+ value.string_value = kMaxValueFieldValue;
665+
+
666+
+ // Make `field_entry` static so that it has a memory address that outlives
667+
+ // this function's scope; otherwise, using its address in the `map_value`
668+
+ // variable below would be invalid by the time the caller accessed it.
669+
+ static google_firestore_v1_MapValue_FieldsEntry field_entry;
670+
+ field_entry.key = kMaxValueFieldKey;
671+
+ field_entry.value = value;
672+
+
673+
+ google_firestore_v1_MapValue map_value;
674+
+ map_value.fields_count = 1;
675+
+ map_value.fields = &field_entry;
676+
+
677+
+ google_firestore_v1_Value max_value;
678+
+ max_value.which_value_type = google_firestore_v1_Value_map_value_tag;
679+
+ max_value.map_value = map_value;
680+
+
681+
+ return max_value;
682+
}
683+
684+
bool IsMaxValue(const google_firestore_v1_Value& value) {

0 commit comments

Comments
 (0)