Update iOS dependencies - Mon Oct 10 2022

admob/integration_test/Podfile

@@ -1,11 +1,11 @@
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '10.0'
+platform :ios, '11.0'
 # Firebase AdMob test application.
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '9.6.0'
-  pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2'
+  pod 'Firebase/Analytics', '10.0.0'
+  pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk3'
 end
 
 post_install do |installer|

admob/integration_test/integration_test.xcodeproj/project.pbxproj

@@ -242,7 +242,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -279,7 +279,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

analytics/integration_test/Podfile

@@ -1,16 +1,16 @@
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '10.0'
+platform :ios, '11.0'
 # Firebase Analytics test application.
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  platform :ios, '10.0'
-  pod 'Firebase/Analytics', '9.6.0'
+  platform :ios, '11.0'
+  pod 'Firebase/Analytics', '10.0.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Analytics', '9.6.0'
+  pod 'Firebase/Analytics', '10.0.0'
 end
 
 post_install do |installer|

analytics/integration_test/integration_test.xcodeproj/project.pbxproj

@@ -407,7 +407,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -444,7 +444,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

analytics/ios_headers/FIREventNames.h

@@ -1,6 +1,6 @@
 // Copyright 2022 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 9.6.0.
+// Copied from Firebase Analytics iOS SDK 10.0.0.
 
 /// @file FIREventNames.h
 ///

analytics/ios_headers/FIRParameterNames.h

@@ -1,6 +1,6 @@
 // Copyright 2022 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 9.6.0.
+// Copied from Firebase Analytics iOS SDK 10.0.0.
 
 /// @file FIRParameterNames.h
 ///

analytics/ios_headers/FIRUserPropertyNames.h

@@ -1,6 +1,6 @@
 // Copyright 2022 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 9.6.0.
+// Copied from Firebase Analytics iOS SDK 10.0.0.
 
 /// @file FIRUserPropertyNames.h
 ///

app/integration_test/Podfile

@@ -1,10 +1,10 @@
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '10.0'
+platform :ios, '11.0'
 # Firebase App test application.
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '9.6.0'
+  pod 'Firebase/Analytics', '10.0.0'
 end
 
 post_install do |installer|

app/integration_test/integration_test.xcodeproj/project.pbxproj

@@ -242,7 +242,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -279,7 +279,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

auth/integration_test/Podfile

@@ -3,13 +3,13 @@ source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  platform :ios, '10.0'
-  pod 'Firebase/Auth', '9.6.0'
+  platform :ios, '11.0'
+  pod 'Firebase/Auth', '10.0.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Auth', '9.6.0'
+  pod 'Firebase/Auth', '10.0.0'
 end
 
 post_install do |installer|

auth/integration_test/integration_test.xcodeproj/project.pbxproj

@@ -430,7 +430,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -467,7 +467,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

cmake/external/firestore.cmake

@@ -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.6.0)
+set(version CocoaPods-10.0.0)
 
 function(GetReleasedDep)
   message("Getting released firebase-ios-sdk @ ${version}")

cmake/external/firestore.patch.txt

@@ -23,78 +23,3 @@ index 920bf2928..c5c9cc7ee 100644
 
    PREFIX ${PROJECT_BINARY_DIR}
 
