Skip to content

Update iOS dependencies - Tue May 31 2022 #977

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.

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 4 commits into from
Jun 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ endif()
# firebase-ios-sdk since it's not needed and can sometimes fail to build.
set(FIRESTORE_INCLUDE_OBJC OFF CACHE BOOL "Disabled for the CPP SDK")

# Disable re2 build tests
set(RE2_BUILD_TESTING OFF CACHE BOOL "")

if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
# Quote meta characters in ${CMAKE_CURRENT_LIST_DIR} so we can
# match it in a regex.
Expand Down
2 changes: 1 addition & 1 deletion admob/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '9.0.0'
pod 'Firebase/Analytics', '9.1.0'
pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2'
end

Expand Down
4 changes: 2 additions & 2 deletions analytics/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Analytics', '9.0.0'
pod 'Firebase/Analytics', '9.1.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Analytics', '9.0.0'
pod 'Firebase/Analytics', '9.1.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion analytics/ios_headers/FIREventNames.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2022 Google LLC

// Copied from Firebase Analytics iOS SDK 9.0.0.
// Copied from Firebase Analytics iOS SDK 9.1.0.

/// @file FIREventNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion analytics/ios_headers/FIRParameterNames.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2022 Google LLC

// Copied from Firebase Analytics iOS SDK 9.0.0.
// Copied from Firebase Analytics iOS SDK 9.1.0.

/// @file FIRParameterNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion analytics/ios_headers/FIRUserPropertyNames.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2022 Google LLC

// Copied from Firebase Analytics iOS SDK 9.0.0.
// Copied from Firebase Analytics iOS SDK 9.1.0.

/// @file FIRUserPropertyNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion app/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '9.0.0'
pod 'Firebase/Analytics', '9.1.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions auth/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Auth', '9.1.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Auth', '9.1.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/firestore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ endif()

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

function(GetReleasedDep)
message("Getting released firebase-ios-sdk @ ${version}")
Expand Down
65 changes: 65 additions & 0 deletions cmake/external/firestore_snappy.patch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -617,3 +617,68 @@ index 000000000..28bfb0837
+ const uint8_t*& ip = *ip_p;
+ // This section is crucial for the throughput of the decompression loop.
+ // The latency of an iteration is fundamentally constrained by the
diff --git a/Firestore/core/src/model/value_util.cc b/Firestore/core/src/model/value_util.cc
index 1b6bf07e0..41d1d6d26 100644
--- a/Firestore/core/src/model/value_util.cc
+++ b/Firestore/core/src/model/value_util.cc
@@ -53,26 +53,6 @@ const char* kRawMaxValueFieldValue = "__max__";
pb_bytes_array_s* kMaxValueFieldValue =
nanopb::MakeBytesArray(kRawMaxValueFieldValue);

-/** The special map field value entry of a maximum proto value. */
-google_firestore_v1_MapValue_FieldsEntry kMaxValueFieldEntry = {
- .key = kMaxValueFieldKey,
- .value = {
- .which_value_type = google_firestore_v1_Value_string_value_tag,
- .string_value = const_cast<pb_bytes_array_t*>(kMaxValueFieldValue)}};
-
-/** The special map value of a maximum proto value. */
-_google_firestore_v1_MapValue kMaxValueMapValue = {
- .fields_count = 1, .fields = &kMaxValueFieldEntry};
-
-/**
- * A maximum value that is larger than any other Firestore values. Underlying it
- * is a map value with a special map field that SDK user cannot possibly
- * construct.
- */
-google_firestore_v1_Value kMaxValue = {
- .which_value_type = google_firestore_v1_Value_map_value_tag,
- .map_value = kMaxValueMapValue};
-
} // namespace

using nanopb::Message;
@@ -703,8 +683,32 @@ bool IsMinValue(const google_firestore_v1_Value& value) {
return IsNullValue(value);
}

+/**
+ * Creates and returns a maximum value that is larger than any other Firestore
+ * values. Underlying it is a map value with a special map field that SDK user
+ * cannot possibly construct.
+ */
google_firestore_v1_Value MaxValue() {
- return kMaxValue;
+ google_firestore_v1_Value value;
+ value.which_value_type = google_firestore_v1_Value_string_value_tag;
+ value.string_value = kMaxValueFieldValue;
+
+ // Make `field_entry` static so that it has a memory address that outlives
+ // this function's scope; otherwise, using its address in the `map_value`
+ // variable below would be invalid by the time the caller accessed it.
+ static google_firestore_v1_MapValue_FieldsEntry field_entry;
+ field_entry.key = kMaxValueFieldKey;
+ field_entry.value = value;
+
+ google_firestore_v1_MapValue map_value;
+ map_value.fields_count = 1;
+ map_value.fields = &field_entry;
+
+ google_firestore_v1_Value max_value;
+ max_value.which_value_type = google_firestore_v1_Value_map_value_tag;
+ max_value.map_value = map_value;
+
+ return max_value;
}