-diff --git a/Firestore/core/src/local/local_store.cc b/Firestore/core/src/local/local_store.cc
-index 7685f1959..b48b4f9d2 100644
---- a/Firestore/core/src/local/local_store.cc
-+++ b/Firestore/core/src/local/local_store.cc
-@@ -662,15 +662,10 @@ absl::optional<bundle::NamedQuery> LocalStore::GetNamedQuery(
-
- void LocalStore::ConfigureFieldIndexes(
-     std::vector<FieldIndex> new_field_indexes) {
--  auto cmp = [](const FieldIndex& left, const FieldIndex& right) {
--    return FieldIndex::SemanticCompare(left, right) ==
--           util::ComparisonResult::Ascending;
--  };
--
-   // This lambda function takes a rvalue vector as parameter,
-   // then coverts it to a sorted set based on the compare function above.
--  auto convertToSet = [&](std::vector<FieldIndex>&& vec) {
--    std::set<FieldIndex, decltype(cmp)> result(cmp);
-+  auto convertToSet = [](std::vector<FieldIndex>&& vec) {
-+    std::set<FieldIndex, FieldIndex::SemanticLess> result;
-     for (auto& index : vec) {
-       result.insert(std::move(index));
-     }
-@@ -678,7 +673,7 @@ void LocalStore::ConfigureFieldIndexes(
-   };
-
-   return persistence_->Run("Configure indexes", [&] {
--    return util::DiffSets<FieldIndex, decltype(cmp)>(
-+    return util::DiffSets<FieldIndex, FieldIndex::SemanticLess>(
-         convertToSet(index_manager_->GetFieldIndexes()),
-         convertToSet(std::move(new_field_indexes)), FieldIndex::SemanticCompare,
-         [this](const model::FieldIndex& index) {
-diff --git a/Firestore/core/src/model/field_index.h b/Firestore/core/src/model/field_index.h
-index 96353b65f..57f159e9c 100644
---- a/Firestore/core/src/model/field_index.h
-+++ b/Firestore/core/src/model/field_index.h
-@@ -285,6 +285,21 @@ class FieldIndex {
-   /** Returns the ArrayContains/ArrayContainsAny segment for this index. */
-   absl::optional<Segment> GetArraySegment() const;
-
-+  /**
-+   * A type that can be used as the "Compare" template parameter of ordered
-+   * collections to have the elements ordered using
-+   * `FieldIndex::SemanticCompare()`.
-+   *
-+   * Example:
-+   * std::set<FieldIndex, FieldIndex::SemanticLess> result;
-+   */
-+  struct SemanticLess {
-+    bool operator()(const FieldIndex& left, const FieldIndex& right) const {
-+      return FieldIndex::SemanticCompare(left, right) ==
-+             util::ComparisonResult::Ascending;
-+    }
-+  };
-+
-  private:
-   friend bool operator==(const FieldIndex& lhs, const FieldIndex& rhs);
-   friend bool operator!=(const FieldIndex& lhs, const FieldIndex& rhs);
-diff --git a/Firestore/core/test/unit/local/leveldb_local_store_test.cc b/Firestore/core/test/unit/local/leveldb_local_store_test.cc
-index 4813b9816..54f24e90b 100644
---- a/Firestore/core/test/unit/local/leveldb_local_store_test.cc
-+++ b/Firestore/core/test/unit/local/leveldb_local_store_test.cc
-@@ -69,12 +69,7 @@ std::unique_ptr<LocalStoreTestHelper> Factory() {
- // This lambda function takes a rvalue vector as parameter,
- // then coverts it to a sorted set based on the compare function.
- auto convertToSet = [](std::vector<FieldIndex>&& vec) {
--  auto cmp = [](const FieldIndex& left, const FieldIndex& right) {
--    return FieldIndex::SemanticCompare(left, right) ==
--           util::ComparisonResult::Ascending;
--  };
--
--  std::set<FieldIndex, decltype(cmp)> result(cmp);
-+  std::set<FieldIndex, FieldIndex::SemanticLess> result;
-   for (auto& index : vec) {
-     result.insert(std::move(index));
-   }

database/integration_test/Podfile

@@ -3,15 +3,15 @@ source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  platform :ios, '10.0'
-  pod 'Firebase/Database', '9.6.0'
-  pod 'Firebase/Auth', '9.6.0'
+  platform :ios, '11.0'
+  pod 'Firebase/Database', '10.0.0'
+  pod 'Firebase/Auth', '10.0.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Database', '9.6.0'
-  pod 'Firebase/Auth', '9.6.0'
+  pod 'Firebase/Database', '10.0.0'
+  pod 'Firebase/Auth', '10.0.0'
 end
 
 post_install do |installer|

database/integration_test/integration_test.xcodeproj/project.pbxproj

@@ -354,7 +354,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -391,7 +391,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

dynamic_links/integration_test/Podfile

@@ -1,10 +1,10 @@
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '10.0'
+platform :ios, '11.0'
 # Firebase Dynamic Links test application.
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/DynamicLinks', '9.6.0'
+  pod 'Firebase/DynamicLinks', '10.0.0'
 end
 
 post_install do |installer|

dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj

@@ -242,7 +242,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -279,7 +279,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

firestore/integration_test/Podfile

@@ -3,15 +3,15 @@ source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  platform :ios, '10.0'
-  pod 'Firebase/Firestore', '9.6.0'
-  pod 'Firebase/Auth', '9.6.0'
+  platform :ios, '11.0'
+  pod 'Firebase/Firestore', '10.0.0'
+  pod 'Firebase/Auth', '10.0.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Firestore', '9.6.0'
-  pod 'Firebase/Auth', '9.6.0'
+  pod 'Firebase/Firestore', '10.0.0'
+  pod 'Firebase/Auth', '10.0.0'
 end
 
 post_install do |installer|

firestore/integration_test/integration_test.xcodeproj/project.pbxproj

@@ -450,7 +450,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -487,7 +487,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

firestore/integration_test_internal/Podfile

@@ -3,15 +3,15 @@ source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  platform :ios, '10.0'
-  pod 'Firebase/Firestore', '9.6.0'
-  pod 'Firebase/Auth', '9.6.0'
+  platform :ios, '11.0'
+  pod 'Firebase/Firestore', '10.0.0'
+  pod 'Firebase/Auth', '10.0.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Firestore', '9.6.0'
-  pod 'Firebase/Auth', '9.6.0'
+  pod 'Firebase/Firestore', '10.0.0'
+  pod 'Firebase/Auth', '10.0.0'
 end
 
 post_install do |installer|

firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj

@@ -677,7 +677,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -714,7 +714,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";