bool IsMaxValue(const google_firestore_v1_Value& value) {
8 changes: 4 additions & 4 deletions database/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Database', '9.0.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Database', '9.1.0'
pod 'Firebase/Auth', '9.1.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Database', '9.0.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Database', '9.1.0'
pod 'Firebase/Auth', '9.1.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion dynamic_links/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/DynamicLinks', '9.0.0'
pod 'Firebase/DynamicLinks', '9.1.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Firestore', '9.0.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Firestore', '9.1.0'
pod 'Firebase/Auth', '9.1.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Firestore', '9.0.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Firestore', '9.1.0'
pod 'Firebase/Auth', '9.1.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test_internal/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Firestore', '9.0.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Firestore', '9.1.0'
pod 'Firebase/Auth', '9.1.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Firestore', '9.0.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Firestore', '9.1.0'
pod 'Firebase/Auth', '9.1.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions functions/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Functions', '9.0.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Functions', '9.1.0'
pod 'Firebase/Auth', '9.1.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Functions', '9.0.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Functions', '9.1.0'
pod 'Firebase/Auth', '9.1.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions installations/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ platform :ios, '10.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '9.0.0'
pod 'Firebase/Installations', '9.0.0'
pod 'Firebase/Analytics', '9.1.0'
pod 'Firebase/Installations', '9.1.0'
end

post_install do |installer|
Expand Down
24 changes: 12 additions & 12 deletions ios_pod/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ platform :ios, '10.0'
use_frameworks!

target 'GetPods' do
pod 'Firebase/Core', '9.0.0'
pod 'Firebase/Core', '9.1.0'

pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2'
pod 'Firebase/Analytics', '9.0.0'
pod 'Firebase/Auth', '9.0.0'
pod 'Firebase/Crashlytics', '9.0.0'
pod 'Firebase/Database', '9.0.0'
pod 'Firebase/DynamicLinks', '9.0.0'
pod 'Firebase/Firestore', '9.0.0'
pod 'Firebase/Functions', '9.0.0'
pod 'Firebase/Installations', '9.0.0'
pod 'Firebase/Messaging', '9.0.0'
pod 'Firebase/RemoteConfig', '9.0.0'
pod 'Firebase/Storage', '9.0.0'
pod 'Firebase/Analytics', '9.1.0'
pod 'Firebase/Auth', '9.1.0'
pod 'Firebase/Crashlytics', '9.1.0'
pod 'Firebase/Database', '9.1.0'
pod 'Firebase/DynamicLinks', '9.1.0'
pod 'Firebase/Firestore', '9.1.0'
pod 'Firebase/Functions', '9.1.0'
pod 'Firebase/Installations', '9.1.0'
pod 'Firebase/Messaging', '9.1.0'
pod 'Firebase/RemoteConfig', '9.1.0'
pod 'Firebase/Storage', '9.1.0'

end
2 changes: 1 addition & 1 deletion ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2022 Google LLC
// Copied from Firebase iOS SDK 9.0.0.
// Copied from Firebase iOS SDK 9.1.0.

// Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
// clang-1316.0.20.8)
Expand Down
2 changes: 1 addition & 1 deletion ios_pod/swift_headers/FirebaseCoreInternal-Swift.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2022 Google LLC
// Copied from Firebase iOS SDK 9.0.0.
// Copied from Firebase iOS SDK 9.1.0.

// Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62 clang-1316.0.20.8)
#ifndef FIREBASECOREINTERNAL_SWIFT_H
Expand Down
2 changes: 1 addition & 1 deletion ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2022 Google LLC
// Copied from Firebase iOS SDK 9.0.0.
// Copied from Firebase iOS SDK 9.1.0.

// Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
// clang-1316.0.20.8)
Expand Down
2 changes: 1 addition & 1 deletion ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2022 Google LLC
// Copied from Firebase iOS SDK 9.0.0.
// Copied from Firebase iOS SDK 9.1.0.

// Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
// clang-1316.0.20.8)
Expand Down
Loading