From 83306fdcd69ed838a6b0ee449e5fbbfe8072929f Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Fri, 6 May 2022 15:23:24 -0400
Subject: [PATCH 01/24] firestore.cmake: remove the snappy patch and just
 update the leveldb version

---
 cmake/external/firestore.cmake            |  20 +-
 cmake/external/firestore_patch.py         | 122 +++++
 cmake/external/firestore_patch_test.py    | 265 +++++++++
 cmake/external/firestore_snappy.patch.txt | 619 ----------------------
 cmake/external/leveldb.cmake              |   1 +
 5 files changed, 406 insertions(+), 621 deletions(-)
 create mode 100644 cmake/external/firestore_patch.py
 create mode 100644 cmake/external/firestore_patch_test.py
 delete mode 100644 cmake/external/firestore_snappy.patch.txt

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 7cb97c0ce9..c9f8f3c020 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -18,6 +18,14 @@ if(TARGET firestore)
   return()
 endif()
 
+if(${CMAKE_VERSION} VERSION_LESS "3.12")
+  include(FindPythonInterp)
+  set(MY_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
+else()
+  find_package(Python3 COMPONENTS Interpreter REQUIRED)
+  set(MY_PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
+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)
@@ -36,7 +44,11 @@ function(GetReleasedDep)
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     TEST_COMMAND ""
-    PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore_snappy.patch.txt
+    PATCH_COMMAND
+      ${MY_PYTHON_EXECUTABLE}
+      ${CMAKE_CURRENT_LIST_DIR}/firestore_patch.py
+      --leveldb-version-from
+      ${CMAKE_CURRENT_LIST_DIR}/leveldb.cmake
     HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
     )
 endfunction()
@@ -57,7 +69,11 @@ function(GetTag t)
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     TEST_COMMAND ""
-    PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore_snappy.patch.txt
+    PATCH_COMMAND
+      ${MY_PYTHON_EXECUTABLE}
+      ${CMAKE_CURRENT_LIST_DIR}/firestore_patch.py
+      --leveldb-version-from
+      ${CMAKE_CURRENT_LIST_DIR}/leveldb.cmake
     HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
     )
 endfunction()
diff --git a/cmake/external/firestore_patch.py b/cmake/external/firestore_patch.py
new file mode 100644
index 0000000000..b5b50a258e
--- /dev/null
+++ b/cmake/external/firestore_patch.py
@@ -0,0 +1,122 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+Modify the version in leveldb.cmake from the Firebase iOS SDK to match the
+version from this C++ SDK.
+"""
+
+import argparse
+import os
+import pathlib
+import re
+from typing import List, Tuple
+
+
+VERSION_PATTERN = r"\s*set\s*\(\s*version\s+([^)\s]+)\s*\)\s*"
+VERSION_EXPR = re.compile(VERSION_PATTERN, re.IGNORECASE)
+URL_HASH_PATTERN = r"\s*URL_HASH\s+([0-9a-zA-Z=]+)\s*"
+URL_HASH_EXPR = re.compile(URL_HASH_PATTERN, re.IGNORECASE)
+
+
+def main() -> None:
+  (src_file, dest_file) = parse_args()
+
+  leveldb_version = load_value(src_file, VERSION_EXPR)
+  url_hash = load_value(src_file, URL_HASH_EXPR)
+
+  set_value(dest_file, VERSION_EXPR, leveldb_version)
+  set_value(dest_file, URL_HASH_EXPR, url_hash)
+
+
+def parse_args() -> Tuple[pathlib.Path, pathlib.Path]:
+  arg_parser = argparse.ArgumentParser()
+  arg_parser.add_argument("--leveldb-version-from", required=True)
+  arg_parser.add_argument("--leveldb-version-to")
+
+  parsed_args = arg_parser.parse_args()
+
+  leveldb_cmake_src_file = pathlib.Path(parsed_args.leveldb_version_from)
+
+  if parsed_args.leveldb_version_to:
+    leveldb_cmake_dest_file = pathlib.Path(parsed_args.leveldb_version_to)
+  else:
+    leveldb_cmake_dest_file = pathlib.Path.cwd() \
+      / "cmake" / "external" / "leveldb.cmake"
+
+  return (leveldb_cmake_src_file, leveldb_cmake_dest_file)
+
+
+def load_value(file_: pathlib.Path, expr: re.Pattern) -> str:
+  value = None
+  value_line = None
+  value_line_number = None
+
+  with file_.open("rt", encoding="utf8") as f:
+    for (line_number, line) in enumerate(f, start=1):
+      match = expr.fullmatch(line)
+      if not match:
+        continue
+      elif value is not None:
+        raise RegexMatchError(
+          f"Multiple lines matching regex {expr.pattern} found in "
+          f"{file_}: line {value_line_number}, {value_line.strip()} "
+          f"and line {line_number}, {line.strip()}")
+
+      value = match.group(1).strip()
+      value_line = line
+      value_line_number = line_number
+
+  if value is None:
+    raise RegexMatchError(
+      f"No line matching regex {expr.pattern} found in {file_}")
+
+  return value
+
+
+def set_value(file_: pathlib.Path, expr: re.Pattern, version: str) -> None:
+  with file_.open("rt", encoding="utf8") as f:
+    lines = list(f)
+
+  matching_line = None
+  matching_line_number = None
+
+  for (line_number, line) in enumerate(lines, start=1):
+    match = expr.fullmatch(line)
+    if not match:
+      continue
+    elif matching_line is not None:
+      raise RegexMatchError(
+        f"Multiple lines matching regex {expr.pattern} found in "
+        f"{file_}: line {matching_line_number}, {matching_line.strip()} "
+        f"and line {line_number}, {line.strip()}")
+
+    lines[line_number - 1] = line[:match.start(1)] + version + line[match.end(1):]
+    matching_line = line
+    matching_line_number = line_number
+
+  if matching_line is None:
+    raise RegexMatchError(
+      f"No line matching regex {expr.pattern} found in {file_}")
+
+  with file_.open("wt", encoding="utf8") as f:
+    f.writelines(lines)
+
+
+class RegexMatchError(Exception):
+  pass
+
+
+if __name__ == "__main__":
+  main()
diff --git a/cmake/external/firestore_patch_test.py b/cmake/external/firestore_patch_test.py
new file mode 100644
index 0000000000..bf739be555
--- /dev/null
+++ b/cmake/external/firestore_patch_test.py
@@ -0,0 +1,265 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import pathlib
+import re
+import shutil
+import tempfile
+from typing import Iterable
+import unittest
+import unittest.mock
+
+import firestore_patch
+
+
+class TestUtilsMixin:
+
+  def create_temp_file_with_lines(self, lines: Iterable[str]) -> pathlib.Path:
+    (handle, path_str) = tempfile.mkstemp()
+    os.close(handle)
+    path = pathlib.Path(path_str)
+    self.addCleanup(path.unlink, missing_ok=True) # pytype: disable=attribute-error
+
+    with path.open("wt", encoding="utf8") as f:
+      for line in lines:
+        print(line, file=f)
+
+    return path
+
+  def create_temp_file_with_line(self, line: str) -> pathlib.Path:
+    return self.create_temp_file_with_lines([line])
+
+
+class MainTest(TestUtilsMixin, unittest.TestCase):
+
+  def test(self):
+    src_file = self.create_temp_file_with_lines([
+      "aaa",
+      "bbb",
+      "set(version 1.2.3)",
+      "URL_HASH SHA256=abcdef",
+      "ccc",
+      "ddd",
+    ])
+    dest_file = self.create_temp_file_with_lines([
+      "aaa",
+      "bbb",
+      "set(version 4.5.6)",
+      "URL_HASH SHA256=ghijkl",
+      "ccc",
+      "ddd",
+    ])
+    dest_file_contents_before = dest_file.read_text(encoding="utf8")
+    patcher = unittest.mock.patch.object(
+      firestore_patch,
+      "parse_args",
+      spec_set=True,
+      autospec=True,
+      return_value=(src_file, dest_file)
+    )
+
+    with patcher:
+      firestore_patch.main()
+
+    dest_file_contents_after = dest_file.read_text(encoding="utf8")
+    self.assertEqual(
+      dest_file_contents_after,
+      dest_file_contents_before
+        .replace("4.5.6", "1.2.3")
+        .replace("ghijkl", "abcdef")
+    )
+
+
+class VersionExprTest(TestUtilsMixin, unittest.TestCase):
+
+  def test_matches_semantic_version(self):
+    path = self.create_temp_file_with_line("set(version 1.2.3)")
+
+    value = firestore_patch.load_value(path, firestore_patch.VERSION_EXPR)
+
+    self.assertEqual(value, "1.2.3")
+
+  def test_matches_sha1(self):
+    path = self.create_temp_file_with_line("set(version fd054fa01)")
+
+    value = firestore_patch.load_value(path, firestore_patch.VERSION_EXPR)
+
+    self.assertEqual(value, "fd054fa01")
+
+  def test_ignores_whitespace(self):
+    path = self.create_temp_file_with_line("  set  (  version   1.2.3  )   ")
+
+    value = firestore_patch.load_value(path, firestore_patch.VERSION_EXPR)
+
+    self.assertEqual(value, "1.2.3")
+
+  def test_case_insensitive(self):
+    path = self.create_temp_file_with_line("sEt(vErSiOn 1.2.3)")
+
+    value = firestore_patch.load_value(path, firestore_patch.VERSION_EXPR)
+
+    self.assertEqual(value, "1.2.3")
+
+
+class UrlHashExprTest(TestUtilsMixin, unittest.TestCase):
+
+  def test_matches_sha256(self):
+    path = self.create_temp_file_with_line("URL_HASH SHA256=abc123def456")
+
+    value = firestore_patch.load_value(path, firestore_patch.URL_HASH_EXPR)
+
+    self.assertEqual(value, "SHA256=abc123def456")
+
+  def test_ignores_whitespace(self):
+    path = self.create_temp_file_with_line("  URL_HASH   abc123def456  ")
+
+    value = firestore_patch.load_value(path, firestore_patch.URL_HASH_EXPR)
+
+    self.assertEqual(value, "abc123def456")
+
+  def test_case_insensitive(self):
+    path = self.create_temp_file_with_line("UrL_hAsH Sha256=abc123def456")
+
+    value = firestore_patch.load_value(path, firestore_patch.URL_HASH_EXPR)
+
+    self.assertEqual(value, "Sha256=abc123def456")
+
+
+class LoadValueTest(TestUtilsMixin, unittest.TestCase):
+
+  def test_loads_the_value(self):
+    path = self.create_temp_file_with_line("aaa1234ccc")
+    expr = re.compile(r"\D+(\d+)\D+")
+
+    value = firestore_patch.load_value(path, expr)
+
+    self.assertEqual(value, "1234")
+
+  def test_loads_the_value_ignoring_non_matching_lines(self):
+    path = self.create_temp_file_with_lines([
+      "blah",
+      "blah",
+      "aaa1234cccc",
+      "blah",
+      "blah",
+    ])
+    expr = re.compile(r"\D+(\d+)\D+")
+
+    value = firestore_patch.load_value(path, expr)
+
+    self.assertEqual(value, "1234")
+
+  def test_raises_error_if_no_matching_line_found(self):
+    path = self.create_temp_file_with_lines([
+      "blah",
+      "blah",
+      "blah",
+      "blah",
+    ])
+    expr = re.compile(r"\D+(\d+)\D+")
+
+    with self.assertRaises(firestore_patch.RegexMatchError) as cm:
+      firestore_patch.load_value(path, expr)
+
+    self.assertIn("no line matching", str(cm.exception).lower())
+    self.assertIn(expr.pattern, str(cm.exception))
+    self.assertIn(str(path), str(cm.exception))
+
+  def test_raises_error_if_multiple_matching_lines_found(self):
+    lines = ["blah"] * 100
+    lines.append("aaa123bbb")
+    lines.append("ccc456ddd")
+    path = self.create_temp_file_with_lines(lines)
+    expr = re.compile(r"\D+(\d+)\D+")
+
+    with self.assertRaises(firestore_patch.RegexMatchError) as cm:
+      firestore_patch.load_value(path, expr)
+
+    self.assertIn("multiple lines matching", str(cm.exception).lower())
+    self.assertIn(str(path), str(cm.exception))
+    self.assertIn(expr.pattern, str(cm.exception))
+    self.assertIn("line 101", str(cm.exception))
+    self.assertIn("line 102", str(cm.exception))
+    self.assertIn("123", str(cm.exception))
+    self.assertIn("456", str(cm.exception))
+
+
+class SaveValueTest(TestUtilsMixin, unittest.TestCase):
+
+  def test_saves_the_value(self):
+    path = self.create_temp_file_with_line("aaa1234ccc")
+    expr = re.compile(r"\D+(\d+)\D+")
+
+    firestore_patch.set_value(path, expr, "9876")
+
+    new_value = firestore_patch.load_value(path, expr)
+    self.assertEqual(new_value, "9876")
+
+  def test_saves_the_value_ignoring_non_matching_lines(self):
+    path = self.create_temp_file_with_lines([
+      "blah",
+      "blah",
+      "aaa1234cccc",
+      "blah",
+      "blah",
+    ])
+    expr = re.compile(r"\D+(\d+)\D+")
+    file_contents_before = path.read_text(encoding="utf8")
+
+    firestore_patch.set_value(path, expr, "9876")
+
+    file_contents_after = path.read_text(encoding="utf8")
+    self.assertEqual(
+      file_contents_after,
+      file_contents_before.replace("1234", "9876"),
+    )
+
+  def test_raises_error_if_no_matching_line_found(self):
+    path = self.create_temp_file_with_lines([
+      "blah",
+      "blah",
+      "blah",
+      "blah",
+    ])
+    expr = re.compile(r"\D+(\d+)\D+")
+
+    with self.assertRaises(firestore_patch.RegexMatchError) as cm:
+      firestore_patch.set_value(path, expr, "")
+
+    self.assertIn("no line matching", str(cm.exception).lower())
+    self.assertIn(expr.pattern, str(cm.exception))
+    self.assertIn(str(path), str(cm.exception))
+
+  def test_raises_error_if_multiple_matching_lines_found(self):
+    lines = ["blah"] * 100
+    lines.append("aaa123bbb")
+    lines.append("ccc456ddd")
+    path = self.create_temp_file_with_lines(lines)
+    expr = re.compile(r"\D+(\d+)\D+")
+
+    with self.assertRaises(firestore_patch.RegexMatchError) as cm:
+      firestore_patch.set_value(path, expr, "")
+
+    self.assertIn("multiple lines matching", str(cm.exception).lower())
+    self.assertIn(str(path), str(cm.exception))
+    self.assertIn(expr.pattern, str(cm.exception))
+    self.assertIn("line 101", str(cm.exception))
+    self.assertIn("line 102", str(cm.exception))
+    self.assertIn("123", str(cm.exception))
+    self.assertIn("456", str(cm.exception))
+
+
+if __name__ == "__main__":
+  unittest.main()
diff --git a/cmake/external/firestore_snappy.patch.txt b/cmake/external/firestore_snappy.patch.txt
deleted file mode 100644
index 317ecc6823..0000000000
--- a/cmake/external/firestore_snappy.patch.txt
+++ /dev/null
@@ -1,619 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 29458bf13..7be37691d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -227,6 +227,12 @@ if(NOT ZLIB_FOUND)
- endif()
- 
- 
-+# Snappy
-+set(SNAPPY_BUILD_TESTS OFF CACHE BOOL "Firestore disabled")
-+set(SNAPPY_BUILD_BENCHMARKS OFF CACHE BOOL "Firestore disabled")
-+add_external_subdirectory(snappy)
-+firebase_ios_add_alias(Snappy::Snappy snappy)
-+
- # LevelDB
- set(LEVELDB_BUILD_TESTS OFF CACHE BOOL "Firestore disabled")
- set(LEVELDB_BUILD_BENCHMARKS OFF CACHE BOOL "Firestore disabled")
-diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
-index 2179633a8..c1de37b6d 100644
---- a/cmake/external/CMakeLists.txt
-+++ b/cmake/external/CMakeLists.txt
-@@ -35,6 +35,7 @@ include(c-ares)
- include(googletest)
- include(GoogleUtilities)
- include(grpc)
-+include(snappy)
- include(leveldb)
- include(libfuzzer)
- include(nanopb)
-diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
-index b71a77535..2556d7041 100644
---- a/cmake/external/leveldb.cmake
-+++ b/cmake/external/leveldb.cmake
-@@ -13,20 +13,27 @@
- # limitations under the License.
- 
- include(ExternalProject)
-+include(FindPythonInterp)
- 
- if(TARGET leveldb)
-   return()
- endif()
- 
--set(version 1.22)
-+set(version 1.23)
-+
-+ExternalProject_Get_property(snappy SOURCE_DIR)
-+set(snappy_source_dir "${SOURCE_DIR}")
-+ExternalProject_Get_property(snappy BINARY_DIR)
-+set(snappy_binary_dir "${BINARY_DIR}")
- 
- ExternalProject_Add(
-   leveldb
- 
-+  DEPENDS snappy
-+
-   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
-   DOWNLOAD_NAME leveldb-${version}.tar.gz
-   URL https://github.com/google/leveldb/archive/${version}.tar.gz
--  URL_HASH SHA256=55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2
- 
-   PREFIX ${PROJECT_BINARY_DIR}
- 
-@@ -34,6 +41,7 @@ ExternalProject_Add(
-   BUILD_COMMAND     ""
-   INSTALL_COMMAND   ""
-   TEST_COMMAND      ""
-+  PATCH_COMMAND     ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/leveldb_patch.py --snappy-source-dir ${snappy_source_dir} --snappy-binary-dir ${snappy_binary_dir}
- 
-   HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
- )
-diff --git a/cmake/external/leveldb_patch.py b/cmake/external/leveldb_patch.py
-new file mode 100644
-index 000000000..51a62d54a
---- /dev/null
-+++ b/cmake/external/leveldb_patch.py
-@@ -0,0 +1,144 @@
-+# Copyright 2022 Google LLC
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+#      http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+
-+"""
-+Modify the CMakeLists.txt from LevelDb to staticly link Snappy compression
-+support.
-+"""
-+
-+import argparse
-+import dataclasses
-+import os
-+import pathlib
-+from typing import Iterable, Sequence
-+
-+
-+def main() -> None:
-+  arg_parser = argparse.ArgumentParser()
-+  arg_parser.add_argument("--snappy-source-dir", required=True)
-+  arg_parser.add_argument("--snappy-binary-dir", required=True)
-+  parsed_args = arg_parser.parse_args()
-+  del arg_parser
-+  snappy_source_dir = pathlib.Path(parsed_args.snappy_source_dir)
-+  snappy_binary_dir = pathlib.Path(parsed_args.snappy_binary_dir)
-+  del parsed_args
-+
-+  cmakelists_txt_file = pathlib.Path("CMakeLists.txt")
-+  with cmakelists_txt_file.open("rt", encoding="utf8") as f:
-+    lines = tuple(f)
-+
-+  patcher = CMakeListsPatcher(
-+    lines,
-+    os.path.abspath(__file__),
-+    snappy_source_dir,
-+    snappy_binary_dir,
-+  )
-+
-+  patched_lines = tuple(patcher.patch())
-+
-+  with cmakelists_txt_file.open("wt", encoding="utf8") as f:
-+    f.writelines(patched_lines)
-+
-+
-+@dataclasses.dataclass(frozen=True)
-+class LineComponents:
-+  full: str
-+  indent: str
-+  line: str
-+  eol: str
-+
-+
-+class CMakeListsPatcher:
-+
-+  SNAPPY_DETECT_LINE = \
-+    """check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)"""
-+  SNAPPY_INCLUDE_LINE = \
-+    "target_include_directories(leveldb"
-+  SNAPPY_LINK_LINE = \
-+    "target_link_libraries(leveldb snappy)"
-+
-+  def __init__(
-+      self,
-+      lines: Sequence[str],
-+      script_name: str,
-+      snappy_source_dir: pathlib.Path,
-+      snappy_binary_dir: pathlib.Path) -> None:
-+    self.i = 0
-+    self.lines = lines
-+    self.script_name = script_name
-+    self.snappy_source_dir_str = snappy_source_dir.as_posix()
-+    self.snappy_binary_dir_str = snappy_binary_dir.as_posix()
-+
-+  def patch(self) -> Iterable[str]:
-+    while self.i < len(self.lines):
-+      full_line = self.lines[self.i]
-+      line = self._split_line(full_line)
-+      self.i += 1
-+
-+      if line.line == self.SNAPPY_DETECT_LINE:
-+        yield from self._on_snappy_detect_line(line)
-+      elif line.line == self.SNAPPY_INCLUDE_LINE:
-+        yield full_line
-+        yield from self._on_leveldb_include_start()
-+      elif line.line == self.SNAPPY_LINK_LINE:
-+        yield from self._on_leveldb_snappy_link_line(line)
-+      else:
-+        yield full_line
-+
-+  def _begin_mod_line(self, mod_name: str) -> str:
-+    return f"# BEGIN: {mod_name} modification by {self.script_name}"
-+
-+  def _end_mod_line(self, mod_name: str) -> str:
-+    return f"# END: {mod_name} modification by {self.script_name}"
-+
-+  def _on_snappy_detect_line(self, line: LineComponents) -> Iterable[str]:
-+    yield self._begin_mod_line("snappy_detect_line") + line.eol
-+    yield line.indent + "# " + line.line + line.eol
-+    yield line.indent + """set(HAVE_SNAPPY ON CACHE BOOL "")""" + line.eol
-+    yield self._end_mod_line("snappy_detect_line") + line.eol
-+
-+  def _on_leveldb_include_start(self) -> Iterable[str]:
-+    line1 = self._split_line(self.lines[self.i])
-+    line2 = self._split_line(self.lines[self.i + 1])
-+    begin_mod_line = self._begin_mod_line("leveldb_include_start")
-+
-+    if line1.line == begin_mod_line:
-+      return
-+
-+    yield begin_mod_line + line1.eol
-+    yield line1.indent + "PRIVATE" + line1.eol
-+    yield line2.indent + self.snappy_source_dir_str + line2.eol
-+    yield line2.indent + self.snappy_binary_dir_str + line2.eol
-+    yield self._end_mod_line("leveldb_include_start") + line1.eol
-+
-+  def _on_leveldb_snappy_link_line(self, line: LineComponents) -> Iterable[str]:
-+    yield self._begin_mod_line("leveldb_snappy_link_line") + line.eol
-+    yield line.indent + "# " + line.line + line.eol
-+    yield line.indent + f"target_link_libraries(leveldb Snappy::Snappy)" + line.eol
-+    yield self._end_mod_line("leveldb_snappy_link_line") + line.eol
-+
-+  def _split_line(self, line: str) -> LineComponents:
-+    line_rstripped = line.rstrip()
-+    eol = line[len(line_rstripped):]
-+    line_stripped = line_rstripped.strip()
-+    indent = line_rstripped[:len(line_rstripped) - len(line_stripped)]
-+    return LineComponents(full=line, indent=indent, line=line_stripped, eol=eol)
-+
-+
-+class LeveDbPatchException(Exception):
-+  pass
-+
-+
-+if __name__ == "__main__":
-+  main()
-diff --git a/cmake/external/leveldb_patch_test.py b/cmake/external/leveldb_patch_test.py
-new file mode 100644
-index 000000000..b1d62526b
---- /dev/null
-+++ b/cmake/external/leveldb_patch_test.py
-@@ -0,0 +1,328 @@
-+# Copyright 2022 Google LLC
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+#      http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+
-+import leveldb_patch
-+import pathlib
-+import unittest
-+
-+
-+class CMakeListsPatcherTest(unittest.TestCase):
-+
-+  def setUp(self):
-+    super().setUp()
-+    self.sample_snappy_source_dir = pathlib.Path("a/b/snappy_source_dir")
-+    self.sample_snappy_binary_dir = pathlib.Path("a/b/snappy_binary_dir")
-+
-+  def test_snappy_detect_line_is_commented_and_replaced(self):
-+    lines = (
-+      """check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)""",
-+    )
-+    patcher = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      "MyCoolScript",
-+      self.sample_snappy_source_dir,
-+      self.sample_snappy_binary_dir,
-+    )
-+
-+    patched_lines = tuple(patcher.patch())
-+
-+    self.assertSequenceEqual(patched_lines, [
-+      "# BEGIN: snappy_detect_line modification by MyCoolScript",
-+      """# check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)""",
-+      """set(HAVE_SNAPPY ON CACHE BOOL "")""",
-+      "# END: snappy_detect_line modification by MyCoolScript",
-+    ])
-+
-+  def test_snappy_detect_line_has_indent_and_eol_preserved(self):
-+    lines = (
-+      """  check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)   \n""",
-+    )
-+    patcher = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      "MyCoolScript",
-+      self.sample_snappy_source_dir,
-+      self.sample_snappy_binary_dir,
-+    )
-+
-+    patched_lines = tuple(patcher.patch())
-+
-+    self.assertSequenceEqual(patched_lines, [
-+      "# BEGIN: snappy_detect_line modification by MyCoolScript   \n",
-+      """  # check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)   \n""",
-+      """  set(HAVE_SNAPPY ON CACHE BOOL "")   \n""",
-+      "# END: snappy_detect_line modification by MyCoolScript   \n",
-+    ])
-+
-+  def test_snappy_detect_line_does_not_affect_surrounding_lines(self):
-+    lines = (
-+      "aaa",
-+      "bbb",
-+      """check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)""",
-+      "ccc",
-+      "ddd",
-+    )
-+    patcher = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      "MyCoolScript",
-+      self.sample_snappy_source_dir,
-+      self.sample_snappy_binary_dir,
-+    )
-+
-+    patched_lines = tuple(patcher.patch())
-+
-+    self.assertSequenceEqual(patched_lines, [
-+      "aaa",
-+      "bbb",
-+      "# BEGIN: snappy_detect_line modification by MyCoolScript",
-+      """# check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)""",
-+      """set(HAVE_SNAPPY ON CACHE BOOL "")""",
-+      "# END: snappy_detect_line modification by MyCoolScript",
-+      "ccc",
-+      "ddd",
-+    ])
-+
-+  def test_snappy_include_is_amended(self):
-+    lines = (
-+      "target_include_directories(leveldb",
-+      "PUBLIC",
-+      "path1",
-+      "path2",
-+      ")",
-+    )
-+    patcher = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      script_name="MyCoolSript",
-+      snappy_source_dir=pathlib.Path("a/b"),
-+      snappy_binary_dir=pathlib.Path("c/d"),
-+    )
-+
-+    patched_lines = tuple(patcher.patch())
-+
-+    self.assertSequenceEqual(patched_lines, [
-+      "target_include_directories(leveldb",
-+      "# BEGIN: leveldb_include_start modification by MyCoolSript",
-+      "PRIVATE",
-+      "a/b",
-+      "c/d",
-+      "# END: leveldb_include_start modification by MyCoolSript",
-+      "PUBLIC",
-+      "path1",
-+      "path2",
-+      ")",
-+    ])
-+
-+  def test_snappy_include_lines_adopt_indenting_and_eol_convention(self):
-+    lines = (
-+      "target_include_directories(leveldb\n",
-+      "  PUBLIC   \n",
-+      "      path1 \n",
-+      "      path2 \n",
-+      ")\n",
-+    )
-+    patcher = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      script_name="MyCoolSript",
-+      snappy_source_dir=pathlib.Path("a/b"),
-+      snappy_binary_dir=pathlib.Path("c/d"),
-+    )
-+
-+    patched_lines = tuple(patcher.patch())
-+
-+    self.assertSequenceEqual(patched_lines, [
-+      "target_include_directories(leveldb\n",
-+      "# BEGIN: leveldb_include_start modification by MyCoolSript   \n",
-+      "  PRIVATE   \n",
-+      "      a/b \n",
-+      "      c/d \n",
-+      "# END: leveldb_include_start modification by MyCoolSript   \n",
-+      "  PUBLIC   \n",
-+      "      path1 \n",
-+      "      path2 \n",
-+      ")\n",
-+    ])
-+
-+  def test_snappy_include_line_does_not_affect_surrounding_lines(self):
-+    lines = (
-+      "aaa",
-+      "bbb",
-+      "target_include_directories(leveldb",
-+      "PUBLIC",
-+      "path1",
-+      "path2",
-+      ")",
-+      "ccc",
-+      "ddd",
-+    )
-+    patcher = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      script_name="MyCoolSript",
-+      snappy_source_dir=pathlib.Path("a/b"),
-+      snappy_binary_dir=pathlib.Path("c/d"),
-+    )
-+
-+    patched_lines = tuple(patcher.patch())
-+
-+    self.assertSequenceEqual(patched_lines, [
-+      "aaa",
-+      "bbb",
-+      "target_include_directories(leveldb",
-+      "# BEGIN: leveldb_include_start modification by MyCoolSript",
-+      "PRIVATE",
-+      "a/b",
-+      "c/d",
-+      "# END: leveldb_include_start modification by MyCoolSript",
-+      "PUBLIC",
-+      "path1",
-+      "path2",
-+      ")",
-+      "ccc",
-+      "ddd",
-+    ])
-+
-+  def test_leveldb_snappy_link_line_is_commented_and_replaced(self):
-+    lines = (
-+      "target_link_libraries(leveldb snappy)",
-+    )
-+    patcher = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      script_name="MyCoolSript",
-+      snappy_source_dir=pathlib.Path("a/b"),
-+      snappy_binary_dir=pathlib.Path("c/d"),
-+    )
-+
-+    patched_lines = tuple(patcher.patch())
-+
-+    self.assertSequenceEqual(patched_lines, [
-+      "# BEGIN: leveldb_snappy_link_line modification by MyCoolSript",
-+      "# target_link_libraries(leveldb snappy)",
-+      "target_link_libraries(leveldb Snappy::Snappy)",
-+      "# END: leveldb_snappy_link_line modification by MyCoolSript",
-+    ])
-+
-+  def test_leveldb_snappy_link_line_has_indent_and_eol_preserved(self):
-+    lines = (
-+      " target_link_libraries(leveldb snappy)   \n",
-+    )
-+    patcher = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      script_name="MyCoolSript",
-+      snappy_source_dir=pathlib.Path("a/b"),
-+      snappy_binary_dir=pathlib.Path("c/d"),
-+    )
-+
-+    patched_lines = tuple(patcher.patch())
-+
-+    self.assertSequenceEqual(patched_lines, [
-+      "# BEGIN: leveldb_snappy_link_line modification by MyCoolSript   \n",
-+      " # target_link_libraries(leveldb snappy)   \n",
-+      " target_link_libraries(leveldb Snappy::Snappy)   \n",
-+      "# END: leveldb_snappy_link_line modification by MyCoolSript   \n",
-+    ])
-+
-+  def test_leveldb_snappy_link_line_does_not_affect_surrounding_lines(self):
-+    lines = (
-+      "aaa",
-+      "bbb",
-+      "target_link_libraries(leveldb snappy)",
-+      "ccc",
-+      "ddd",
-+    )
-+    patcher = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      script_name="MyCoolSript",
-+      snappy_source_dir=pathlib.Path("a/b"),
-+      snappy_binary_dir=pathlib.Path("c/d"),
-+    )
-+
-+    patched_lines = tuple(patcher.patch())
-+
-+    self.assertSequenceEqual(patched_lines, [
-+      "aaa",
-+      "bbb",
-+      "# BEGIN: leveldb_snappy_link_line modification by MyCoolSript",
-+      "# target_link_libraries(leveldb snappy)",
-+      "target_link_libraries(leveldb Snappy::Snappy)",
-+      "# END: leveldb_snappy_link_line modification by MyCoolSript",
-+      "ccc",
-+      "ddd",
-+    ])
-+
-+  def test_all_patches_combined(self):
-+    lines = (
-+      """check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)""",
-+      "target_include_directories(leveldb",
-+      "PUBLIC",
-+      "path1",
-+      ")",
-+      "target_link_libraries(leveldb snappy)",
-+    )
-+
-+    patcher = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      script_name="MyCoolSript",
-+      snappy_source_dir=pathlib.Path("a/b"),
-+      snappy_binary_dir=pathlib.Path("c/d"),
-+    )
-+    patched_lines = tuple(patcher.patch())
-+
-+    self.assertSequenceEqual(patched_lines, [
-+      "# BEGIN: snappy_detect_line modification by MyCoolSript",
-+      """# check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)""",
-+      """set(HAVE_SNAPPY ON CACHE BOOL "")""",
-+      "# END: snappy_detect_line modification by MyCoolSript",
-+      "target_include_directories(leveldb",
-+      "# BEGIN: leveldb_include_start modification by MyCoolSript",
-+      "PRIVATE",
-+      "a/b",
-+      "c/d",
-+      "# END: leveldb_include_start modification by MyCoolSript",
-+      "PUBLIC",
-+      "path1",
-+      ")",
-+      "# BEGIN: leveldb_snappy_link_line modification by MyCoolSript",
-+      "# target_link_libraries(leveldb snappy)",
-+      "target_link_libraries(leveldb Snappy::Snappy)",
-+      "# END: leveldb_snappy_link_line modification by MyCoolSript",
-+    ])
-+
-+  def test_idempotence(self):
-+    lines = (
-+      """check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)\n""",
-+      "target_include_directories(leveldb",
-+      "PUBLIC",
-+      "path1",
-+      ")",
-+      "target_link_libraries(leveldb snappy)",
-+    )
-+
-+    patcher1 = leveldb_patch.CMakeListsPatcher(
-+      lines,
-+      script_name="MyCoolSript",
-+      snappy_source_dir=pathlib.Path("a/b"),
-+      snappy_binary_dir=pathlib.Path("c/d"),
-+    )
-+    patched_lines1 = tuple(patcher1.patch())
-+    patcher2 = leveldb_patch.CMakeListsPatcher(
-+      patched_lines1,
-+      script_name="MyCoolSript",
-+      snappy_source_dir=pathlib.Path("a/b"),
-+      snappy_binary_dir=pathlib.Path("c/d"),
-+    )
-+    patched_lines2 = tuple(patcher2.patch())
-+
-+    self.assertSequenceEqual(patched_lines1, patched_lines2)
-+
-+
-+if __name__ == "__main__":
-+  unittest.main()
-diff --git a/cmake/external/snappy.cmake b/cmake/external/snappy.cmake
-new file mode 100644
-index 000000000..9f25c03d0
---- /dev/null
-+++ b/cmake/external/snappy.cmake
-@@ -0,0 +1,40 @@
-+# Copyright 2022 Google LLC
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+#      http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+
-+include(ExternalProject)
-+
-+if(TARGET snappy)
-+  return()
-+endif()
-+
-+set(version 1.1.9)
-+
-+ExternalProject_Add(
-+  snappy
-+
-+  DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
-+  DOWNLOAD_NAME snappy-${version}.tar.gz
-+  URL https://github.com/google/snappy/archive/refs/tags/${version}.tar.gz
-+  URL_HASH SHA256=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7
-+
-+  PREFIX ${PROJECT_BINARY_DIR}
-+
-+  CONFIGURE_COMMAND ""
-+  BUILD_COMMAND     ""
-+  INSTALL_COMMAND   ""
-+  TEST_COMMAND      ""
-+  PATCH_COMMAND     patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/snappy.patch
-+
-+  HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
-+)
-diff --git a/cmake/external/snappy.patch b/cmake/external/snappy.patch
-new file mode 100644
-index 000000000..28bfb0837
---- /dev/null
-+++ b/cmake/external/snappy.patch
-@@ -0,0 +1,12 @@
-+diff -Naur snappy/snappy.cc snappy_patched/snappy.cc
-+--- snappy/snappy.cc	2022-04-12 20:44:55.000000000 -0400
-++++ snappy_patched/snappy.cc	2022-04-12 20:47:05.000000000 -0400
-+@@ -1014,7 +1014,7 @@
-+ }
-+ 
-+ SNAPPY_ATTRIBUTE_ALWAYS_INLINE
-+-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
-++inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
-+   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/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
index 18970659a4..a8a154bb4e 100644
--- a/cmake/external/leveldb.cmake
+++ b/cmake/external/leveldb.cmake
@@ -26,6 +26,7 @@ ExternalProject_Add(
   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
   DOWNLOAD_NAME leveldb-${version}.tar.gz
   URL https://github.com/google/leveldb/archive/${version}.tar.gz
+  URL_HASH SHA256=9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76
 
   PREFIX ${PROJECT_BINARY_DIR}
 

From 346a4a4109cd33db553de0f700d4a52bad57cb92 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Mon, 9 May 2022 18:34:39 +0000
Subject: [PATCH 02/24] REVERT ME: Pin firebase-ios-sdk to
 https://github.com/firebase/firebase-ios-sdk/pull/9596/commits/ece67740ac77e95de658471e4b3d63161d5df5f0

---
 cmake/external/firestore.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index c9f8f3c020..75891eeafb 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -36,7 +36,10 @@ function(GetReleasedDep)
     firestore
 
     DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
-    URL https://github.com/firebase/firebase-ios-sdk/archive/${version}.tar.gz
+    GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git"
+    # Pinned commit from https://github.com/firebase/firebase-ios-sdk/pull/9596
+    # (Enable Snappy compression support in LevelDb in cmake builds)
+    GIT_TAG ece67740ac77e95de658471e4b3d63161d5df5f0
 
     PREFIX ${PROJECT_BINARY_DIR}
 

From 57d03a9cebd16f05cda61472c8b562e11ce80525 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Fri, 20 May 2022 14:05:25 -0400
Subject: [PATCH 03/24] firestore.cmake: updated pinned firebase-ios-sdk to
 HEAD now that the PR that adds Snappy support has been merged there

---
 cmake/external/firestore.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 75891eeafb..e7c6898f58 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -37,9 +37,9 @@ function(GetReleasedDep)
 
     DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
     GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git"
-    # Pinned commit from https://github.com/firebase/firebase-ios-sdk/pull/9596
-    # (Enable Snappy compression support in LevelDb in cmake builds)
-    GIT_TAG ece67740ac77e95de658471e4b3d63161d5df5f0
+    # Pinned HEAD commit after https://github.com/firebase/firebase-ios-sdk/pull/9596
+    # (Enable Snappy compression support in LevelDb in cmake builds) was merged.
+    GIT_TAG c0df0d4ab11d4ae30c307a0c7dcdb29e3e0dc411
 
     PREFIX ${PROJECT_BINARY_DIR}
 

From bdcbbbc5a84e36663497644280269cd87a6b5317 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Wed, 11 May 2022 04:35:52 +0000
Subject: [PATCH 04/24] CMakeLists.txt: set(RE2_BUILD_TESTING OFF CACHE BOOL
 "")

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb610fdc90..83b2a3fde5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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.

From ce9ca4f46c821d99def4dee18d5b775444ff6264 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Thu, 26 May 2022 16:28:50 -0400
Subject: [PATCH 05/24] firestore.cmake: update pinned commit to
 https://github.com/firebase/firebase-cpp-sdk/pull/967, which fixes a
 problematic python_setup.cmake bug

---
 cmake/external/firestore.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index e7c6898f58..bd7e5e14e5 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -37,9 +37,9 @@ function(GetReleasedDep)
 
     DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
     GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git"
-    # Pinned HEAD commit after https://github.com/firebase/firebase-ios-sdk/pull/9596
-    # (Enable Snappy compression support in LevelDb in cmake builds) was merged.
-    GIT_TAG c0df0d4ab11d4ae30c307a0c7dcdb29e3e0dc411
+    # Pinned commit in https://github.com/firebase/firebase-cpp-sdk/pull/967, which fixes a
+    # problematic python_setup.cmake bug.
+    GIT_TAG 0dbc5dd788e8c41b1530e6b392df739be223948c
 
     PREFIX ${PROJECT_BINARY_DIR}
 

From c834bc6e4595d47d8ebfc887bc8c54bb6ad0682c Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Fri, 27 May 2022 00:04:11 -0400
Subject: [PATCH 06/24] firestore.cmake: update pinned commit to
 https://github.com/firebase/firebase-ios-sdk/pull/9851, which fixes a
 problematic usage of designated initialization

---
 cmake/external/firestore.cmake | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index bd7e5e14e5..ea5171a9d3 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -37,9 +37,11 @@ function(GetReleasedDep)
 
     DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
     GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git"
-    # Pinned commit in https://github.com/firebase/firebase-cpp-sdk/pull/967, which fixes a
-    # problematic python_setup.cmake bug.
-    GIT_TAG 0dbc5dd788e8c41b1530e6b392df739be223948c
+    # Pinned commit in https://github.com/firebase/firebase-ios-sdk/pull/9851 which fixes a
+    # problematic usage of designated initialization. This commit also includes
+    # https://github.com/firebase/firebase-ios-sdk/pull/9847, which fixes a problematic bug in
+    # python_setup.cmake.
+    GIT_TAG f2fb419cd3332ac74be0a7076841b2162a96060d
 
     PREFIX ${PROJECT_BINARY_DIR}
 

From b39452a83d80216e9be5b2d201cc0c8578e99407 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Fri, 27 May 2022 00:12:19 -0400
Subject: [PATCH 07/24] cherry-pick bundle_test.cc: Disable
 LoadBundleWithDocumentsAlreadyPulledFromBackend
 (https://github.com/firebase/firebase-cpp-sdk/pull/972)

---
 firestore/integration_test_internal/src/bundle_test.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/firestore/integration_test_internal/src/bundle_test.cc b/firestore/integration_test_internal/src/bundle_test.cc
index 3ac9760a9f..d1b5980073 100644
--- a/firestore/integration_test_internal/src/bundle_test.cc
+++ b/firestore/integration_test_internal/src/bundle_test.cc
@@ -277,6 +277,9 @@ TEST_F(BundleTest, LoadBundleWithDocumentsAlreadyPulledFromBackend) {
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
 
+  GTEST_SKIP() << "This test fails often on Android and iOS in GitHub Actions "
+                  "and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   auto collection = db->Collection("coll-1");
   WriteDocuments(collection,

From f8e38b1862f3d0f9adb06b6591bcce57a2293b2f Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Fri, 27 May 2022 10:01:30 -0400
Subject: [PATCH 08/24] bundle_test.cc: disable ALL of the tests

---
 .../src/bundle_test.cc                        | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/firestore/integration_test_internal/src/bundle_test.cc b/firestore/integration_test_internal/src/bundle_test.cc
index d1b5980073..3cc1ee5be4 100644
--- a/firestore/integration_test_internal/src/bundle_test.cc
+++ b/firestore/integration_test_internal/src/bundle_test.cc
@@ -142,6 +142,9 @@ class BundleTest : public FirestoreIntegrationTest {
 };
 
 TEST_F(BundleTest, CanLoadBundlesWithoutProgressUpdates) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -152,6 +155,9 @@ TEST_F(BundleTest, CanLoadBundlesWithoutProgressUpdates) {
 }
 
 TEST_F(BundleTest, CanLoadBundlesWithProgressUpdates) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -180,6 +186,9 @@ TEST_F(BundleTest, CanLoadBundlesWithProgressUpdates) {
 }
 
 TEST_F(BundleTest, CanDeleteFirestoreFromProgressUpdate) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -216,6 +225,9 @@ TEST_F(BundleTest, CanDeleteFirestoreFromProgressUpdate) {
 }
 
 TEST_F(BundleTest, LoadBundlesForASecondTimeSkips) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   // TODO(wuandy): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -244,6 +256,9 @@ TEST_F(BundleTest, LoadBundlesForASecondTimeSkips) {
 }
 
 TEST_F(BundleTest, LoadInvalidBundlesShouldFail) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   // TODO(wuandy): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -273,13 +288,13 @@ TEST_F(BundleTest, LoadInvalidBundlesShouldFail) {
 }
 
 TEST_F(BundleTest, LoadBundleWithDocumentsAlreadyPulledFromBackend) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   // TODO(wuandy, b/189477267): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
 
-  GTEST_SKIP() << "This test fails often on Android and iOS in GitHub Actions "
-                  "and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   auto collection = db->Collection("coll-1");
   WriteDocuments(collection,
@@ -322,6 +337,9 @@ TEST_F(BundleTest, LoadBundleWithDocumentsAlreadyPulledFromBackend) {
 }
 
 TEST_F(BundleTest, LoadedDocumentsShouldNotBeGarbageCollectedRightAway) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   // TODO(wuandy, b/189477267): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -346,6 +364,9 @@ TEST_F(BundleTest, LoadedDocumentsShouldNotBeGarbageCollectedRightAway) {
 }
 
 TEST_F(BundleTest, LoadDocumentsFromOtherProjectsShouldFail) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   auto bundle = CreateBundle("other-project");
   std::vector<LoadBundleTaskProgress> progresses;
@@ -366,6 +387,9 @@ TEST_F(BundleTest, LoadDocumentsFromOtherProjectsShouldFail) {
 }
 
 TEST_F(BundleTest, GetInvalidNamedQuery) {
+  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
+                  "Actions and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   {
     auto future = db->NamedQuery("DOES_NOT_EXIST");

From 61d6ff9046d648a92fc12fbe69d7896c478b3125 Mon Sep 17 00:00:00 2001
From: wu-hui <53845758+wu-hui@users.noreply.github.com>
Date: Fri, 27 May 2022 18:42:14 +0000
Subject: [PATCH 09/24] Support git longpaths (#967)

---
 .github/workflows/android.yml           | 4 ++++
 .github/workflows/desktop.yml           | 4 ++++
 .github/workflows/integration_tests.yml | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 4319f65af6..2ce73c1662 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -62,6 +62,10 @@ jobs:
           git config --global credential.helper 'store --file /tmp/git-credentials'
           echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
 
+      - name: Enable Git Long-paths Support
+        if: runner.os == 'Windows'
+        run: git config --system core.longpaths true
+
       - name: Check expanded matrix config
         if: github.event.inputs.expanded_matrix == '1'
         run: |
diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml
index 5ab4c7089a..87e7ed7622 100644
--- a/.github/workflows/desktop.yml
+++ b/.github/workflows/desktop.yml
@@ -101,6 +101,10 @@ jobs:
           git config --global credential.helper 'store --file /tmp/git-credentials'
           echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
 
+      - name: Enable Git Long-paths Support
+        if: runner.os == 'Windows'
+        run: git config --system core.longpaths true
+
       - name: Setup Xcode version (macos)
         if: runner.os == 'macOS'
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 83c00e4ae3..cb3bf1f4b1 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -277,6 +277,9 @@ jobs:
         run: |
           git config --global credential.helper 'store --file /tmp/git-credentials'
           echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
+      - name: Enable Git Long-paths Support
+        if: runner.os == 'Windows'
+        run: git config --system core.longpaths true
       - name: Set env vars (Linux)
         if: startsWith(matrix.os, 'ubuntu')
         run: echo "VCPKG_TRIPLET=x64-linux" >> $GITHUB_ENV
@@ -471,6 +474,9 @@ jobs:
         run: |
           git config --global credential.helper 'store --file /tmp/git-credentials'
           echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
+      - name: Enable Git Long-paths Support
+        if: runner.os == 'Windows'
+        run: git config --system core.longpaths true
       - name: Add msbuild to PATH (Windows)
         if: startsWith(matrix.os, 'windows')
         uses: microsoft/setup-msbuild@v1.0.2

From 2a481ec0dd272d304bb89d7d09b64837df478050 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Fri, 27 May 2022 15:37:10 -0400
Subject: [PATCH 10/24] firestore.cmake: update pinned commit to HEAD, now that
 the fixes in that repo have been merged into master

---
 cmake/external/firestore.cmake | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index ea5171a9d3..0527638c53 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -37,11 +37,8 @@ function(GetReleasedDep)
 
     DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
     GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git"
-    # Pinned commit in https://github.com/firebase/firebase-ios-sdk/pull/9851 which fixes a
-    # problematic usage of designated initialization. This commit also includes
-    # https://github.com/firebase/firebase-ios-sdk/pull/9847, which fixes a problematic bug in
-    # python_setup.cmake.
-    GIT_TAG f2fb419cd3332ac74be0a7076841b2162a96060d
+    # Pinned HEAD commit as of May 27, 2022 @ 15:36 EDT.
+    GIT_TAG c2bc549a7017c456a20ee69ca7ec27ea4a6077bd
 
     PREFIX ${PROJECT_BINARY_DIR}
 

From 188009398ea744a2e0cff33fe1b418dd590ff26e Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Sat, 28 May 2022 05:11:15 +0000
Subject: [PATCH 11/24] integration_tests.yml: explicitly install java so that
 we get a new enough version to run the firestore emulator

---
 .github/workflows/integration_tests.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index cb3bf1f4b1..c398f5c327 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -1146,6 +1146,11 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 14.x
+      - name: Setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Setup Firestore Emulator
         if: steps.get-device-type.outputs.device_type == 'virtual' && contains(needs.check_and_prepare.outputs.apis, 'firestore')
         run: |
@@ -1251,6 +1256,11 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 14.x
+      - name: Setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Setup Firestore Emulator
         if: steps.get-device-type.outputs.device_type == 'virtual' && contains(needs.check_and_prepare.outputs.apis, 'firestore')
         run: |
@@ -1350,6 +1360,11 @@ jobs:
           timeout_minutes: 1
           max_attempts: 3
           command: pip install -r scripts/gha/requirements.txt
+      - name: Setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Setup Firestore Emulator
         if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
         run: |

From a88bcb03bfdb3f3c4060234e27cee3b309ebebd5 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Sat, 28 May 2022 12:10:45 +0000
Subject: [PATCH 12/24] integration_tests.yml: install java 8 for the test run,
 overriding java 11 previously installed for the Firestore emulator

---
 .github/workflows/integration_tests.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index c398f5c327..cd872016f5 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -1146,7 +1146,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 14.x
-      - name: Setup java
+      - name: Setup java 17 (for Firestore emulator)
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -1156,6 +1156,11 @@ jobs:
         run: |
           npm install -g firebase-tools
           firebase emulators:start --only firestore --project demo-example &
+      - name: Setup java 8 (for running the tests)
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '8'
       - name: Run Android integration tests on Emulator locally
         timeout-minutes: 120
         if: steps.get-device-type.outputs.device_type == 'virtual'

From ea317463a0c954833dc92ba1458e95882470e9d2 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Mon, 30 May 2022 05:23:09 +0000
Subject: [PATCH 13/24] leveldb.cmake: add URL_HASH to improve security

---
 cmake/external/leveldb.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
index 18970659a4..a8a154bb4e 100644
--- a/cmake/external/leveldb.cmake
+++ b/cmake/external/leveldb.cmake
@@ -26,6 +26,7 @@ ExternalProject_Add(
   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
   DOWNLOAD_NAME leveldb-${version}.tar.gz
   URL https://github.com/google/leveldb/archive/${version}.tar.gz
+  URL_HASH SHA256=9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76
 
   PREFIX ${PROJECT_BINARY_DIR}
 

From 0848e7a866a84feb17b4edd1b11e8484a561d46e Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Mon, 30 May 2022 16:54:31 +0000
Subject: [PATCH 14/24] Revert "bundle_test.cc: disable ALL of the tests"

This reverts commit f8e38b1862f3d0f9adb06b6591bcce57a2293b2f.
---
 .../src/bundle_test.cc                        | 30 ++-----------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/firestore/integration_test_internal/src/bundle_test.cc b/firestore/integration_test_internal/src/bundle_test.cc
index 3cc1ee5be4..d1b5980073 100644
--- a/firestore/integration_test_internal/src/bundle_test.cc
+++ b/firestore/integration_test_internal/src/bundle_test.cc
@@ -142,9 +142,6 @@ class BundleTest : public FirestoreIntegrationTest {
 };
 
 TEST_F(BundleTest, CanLoadBundlesWithoutProgressUpdates) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -155,9 +152,6 @@ TEST_F(BundleTest, CanLoadBundlesWithoutProgressUpdates) {
 }
 
 TEST_F(BundleTest, CanLoadBundlesWithProgressUpdates) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -186,9 +180,6 @@ TEST_F(BundleTest, CanLoadBundlesWithProgressUpdates) {
 }
 
 TEST_F(BundleTest, CanDeleteFirestoreFromProgressUpdate) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   auto bundle = CreateTestBundle(db);
 
@@ -225,9 +216,6 @@ TEST_F(BundleTest, CanDeleteFirestoreFromProgressUpdate) {
 }
 
 TEST_F(BundleTest, LoadBundlesForASecondTimeSkips) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   // TODO(wuandy): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -256,9 +244,6 @@ TEST_F(BundleTest, LoadBundlesForASecondTimeSkips) {
 }
 
 TEST_F(BundleTest, LoadInvalidBundlesShouldFail) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   // TODO(wuandy): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -288,13 +273,13 @@ TEST_F(BundleTest, LoadInvalidBundlesShouldFail) {
 }
 
 TEST_F(BundleTest, LoadBundleWithDocumentsAlreadyPulledFromBackend) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   // TODO(wuandy, b/189477267): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
 
+  GTEST_SKIP() << "This test fails often on Android and iOS in GitHub Actions "
+                  "and needs to be investigated (b/233751585)";
+
   Firestore* db = TestFirestore();
   auto collection = db->Collection("coll-1");
   WriteDocuments(collection,
@@ -337,9 +322,6 @@ TEST_F(BundleTest, LoadBundleWithDocumentsAlreadyPulledFromBackend) {
 }
 
 TEST_F(BundleTest, LoadedDocumentsShouldNotBeGarbageCollectedRightAway) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   // TODO(wuandy, b/189477267): This test fails on Windows CI, but
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
@@ -364,9 +346,6 @@ TEST_F(BundleTest, LoadedDocumentsShouldNotBeGarbageCollectedRightAway) {
 }
 
 TEST_F(BundleTest, LoadDocumentsFromOtherProjectsShouldFail) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   auto bundle = CreateBundle("other-project");
   std::vector<LoadBundleTaskProgress> progresses;
@@ -387,9 +366,6 @@ TEST_F(BundleTest, LoadDocumentsFromOtherProjectsShouldFail) {
 }
 
 TEST_F(BundleTest, GetInvalidNamedQuery) {
-  GTEST_SKIP() << "Bundle tests fails often on Android and iOS in GitHub "
-                  "Actions and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   {
     auto future = db->NamedQuery("DOES_NOT_EXIST");

From 14b574ae28943b89e2d7c0b1fd53c42515af7489 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Mon, 30 May 2022 16:54:59 +0000
Subject: [PATCH 15/24] Revert "cherry-pick bundle_test.cc: Disable
 LoadBundleWithDocumentsAlreadyPulledFromBackend
 (https://github.com/firebase/firebase-cpp-sdk/pull/972)"

This reverts commit b39452a83d80216e9be5b2d201cc0c8578e99407.
---
 firestore/integration_test_internal/src/bundle_test.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/firestore/integration_test_internal/src/bundle_test.cc b/firestore/integration_test_internal/src/bundle_test.cc
index d1b5980073..3ac9760a9f 100644
--- a/firestore/integration_test_internal/src/bundle_test.cc
+++ b/firestore/integration_test_internal/src/bundle_test.cc
@@ -277,9 +277,6 @@ TEST_F(BundleTest, LoadBundleWithDocumentsAlreadyPulledFromBackend) {
   // local run is fine. We need to figure out why and re-enable it.
   SKIP_TEST_ON_WINDOWS;
 
-  GTEST_SKIP() << "This test fails often on Android and iOS in GitHub Actions "
-                  "and needs to be investigated (b/233751585)";
-
   Firestore* db = TestFirestore();
   auto collection = db->Collection("coll-1");
   WriteDocuments(collection,

From 1dfa36f6cf544ead3722af1e5a2d93b3f6c1f5c8 Mon Sep 17 00:00:00 2001
From: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
Date: Tue, 31 May 2022 18:38:07 +0000
Subject: [PATCH 16/24] Update iOS dependencies - Tue May 31 2022
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### 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).
---
 admob/integration_test/Podfile                |   2 +-
 analytics/integration_test/Podfile            |   4 +-
 analytics/ios_headers/FIREventNames.h         |   2 +-
 analytics/ios_headers/FIRParameterNames.h     |   2 +-
 analytics/ios_headers/FIRUserPropertyNames.h  |   2 +-
 app/integration_test/Podfile                  |   2 +-
 auth/integration_test/Podfile                 |   4 +-
 cmake/external/firestore.cmake                |   2 +-
 database/integration_test/Podfile             |   8 +-
 dynamic_links/integration_test/Podfile        |   2 +-
 firestore/integration_test/Podfile            |   8 +-
 firestore/integration_test_internal/Podfile   |   8 +-
 functions/integration_test/Podfile            |   8 +-
 installations/integration_test/Podfile        |   4 +-
 ios_pod/Podfile                               |  24 +-
 .../FirebaseAnalyticsSwift-Swift.h            |   2 +-
 .../FirebaseCoreInternal-Swift.h              |   2 +-
 .../FirebaseDatabaseSwift-Swift.h             |   2 +-
 .../FirebaseFirestoreSwift-Swift.h            |   2 +-
 .../swift_headers/FirebaseFunctions-Swift.h   |  95 ++--
 .../FirebaseInAppMessagingSwift-Swift.h       |   2 +-
 .../FirebaseMLModelDownloader-Swift.h         |   2 +-
 .../FirebaseRemoteConfigSwift-Swift.h         |   2 +-
 .../swift_headers/FirebaseSharedSwift-Swift.h |   2 +-
 ios_pod/swift_headers/FirebaseStorage-Swift.h | 444 +++++++++++-------
 ios_pod/swift_headers/SwiftProtobuf-Swift.h   |   2 +-
 messaging/integration_test/Podfile            |   4 +-
 release_build_files/readme.md                 |  60 +--
 remote_config/integration_test/Podfile        |   4 +-
 storage/integration_test/Podfile              |   8 +-
 30 files changed, 424 insertions(+), 291 deletions(-)

diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile
index edbea91cff..82cd92953b 100644
--- a/admob/integration_test/Podfile
+++ b/admob/integration_test/Podfile
@@ -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
 
diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile
index e6e0602e99..3790ca6ddd 100644
--- a/analytics/integration_test/Podfile
+++ b/analytics/integration_test/Podfile
@@ -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|
diff --git a/analytics/ios_headers/FIREventNames.h b/analytics/ios_headers/FIREventNames.h
index e26a2cff27..202f81022c 100644
--- a/analytics/ios_headers/FIREventNames.h
+++ b/analytics/ios_headers/FIREventNames.h
@@ -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
 ///
diff --git a/analytics/ios_headers/FIRParameterNames.h b/analytics/ios_headers/FIRParameterNames.h
index ebeff1e2b4..136f0f5d85 100644
--- a/analytics/ios_headers/FIRParameterNames.h
+++ b/analytics/ios_headers/FIRParameterNames.h
@@ -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
 ///
diff --git a/analytics/ios_headers/FIRUserPropertyNames.h b/analytics/ios_headers/FIRUserPropertyNames.h
index 63e56d0d07..f1c7f267dd 100644
--- a/analytics/ios_headers/FIRUserPropertyNames.h
+++ b/analytics/ios_headers/FIRUserPropertyNames.h
@@ -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
 ///
diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile
index 9e4cc47b75..2b6d6dd224 100644
--- a/app/integration_test/Podfile
+++ b/app/integration_test/Podfile
@@ -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|
diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile
index 11c1bd78b9..b08f1f8862 100644
--- a/auth/integration_test/Podfile
+++ b/auth/integration_test/Podfile
@@ -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|
diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 7cb97c0ce9..d6a2849d02 100644
--- a/cmake/external/firestore.cmake
+++ b/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.0.0)
+set(version CocoaPods-9.1.0)
 
 function(GetReleasedDep)
   message("Getting released firebase-ios-sdk @ ${version}")
diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile
index 8f77c1dcfe..0f48f8d03a 100644
--- a/database/integration_test/Podfile
+++ b/database/integration_test/Podfile
@@ -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|
diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile
index 331ebe65f4..7141ef86bc 100644
--- a/dynamic_links/integration_test/Podfile
+++ b/dynamic_links/integration_test/Podfile
@@ -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|
diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile
index a730b4ebc9..d106fbcf81 100644
--- a/firestore/integration_test/Podfile
+++ b/firestore/integration_test/Podfile
@@ -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|
diff --git a/firestore/integration_test_internal/Podfile b/firestore/integration_test_internal/Podfile
index 07c1d44ed3..86c2bec605 100644
--- a/firestore/integration_test_internal/Podfile
+++ b/firestore/integration_test_internal/Podfile
@@ -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|
diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile
index 90e41cc6db..c843f66614 100644
--- a/functions/integration_test/Podfile
+++ b/functions/integration_test/Podfile
@@ -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|
diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile
index 74b8df6af9..1329967794 100644
--- a/installations/integration_test/Podfile
+++ b/installations/integration_test/Podfile
@@ -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|
diff --git a/ios_pod/Podfile b/ios_pod/Podfile
index 27dacad454..b5a4597ac2 100644
--- a/ios_pod/Podfile
+++ b/ios_pod/Podfile
@@ -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
diff --git a/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h b/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h
index 76fd043d2b..ca90341c73 100644
--- a/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h
@@ -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)
diff --git a/ios_pod/swift_headers/FirebaseCoreInternal-Swift.h b/ios_pod/swift_headers/FirebaseCoreInternal-Swift.h
index 5ae00c0918..8ed11a3e85 100644
--- a/ios_pod/swift_headers/FirebaseCoreInternal-Swift.h
+++ b/ios_pod/swift_headers/FirebaseCoreInternal-Swift.h
@@ -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
diff --git a/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h b/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h
index cc934567d5..ebc49239ed 100644
--- a/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h
@@ -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)
diff --git a/ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h b/ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h
index 52337a1afb..49a83129fd 100644
--- a/ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h
@@ -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)
diff --git a/ios_pod/swift_headers/FirebaseFunctions-Swift.h b/ios_pod/swift_headers/FirebaseFunctions-Swift.h
index 5e5cb93f94..77640fee74 100644
--- a/ios_pod/swift_headers/FirebaseFunctions-Swift.h
+++ b/ios_pod/swift_headers/FirebaseFunctions-Swift.h
@@ -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 FIREBASEFUNCTIONS_SWIFT_H
@@ -236,41 +236,73 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
 /// <code>Functions</code> is the client for Cloud Functions for a Firebase project.
 SWIFT_CLASS_NAMED("Functions")
 @interface FIRFunctions : NSObject
-/// Creates a Cloud Functions client or returns a pre-existing instance if it already exists.
+/// Creates a Cloud Functions client using the default or returns a pre-existing instance if it
+/// already exists.
+///
+/// returns:
+/// A shared Functions instance initialized with the default <code>FirebaseApp</code>.
 + (FIRFunctions* _Nonnull)functions SWIFT_WARN_UNUSED_RESULT;
 /// Creates a Cloud Functions client with the given app, or returns a pre-existing
 /// instance if one already exists.
-/// @param app The app for the Firebase project.
+/// \param app The app for the Firebase project.
+///
+///
+/// returns:
+/// A shared Functions instance initialized with the specified <code>FirebaseApp</code>.
 + (FIRFunctions* _Nonnull)functionsForApp:(FIRApp* _Nonnull)app SWIFT_WARN_UNUSED_RESULT;
 /// Creates a Cloud Functions client with the default app and given region.
-/// @param region The region for the http trigger, such as “us-central1”.
+/// \param region The region for the HTTP trigger, such as <code>us-central1</code>.
+///
+///
+/// returns:
+/// A shared Functions instance initialized with the default <code>FirebaseApp</code> and a custom
+/// region.
 + (FIRFunctions* _Nonnull)functionsForRegion:(NSString* _Nonnull)region SWIFT_WARN_UNUSED_RESULT;
 /// Creates a Cloud Functions client with the given app and region, or returns a pre-existing
 /// instance if one already exists.
-/// @param customDomain A custom domain for the http trigger, such as “https://mydomain.com”.
+/// \param customDomain A custom domain for the HTTP trigger, such as “https //mydomain.com”.
+///
+///
+/// returns:
+/// A shared Functions instance initialized with the default <code>FirebaseApp</code> and a custom
+/// HTTP trigger domain.
 + (FIRFunctions* _Nonnull)functionsForCustomDomain:(NSString* _Nonnull)customDomain
     SWIFT_WARN_UNUSED_RESULT;
 /// Creates a Cloud Functions client with the given app and region, or returns a pre-existing
 /// instance if one already exists.
-/// @param app The app for the Firebase project.
-/// @param region The region for the http trigger, such as “us-central1”.
+/// \param app The app for the Firebase project.
+///
+/// \param region The region for the HTTP trigger, such as <code>us-central1</code>.
+///
+///
+/// returns:
+/// An instance of <code>Functions</code> with a custom app and region.
 + (FIRFunctions* _Nonnull)functionsForApp:(FIRApp* _Nonnull)app
                                    region:(NSString* _Nonnull)region SWIFT_WARN_UNUSED_RESULT;
 /// Creates a Cloud Functions client with the given app and region, or returns a pre-existing
 /// instance if one already exists.
-/// @param app The app for the Firebase project.
-/// @param customDomain A custom domain for the http trigger, such as “https://mydomain.com”.
+/// \param app The app for the Firebase project.
+///
+/// \param customDomain A custom domain for the HTTP trigger, such as
+/// <code>https://mydomain.com</code>.
+///
+///
+/// returns:
+/// An instance of <code>Functions</code> with a custom app and HTTP trigger domain.
 + (FIRFunctions* _Nonnull)functionsForApp:(FIRApp* _Nonnull)app
                              customDomain:(NSString* _Nonnull)customDomain SWIFT_WARN_UNUSED_RESULT;
 /// Creates a reference to the Callable HTTPS trigger with the given name.
-/// @param name The name of the Callable HTTPS trigger.
+/// \param name The name of the Callable HTTPS trigger.
+///
 - (FIRHTTPSCallable* _Nonnull)HTTPSCallableWithName:(NSString* _Nonnull)name
     SWIFT_WARN_UNUSED_RESULT;
 - (FIRHTTPSCallable* _Nonnull)HTTPSCallableWithURL:(NSURL* _Nonnull)url SWIFT_WARN_UNUSED_RESULT;
 /// Changes this instance to point to a Cloud Functions emulator running locally.
 /// See https://firebase.google.com/docs/functions/local-emulator
-/// @param host The host of the local emulator, such as “localhost”.
-/// @param port The port of the local emulator, for example 5005.
+/// \param host The host of the local emulator, such as “localhost”.
+///
+/// \param port The port of the local emulator, for example 5005.
+///
 - (void)useEmulatorWithHost:(NSString* _Nonnull)host port:(NSInteger)port;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@@ -332,7 +364,7 @@ typedef SWIFT_ENUM_NAMED(NSInteger, FIRFunctionsErrorCode, "FunctionsErrorCode",
 
 @class FIRHTTPSCallableResult;
 
-/// A <code>HTTPSCallable</code> is reference to a particular Callable HTTPS trigger in Cloud
+/// A <code>HTTPSCallable</code> is a reference to a particular Callable HTTPS trigger in Cloud
 /// Functions.
 SWIFT_CLASS_NAMED("HTTPSCallable")
 @interface FIRHTTPSCallable : NSObject
@@ -342,19 +374,19 @@ SWIFT_CLASS_NAMED("HTTPSCallable")
 /// The data passed into the trigger can be any of the following types:
 /// <ul>
 ///   <li>
-///     NSNull
+///     <code>nil</code> or <code>NSNull</code>
 ///   </li>
 ///   <li>
-///     NSString
+///     <code>String</code>
 ///   </li>
 ///   <li>
-///     NSNumber
+///     <code>NSNumber</code>, or any Swift numeric type bridgeable to <code>NSNumber</code>
 ///   </li>
 ///   <li>
-///     NSArray<id>, where the contained objects are also one of these types.
+///     <code>[Any]</code>, where the contained objects are also one of these types.
 ///   </li>
 ///   <li>
-///     NSDictionary<NSString, id>, where the values are also one of these types.
+///     <code>[String: Any]</code> where the values are also one of these types.
 ///   </li>
 /// </ul>
 /// The request to the Cloud Functions backend made by this method automatically includes a
@@ -363,19 +395,22 @@ SWIFT_CLASS_NAMED("HTTPSCallable")
 /// Firebase Cloud Messaging sends data to the Firebase backend periodically to collect information
 /// regarding the app instance. To stop this, see <code>Messaging.deleteData()</code>. It
 /// resumes with a new FCM Token the next time you call this method.
-/// @param data Parameters to pass to the trigger.
-/// @param completion The block to call when the HTTPS request has completed.
+/// \param data Parameters to pass to the trigger.
+///
+/// \param completion The block to call when the HTTPS request has completed.
+///
 - (void)callWithObject:(id _Nullable)data
             completion:
                 (void (^_Nonnull)(FIRHTTPSCallableResult* _Nullable, NSError* _Nullable))completion;
-/// Executes this Callable HTTPS trigger asynchronously. This API should only be used from Objective
-/// C The request to the Cloud Functions backend made by this method automatically includes a
-/// Firebase Installations ID token to identify the app instance. If a user is logged in with
-/// Firebase Auth, an auth ID token for the user is also automatically included.
-/// Firebase Cloud Messaging sends data to the Firebase backend periodically to collect information
-/// regarding the app instance. To stop this, see <code>Messaging.deleteData()</code>. It
-/// resumes with a new FCM Token the next time you call this method.
-/// @param completion The block to call when the HTTPS request has completed.
+/// Executes this Callable HTTPS trigger asynchronously. This API should only be used from
+/// Objective-C. The request to the Cloud Functions backend made by this method automatically
+/// includes a Firebase Installations ID token to identify the app instance. If a user is logged in
+/// with Firebase Auth, an auth ID token for the user is also automatically included. Firebase Cloud
+/// Messaging sends data to the Firebase backend periodically to collect information regarding the
+/// app instance. To stop this, see <code>Messaging.deleteData()</code>. It resumes with a new FCM
+/// Token the next time you call this method. \param completion The block to call when the HTTPS
+/// request has completed.
+///
 - (void)callWithCompletion:(void (^_Nonnull)(FIRHTTPSCallableResult* _Nullable,
                                              NSError* _Nullable))completion;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
@@ -387,8 +422,8 @@ SWIFT_CLASS_NAMED("HTTPSCallableResult")
 @interface FIRHTTPSCallableResult : NSObject
 /// The data that was returned from the Callable HTTPS trigger.
 /// The data is in the form of native objects. For example, if your trigger returned an
-/// array, this object would be an NSArray. If your trigger returned a JavaScript object with
-/// keys and values, this object would be an NSDictionary.
+/// array, this object would be an <code>Array<Any></code>. If your trigger returned a JavaScript
+/// object with keys and values, this object would be an instance of <code>[String: Any]</code>.
 @property(nonatomic, readonly) id _Nonnull data;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
diff --git a/ios_pod/swift_headers/FirebaseInAppMessagingSwift-Swift.h b/ios_pod/swift_headers/FirebaseInAppMessagingSwift-Swift.h
index 56528c1416..fd40256f0c 100644
--- a/ios_pod/swift_headers/FirebaseInAppMessagingSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseInAppMessagingSwift-Swift.h
@@ -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)
diff --git a/ios_pod/swift_headers/FirebaseMLModelDownloader-Swift.h b/ios_pod/swift_headers/FirebaseMLModelDownloader-Swift.h
index 6340dac319..33256545fd 100644
--- a/ios_pod/swift_headers/FirebaseMLModelDownloader-Swift.h
+++ b/ios_pod/swift_headers/FirebaseMLModelDownloader-Swift.h
@@ -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)
diff --git a/ios_pod/swift_headers/FirebaseRemoteConfigSwift-Swift.h b/ios_pod/swift_headers/FirebaseRemoteConfigSwift-Swift.h
index 7bcdb5bf9f..5aa1f94856 100644
--- a/ios_pod/swift_headers/FirebaseRemoteConfigSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseRemoteConfigSwift-Swift.h
@@ -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)
diff --git a/ios_pod/swift_headers/FirebaseSharedSwift-Swift.h b/ios_pod/swift_headers/FirebaseSharedSwift-Swift.h
index 8c5aecf33f..df7978fd00 100644
--- a/ios_pod/swift_headers/FirebaseSharedSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseSharedSwift-Swift.h
@@ -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)
diff --git a/ios_pod/swift_headers/FirebaseStorage-Swift.h b/ios_pod/swift_headers/FirebaseStorage-Swift.h
index 36ba28f0d6..3a24d43f41 100644
--- a/ios_pod/swift_headers/FirebaseStorage-Swift.h
+++ b/ios_pod/swift_headers/FirebaseStorage-Swift.h
@@ -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 FIREBASESTORAGE_SWIFT_H
@@ -233,65 +233,97 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
 @class FIRApp;
 @class FIRStorageReference;
 
-/// FirebaseStorage is a service that supports uploading and downloading binary objects,
-/// such as images, videos, and other files to Google Cloud Storage.
-/// If you call <code>FirebaseStorage.storage()</code>, the instance will initialize with the
-/// default FirebaseApp, <code>FirebaseApp.app()</code>, and the storage location will come from the
-/// provided GoogleService-Info.plist. If you provide a custom instance of FirebaseApp, the storage
-/// location will be specified via the FirebaseOptions#storageBucket property.
+/// Firebase Storage is a service that supports uploading and downloading binary objects,
+/// such as images, videos, and other files to Google Cloud Storage. Instances of
+/// <code>Storage</code> are not thread-safe. If you call <code>Storage.storage()</code>, the
+/// instance will initialize with the default <code>FirebaseApp</code>,
+/// <code>FirebaseApp.app()</code>, and the storage location will come from the provided
+/// <code>GoogleService-Info.plist</code>.
+/// If you provide a custom instance of <code>FirebaseApp</code>,
+/// the storage location will be specified via the <code>FirebaseOptions.storageBucket</code>
+/// property.
 SWIFT_CLASS_NAMED("Storage")
 @interface FIRStorage : NSObject
-/// An instance of FirebaseStorage, configured with the default FirebaseApp.
-/// @return the FirebaseStorage instance, configured with the default FirebaseApp.
+/// The default <code>Storage</code> instance.
+///
+/// returns:
+/// An instance of <code>Storage</code>, configured with the default <code>FirebaseApp</code>.
 + (FIRStorage *_Nonnull)storage SWIFT_WARN_UNUSED_RESULT;
-/// An instance of FirebaseStorage, configured with a custom storage bucket @a url.
-/// @param url The gs:// url to your Firebase Storage Bucket.
-/// @return the FirebaseStorage instance, configured with the custom FirebaseApp.
+/// A method used to create <code>Storage</code> instances initialized with a custom storage bucket
+/// URL. Any <code>StorageReferences</code> generated from this instance of <code>Storage</code>
+/// will reference files and directories within the specified bucket. \param url The
+/// <code>gs://</code> URL to your Firebase Storage bucket.
+///
+///
+/// returns:
+/// A <code>Storage</code> instance, configured with the custom storage bucket.
 + (FIRStorage *_Nonnull)storageWithURL:(NSString *_Nonnull)url SWIFT_WARN_UNUSED_RESULT;
-/// Creates an instance of FirebaseStorage, configured with the custom FirebaseApp @a app.
-/// @param app The custom FirebaseApp used for initialization.
-/// @return the FirebaseStorage instance, configured with the custom FirebaseApp.
+/// Creates an instance of <code>Storage</code>, configured with a custom <code>FirebaseApp</code>.
+/// <code>StorageReference</code>s generated from a resulting instance will reference files in the
+/// Firebase project associated with custom <code>FirebaseApp</code>. \param app The custom
+/// <code>FirebaseApp</code> used for initialization.
+///
+///
+/// returns:
+/// A <code>Storage</code> instance, configured with the custom <code>FirebaseApp</code>.
 + (FIRStorage *_Nonnull)storageForApp:(FIRApp *_Nonnull)app SWIFT_WARN_UNUSED_RESULT;
-/// Creates an instance of FirebaseStorage, configured with a custom FirebaseApp @a app and a custom
-/// storage bucket @a url.
-/// @param app The custom FirebaseApp used for initialization.
-/// @param url The gs:// url to your Firebase Storage Bucket.
-/// @return the FirebaseStorage instance, configured with the custom FirebaseApp.
+/// Creates an instance of <code>Storage</code>, configured with a custom <code>FirebaseApp</code>
+/// and a custom storage bucket URL. \param app The custom <code>FirebaseApp</code> used for
+/// initialization.
+///
+/// \param url The <code>gs://</code> url to your Firebase Storage bucket.
+///
+///
+/// returns:
+/// the <code>Storage</code> instance, configured with the custom <code>FirebaseApp</code> and
+/// storage bucket URL.
 + (FIRStorage *_Nonnull)storageForApp:(FIRApp *_Nonnull)app
                                   URL:(NSString *_Nonnull)url SWIFT_WARN_UNUSED_RESULT;
-/// The Firebase App associated with this Firebase Storage instance.
+/// The <code>FirebaseApp</code> associated with this Storage instance.
 @property(nonatomic, readonly, strong) FIRApp *_Nonnull app;
-/// Maximum time in seconds to retry an upload if a failure occurs.
+/// The maximum time in seconds to retry an upload if a failure occurs.
 /// Defaults to 10 minutes (600 seconds).
 @property(nonatomic) NSTimeInterval maxUploadRetryTime;
-/// Maximum time in seconds to retry a download if a failure occurs.
+/// The maximum time in seconds to retry a download if a failure occurs.
 /// Defaults to 10 minutes (600 seconds).
 @property(nonatomic) NSTimeInterval maxDownloadRetryTime;
-/// Maximum time in seconds to retry operations other than upload and download if a failure occurs.
-/// Defaults to 2 minutes (120 seconds).
+/// The maximum time in seconds to retry operations other than upload and download if a failure
+/// occurs. Defaults to 2 minutes (120 seconds).
 @property(nonatomic) NSTimeInterval maxOperationRetryTime;
-/// Queue that all developer callbacks are fired on. Defaults to the main queue.
+/// A <code>DispatchQueue</code> that all developer callbacks are fired on. Defaults to the main
+/// queue.
 @property(nonatomic, strong) dispatch_queue_t _Nonnull callbackQueue;
-/// Creates a StorageReference initialized at the root Firebase Storage location.
-/// @return An instance of StorageReference initialized at the root.
+/// Creates a <code>StorageReference</code> initialized at the root Firebase Storage location.
+///
+/// returns:
+/// An instance of <code>StorageReference</code> referencing the root of the storage bucket.
 - (FIRStorageReference *_Nonnull)reference SWIFT_WARN_UNUSED_RESULT;
-/// Creates a StorageReference given a gs:// or https:// URL pointing to a Firebase Storage
-/// location. For example, you can pass in an https:// download URL retrieved from
-/// [StorageReference downloadURLWithCompletion] or the gs:// URI from
-/// [StorageReference description].
-/// @param string A gs:// or https:// URL to initialize the reference with.
-/// @return An instance of StorageReference at the given child path.
-/// @throws Throws an exception if passed in URL is not associated with the FirebaseApp used to
-/// initialize this FirebaseStorage.
-- (FIRStorageReference *_Nonnull)referenceForURL:(NSString *_Nonnull)string
-    SWIFT_WARN_UNUSED_RESULT;
-/// Creates a StorageReference initialized at a child Firebase Storage location.
-/// @param string A relative path from the root to initialize the reference with,
+/// Creates a StorageReference given a <code>gs://</code> or <code>https://</code> URL pointing to a
+/// Firebase Storage location. For example, you can pass in an <code>https://</code> download URL
+/// retrieved from <code>StorageReference.downloadURL(completion:)</code> or the <code>gs://</code>
+/// URL from <code>StorageReference.description</code>. \param url A gs // or https:// URL to
+/// initialize the reference with.
+///
+///
+/// throws:
+/// Throws a fatal error if <code>url</code> is not associated with the <code>FirebaseApp</code>
+/// used to initialize this Storage instance.
+///
+/// returns:
+/// An instance of StorageReference at the given child path.
+- (FIRStorageReference *_Nonnull)referenceForURL:(NSString *_Nonnull)url SWIFT_WARN_UNUSED_RESULT;
+/// Creates a <code>StorageReference</code> initialized at a location specified by the
+/// <code>path</code> parameter. \param path A relative path from the root of the storage bucket,
 /// for instance @“path/to/object”.
-/// @return An instance of StorageReference at the given child path.
-- (FIRStorageReference *_Nonnull)referenceWithPath:(NSString *_Nonnull)string
+///
+///
+/// returns:
+/// An instance of <code>StorageReference</code> pointing to the given path.
+- (FIRStorageReference *_Nonnull)referenceWithPath:(NSString *_Nonnull)path
     SWIFT_WARN_UNUSED_RESULT;
 /// Configures the Storage SDK to use an emulated backend instead of the default remote backend.
+/// This method should be called before invoking any other methods on a new instance of
+/// <code>Storage</code>.
 - (void)useEmulatorWithHost:(NSString *_Nonnull)host port:(NSInteger)port;
 - (id _Nonnull)copy SWIFT_WARN_UNUSED_RESULT;
 - (BOOL)isEqual:(id _Nullable)object SWIFT_WARN_UNUSED_RESULT;
@@ -312,20 +344,19 @@ SWIFT_PROTOCOL_NAMED("StorageTaskManagement")
 @optional
 /// Pauses a task currently in progress.
 - (void)pause;
-/// Pauses a task currently in progress.
+/// Cancels a task.
 - (void)cancel;
-/// Pauses a task currently in progress.
+/// Resumes a paused task.
 - (void)resume;
 @end
 
 @class FIRStorageTaskSnapshot;
 
-/// A superclass to all Storage*Tasks, including StorageUploadTask
-/// and StorageDownloadTask, to provide state transitions, event raising, and common storage
-/// or metadata and errors.
-/// Callbacks are always fired on the developer specified callback queue.
-/// If no queue is specified by the developer, it defaults to the main queue.
-/// Currently not thread safe, so only call methods on the main thread.
+/// A superclass to all Storage tasks, including <code>StorageUploadTask</code>
+/// and <code>StorageDownloadTask</code>, to provide state transitions, event raising, and common
+/// storage for metadata and errors. Callbacks are always fired on the developer-specified callback
+/// queue. If no queue is specified, it defaults to the main queue. This class is not thread safe,
+/// so only call methods on the main thread.
 SWIFT_CLASS_NAMED("StorageTask")
 @interface FIRStorageTask : NSObject
 /// An immutable view of the task and associated metadata, progress, error, etc.
@@ -336,46 +367,52 @@ SWIFT_CLASS_NAMED("StorageTask")
 
 enum FIRStorageTaskStatus : NSInteger;
 
-/// Extends FIRStorageTask to provide observable semantics such as adding and removing observers.
-/// Observers produce a FIRStorageHandle, which is used to keep track of and remove specific
-/// observers at a later date.
-/// This class is currently not thread safe and can only be called on the main thread.
+/// An extended <code>StorageTask</code> providing observable semantics that can be used for
+/// responding to changes in task state. Observers produce a <code>StorageHandle</code>, which is
+/// used to keep track of and remove specific observers at a later date. This class is not thread
+/// safe and can only be called on the main thread.
 SWIFT_CLASS_NAMED("StorageObservableTask")
 @interface FIRStorageObservableTask : FIRStorageTask
 /// Observes changes in the upload status: Resume, Pause, Progress, Success, and Failure.
-/// @param status The StorageTaskStatus change to observe.
-/// @param handler A callback that fires every time the status event occurs,
-/// returns a StorageTaskSnapshot containing the state of the task.
-/// @return A task handle that can be used to remove the observer at a later date.
+/// \param status The <code>StorageTaskStatus</code> change to observe.
+///
+/// \param handler A callback that fires every time the status event occurs,
+/// containing a <code>StorageTaskSnapshot</code> describing task state.
+///
+///
+/// returns:
+/// A task handle that can be used to remove the observer at a later date.
 - (NSString *_Nonnull)observeStatus:(enum FIRStorageTaskStatus)status
                             handler:(void (^_Nonnull)(FIRStorageTaskSnapshot *_Nonnull))handler;
 /// Removes the single observer with the provided handle.
-/// @param handle The handle of the task to remove.
+/// \param handle The handle of the task to remove.
+///
 - (void)removeObserverWithHandle:(NSString *_Nonnull)handle;
 /// Removes all observers for a single status.
-/// @param status A StorageTaskStatus to remove listeners for.
+/// \param status A <code>StorageTaskStatus</code> to remove all listeners for.
+///
 - (void)removeAllObserversForStatus:(enum FIRStorageTaskStatus)status;
 /// Removes all observers.
 - (void)removeAllObservers;
 @end
 
-/// StorageDownloadTask implements resumable downloads from an object in Firebase Storage.
-/// Downloads can be returned on completion with a completion handler, and can be monitored
-/// by attaching observers, or controlled by calling StorageTask#pause, StorageTask#resume,
-/// or FIRIMPLStorageTask#cancel.
-/// Downloads can currently be returned as Data in memory, or as an URL to a file on disk.
-/// Downloads are performed on a background queue, and callbacks are raised on the developer
-/// specified callbackQueue in Storage, or the main queue if left unspecified.
-/// Currently all uploads must be initiated and managed on the main queue.
+/// <code>StorageDownloadTask</code> implements resumable downloads from an object in Firebase
+/// Storage. Downloads can be returned on completion with a completion handler, and can be monitored
+/// by attaching observers, or controlled by calling <code>pause()</code>, <code>resume()</code>,
+/// or <code>cancel()</code>.
+/// Downloads can currently be returned as <code>Data</code> in memory, or as a <code>URL</code> to
+/// a file on disk. Downloads are performed on a background queue, and callbacks are raised on the
+/// developer specified <code>callbackQueue</code> in Storage, or the main queue if left
+/// unspecified. Currently all uploads must be initiated and managed on the main queue.
 SWIFT_CLASS_NAMED("StorageDownloadTask")
 @interface FIRStorageDownloadTask : FIRStorageObservableTask <FIRStorageTaskManagement>
 /// Prepares a task and begins execution.
 - (void)enqueue;
-/// Pauses a task currently in progress.
+/// Pauses a task currently in progress. Calling this on a paused task has no effect.
 - (void)pause;
-/// Pauses a task currently in progress.
+/// Cancels a task.
 - (void)cancel;
-/// Pauses a task currently in progress.
+/// Resumes a paused task. Calling this on a running task has no effect.
 - (void)resume;
 @end
 
@@ -397,16 +434,21 @@ typedef SWIFT_ENUM_NAMED(NSInteger, FIRStorageErrorCode, "StorageErrorCode", ope
 /// Contains the prefixes and items returned by a <code>StorageReference.list()</code> call.
 SWIFT_CLASS_NAMED("StorageListResult")
 @interface FIRStorageListResult : NSObject
-/// The prefixes (folders) returned by the <code>list()</code> operation.
-/// @return A list of prefixes (folders).
+/// The prefixes (folders) returned by a <code>list()</code> operation.
+///
+/// returns:
+/// A list of prefixes (folders).
 @property(nonatomic, readonly, copy) NSArray<FIRStorageReference *> *_Nonnull prefixes;
-/// Returns a token that can be used to resume a previous <code>list()</code> operation.
-/// <code>nil</code> indicates that there are no more results.
-/// @return A page token if more results are available.
+/// The objects (files) returned by a <code>list()</code> operation.
+///
+/// returns:
+/// A page token if more results are available.
 @property(nonatomic, readonly, copy) NSArray<FIRStorageReference *> *_Nonnull items;
 /// Returns a token that can be used to resume a previous <code>list()</code> operation.
 /// <code>nil</code> indicates that there are no more results.
-/// @return A page token if more results are available.
+///
+/// returns:
+/// A page token if more results are available.
 @property(nonatomic, readonly, copy) NSString *_Nullable pageToken;
 - (id _Nonnull)copy SWIFT_WARN_UNUSED_RESULT;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
@@ -477,35 +519,40 @@ SWIFT_CLASS_NAMED("StorageMetadata")
 @class FIRStorageUploadTask;
 @class NSURL;
 
-/// StorageReference represents a reference to a Google Cloud Storage object. Developers can
-/// upload and download objects, as well as get/set object metadata, and delete an object at the
-/// path.
-/// @see https://cloud.google.com/storage/
+/// <code>StorageReference</code> represents a reference to a Google Cloud Storage object.
+/// Developers can upload and download objects, as well as get/set object metadata, and delete an
+/// object at the path. See the Cloud docs  for more details: https://cloud.google.com/storage/
 SWIFT_CLASS_NAMED("StorageReference")
 @interface FIRStorageReference : NSObject
-/// The Storage service object which created this reference.
+/// The <code>Storage</code> service object which created this reference.
 @property(nonatomic, readonly, strong) FIRStorage *_Nonnull storage;
-/// The name of the Google Cloud Storage bucket associated with this reference,
-/// in gs://bucket/path/to/object.txt, the bucket would be: ‘bucket’
+/// The name of the Google Cloud Storage bucket associated with this reference.
+/// For example, in <code>gs://bucket/path/to/object.txt</code>, the bucket would be ‘bucket’.
 @property(nonatomic, readonly, copy) NSString *_Nonnull bucket;
 /// The full path to this object, not including the Google Cloud Storage bucket.
-/// In gs://bucket/path/to/object.txt, the full path would be: ‘path/to/object.txt’
+/// In <code>gs://bucket/path/to/object.txt</code>, the full path would be:
+/// <code>path/to/object.txt</code>
 @property(nonatomic, readonly, copy) NSString *_Nonnull fullPath;
-/// The short name of the object associated with this reference,
-/// in gs://bucket/path/to/object.txt, the name of the object would be: ‘object.txt’
+/// The short name of the object associated with this reference.
+/// In <code>gs://bucket/path/to/object.txt</code>, the name of the object would be
+/// <code>object.txt</code>.
 @property(nonatomic, readonly, copy) NSString *_Nonnull name;
-/// Creates a new StorageReference pointing to the root object.
-/// @return A new StorageReference pointing to the root object.
+/// Creates a new <code>StorageReference</code> pointing to the root object.
+///
+/// returns:
+/// A new <code>StorageReference</code> pointing to the root object.
 - (FIRStorageReference *_Nonnull)root SWIFT_WARN_UNUSED_RESULT;
-/// Creates a new StorageReference pointing to the parent of the current reference
-/// or nil if this instance references the root location.
+/// Creates a new <code>StorageReference</code> pointing to the parent of the current reference
+/// or <code>nil</code> if this instance references the root location.
 /// For example:
 /// path = foo/bar/baz   parent = foo/bar
 /// path = foo           parent = (root)
 /// path = (root)        parent = nil
-/// @return A new StorageReference pointing to the parent of the current reference.
+///
+/// returns:
+/// A new <code>StorageReference</code> pointing to the parent of the current reference.
 - (FIRStorageReference *_Nullable)parent SWIFT_WARN_UNUSED_RESULT;
-/// Creates a new StorageReference pointing to a child object of the current reference.
+/// Creates a new <code>StorageReference</code> pointing to a child object of the current reference.
 /// path = foo      child = bar    newPath = foo/bar
 /// path = foo/bar  child = baz    ntask.impl.snapshotwPath = foo/bar/baz
 /// All leading and trailing slashes will be removed, and consecutive slashes will be
@@ -513,141 +560,192 @@ SWIFT_CLASS_NAMED("StorageReference")
 /// child = /foo/bar     newPath = foo/bar
 /// child = foo/bar/     newPath = foo/bar
 /// child = foo///bar    newPath = foo/bar
-/// @param path Path to append to the current path.
-/// @return A new StorageReference pointing to a child location of the current reference.
+/// \param path The path to append to the current path.
+///
+///
+/// returns:
+/// A new <code>StorageReference</code> pointing to a child location of the current reference.
 - (FIRStorageReference *_Nonnull)child:(NSString *_Nonnull)path SWIFT_WARN_UNUSED_RESULT;
-/// Asynchronously uploads data to the currently specified StorageReference,
+/// Asynchronously uploads data to the currently specified <code>StorageReference</code>,
 /// without additional metadata.
 /// This is not recommended for large files, and one should instead upload a file from disk.
-/// @param uploadData The Data to upload.
-/// @param metadata StorageMetadata containing additional information (MIME type, etc.)
+/// \param uploadData The data to upload.
+///
+/// \param metadata <code>StorageMetadata</code> containing additional information (MIME type, etc.)
 /// about the object being uploaded.
-/// @return An instance of StorageUploadTask, which can be used to monitor or manage the upload.
+///
+///
+/// returns:
+/// An instance of <code>StorageUploadTask</code>, which can be used to monitor or manage the
+/// upload.
 - (FIRStorageUploadTask *_Nonnull)putData:(NSData *_Nonnull)uploadData
                                  metadata:(FIRStorageMetadata *_Nullable)metadata;
-/// Asynchronously uploads data to the currently specified StorageReference.
+/// Asynchronously uploads data to the currently specified <code>StorageReference</code>.
 /// This is not recommended for large files, and one should instead upload a file from disk.
-/// @param uploadData The Data to upload.
-/// @return An instance of StorageUploadTask, which can be used to monitor or manage the upload.
+/// \param uploadData The data to upload.
+///
+///
+/// returns:
+/// An instance of <code>StorageUploadTask</code>, which can be used to monitor or manage the
+/// upload.
 - (FIRStorageUploadTask *_Nonnull)putData:(NSData *_Nonnull)uploadData;
-/// Asynchronously uploads data to the currently specified StorageReference.
+/// Asynchronously uploads data to the currently specified <code>StorageReference</code>.
 /// This is not recommended for large files, and one should instead upload a file from disk.
-/// @param uploadData The Data to upload.
-/// @param metadata StorageMetadata containing additional information (MIME type, etc.)
+/// \param uploadData The data to upload.
+///
+/// \param metadata <code>StorageMetadata</code> containing additional information (MIME type, etc.)
 /// about the object being uploaded.
-/// @param completion A completion block that either returns the object metadata on success,
+///
+/// \param completion A closure that either returns the object metadata on success,
 /// or an error on failure.
-/// @return An instance of StorageUploadTask, which can be used to monitor or manage the upload.
+///
+///
+/// returns:
+/// An instance of <code>StorageUploadTask</code>, which can be used to monitor or manage the
+/// upload.
 - (FIRStorageUploadTask *_Nonnull)putData:(NSData *_Nonnull)uploadData
                                  metadata:(FIRStorageMetadata *_Nullable)metadata
                                completion:(void (^_Nullable)(FIRStorageMetadata *_Nullable,
                                                              NSError *_Nullable))completion;
-/// Asynchronously uploads a file to the currently specified StorageReference.
-/// @param fileURL A URL representing the system file path of the object to be uploaded.
-/// @param metadata StorageMetadata containing additional information (MIME type, etc.)
+/// Asynchronously uploads a file to the currently specified <code>StorageReference</code>.
+/// \param fileURL A URL representing the system file path of the object to be uploaded.
+///
+/// \param metadata <code>StorageMetadata</code> containing additional information (MIME type, etc.)
 /// about the object being uploaded.
-/// @return An instance of StorageUploadTask, which can be used to monitor or manage the upload.
+///
+///
+/// returns:
+/// An instance of <code>StorageUploadTask</code>, which can be used to monitor or manage the
+/// upload.
 - (FIRStorageUploadTask *_Nonnull)putFile:(NSURL *_Nonnull)fileURL
                                  metadata:(FIRStorageMetadata *_Nullable)metadata;
-/// Asynchronously uploads a file to the currently specified StorageReference,
+/// Asynchronously uploads a file to the currently specified <code>StorageReference</code>,
 /// without additional metadata.
 /// @param fileURL A URL representing the system file path of the object to be uploaded.
 /// @return An instance of StorageUploadTask, which can be used to monitor or manage the upload.
 - (FIRStorageUploadTask *_Nonnull)putFile:(NSURL *_Nonnull)fileURL;
-/// Asynchronously uploads a file to the currently specified StorageReference.
-/// @param fileURL A URL representing the system file path of the object to be uploaded.
-/// @param metadata StorageMetadata containing additional information (MIME type, etc.)
+/// Asynchronously uploads a file to the currently specified <code>StorageReference</code>.
+/// \param fileURL A URL representing the system file path of the object to be uploaded.
+///
+/// \param metadata <code>StorageMetadata</code> containing additional information (MIME type, etc.)
 /// about the object being uploaded.
-/// @param completion A completion block that either returns the object metadata on success,
+///
+/// \param completion A completion block that either returns the object metadata on success,
 /// or an error on failure.
-/// @return An instance of StorageUploadTask, which can be used to monitor or manage the upload.
+///
+///
+/// returns:
+/// An instance of <code>StorageUploadTask</code>, which can be used to monitor or manage the
+/// upload.
 - (FIRStorageUploadTask *_Nonnull)putFile:(NSURL *_Nonnull)fileURL
                                  metadata:(FIRStorageMetadata *_Nullable)metadata
                                completion:(void (^_Nullable)(FIRStorageMetadata *_Nullable,
                                                              NSError *_Nullable))completion;
-/// Asynchronously downloads the object at the StorageReference to an Data object in memory.
-/// An Data of the provided max size will be allocated, so ensure that the device has enough free
-/// memory to complete the download. For downloading large files, writeToFile may be a better
-/// option.
-/// @param maxSize The maximum size in bytes to download. If the download exceeds this size,
-/// the task will be cancelled and an error will be returned.
-/// @param completion A completion block that either returns the object data on success,
+/// Asynchronously downloads the object at the <code>StorageReference</code> to a <code>Data</code>
+/// instance in memory. A <code>Data</code> buffer of the provided max size will be allocated, so
+/// ensure that the device has enough free memory to complete the download. For downloading large
+/// files, <code>write(toFile:)</code> may be a better option. \param maxSize The maximum size in
+/// bytes to download. If the download exceeds this size, the task will be cancelled and an error
+/// will be returned.
+///
+/// \param completion A completion block that either returns the object data on success,
 /// or an error on failure.
-/// @return An StorageDownloadTask that can be used to monitor or manage the download.
+///
+///
+/// returns:
+/// An <code>StorageDownloadTask</code> that can be used to monitor or manage the download.
 - (FIRStorageDownloadTask *_Nonnull)
     dataWithMaxSize:(int64_t)maxSize
          completion:(void (^_Nonnull)(NSData *_Nullable, NSError *_Nullable))completion;
 /// Asynchronously retrieves a long lived download URL with a revokable token.
 /// This can be used to share the file with others, but can be revoked by a developer
 /// in the Firebase Console.
-/// @param completion A completion block that either returns the URL on success,
+/// \param completion A completion block that either returns the URL on success,
 /// or an error on failure.
+///
 - (void)downloadURLWithCompletion:(void (^_Nonnull)(NSURL *_Nullable,
                                                     NSError *_Nullable))completion;
 /// Asynchronously downloads the object at the current path to a specified system filepath.
-/// @param fileURL A file system URL representing the path the object should be downloaded to.
-/// @return An StorageDownloadTask that can be used to monitor or manage the download.
+/// <ul>
+///   <li>
+///     Returns An <code>StorageDownloadTask</code> that can be used to monitor or manage the
+///     download.
+///   </li>
+/// </ul>
+/// \param fileURL A file system URL representing the path the object should be downloaded to.
+///
 - (FIRStorageDownloadTask *_Nonnull)writeToFile:(NSURL *_Nonnull)fileURL;
 /// Asynchronously downloads the object at the current path to a specified system filepath.
-/// @param fileURL A file system URL representing the path the object should be downloaded to.
-/// @param completion A completion block that fires when the file download completes.
-/// Returns an URL pointing to the file path of the downloaded file on success,
+/// \param fileURL A file system URL representing the path the object should be downloaded to.
+///
+/// \param completion A closure that fires when the file download completes, passed either
+/// a URL pointing to the file path of the downloaded file on success,
 /// or an error on failure.
-/// @return An StorageDownloadTask that can be used to monitor or manage the download.
+///
+///
+/// returns:
+/// A <code>StorageDownloadTask</code> that can be used to monitor or manage the download.
 - (FIRStorageDownloadTask *_Nonnull)writeToFile:(NSURL *_Nonnull)fileURL
                                      completion:(void (^_Nullable)(NSURL *_Nullable,
                                                                    NSError *_Nullable))completion;
-/// List all items (files) and prefixes (folders) under this StorageReference.
-/// This is a helper method for calling list() repeatedly until there are no more results.
-/// Consistency of the result is not guaranteed if objects are inserted or removed while this
-/// operation is executing. All results are buffered in memory.
+/// Lists all items (files) and prefixes (folders) under this <code>StorageReference</code>.
+/// This is a helper method for calling <code>list()</code> repeatedly until there are no more
+/// results. Consistency of the result is not guaranteed if objects are inserted or removed while
+/// this operation is executing. All results are buffered in memory.
 /// <code>listAll(completion:)</code> is only available for projects using Firebase Rules Version 2.
-/// @param completion A completion handler that will be invoked with all items and prefixes under
-/// the current StorageReference.
+/// \param completion A completion handler that will be invoked with all items and prefixes under
+/// the current <code>StorageReference</code>.
+///
 - (void)listAllWithCompletion:(void (^_Nonnull)(FIRStorageListResult *_Nullable,
                                                 NSError *_Nullable))completion;
 /// List up to <code>maxResults</code> items (files) and prefixes (folders) under this
 /// StorageReference. “/” is treated as a path delimiter. Firebase Storage does not support
 /// unsupported object paths that end with “/” or contain two consecutive “/“s. All invalid objects
 /// in GCS will be filtered. <code>list(maxResults:completion:)</code> is only available for
-/// projects using Firebase Rules Version 2.
-/// @param maxResults The maximum number of results to return in a single page. Must be greater
-/// than 0 and at most 1000.
-/// @param completion A completion handler that will be invoked with up to maxResults items and
-/// prefixes under the current StorageReference.
+/// projects using Firebase Rules Version 2. \param maxResults The maximum number of results to
+/// return in a single page. Must be greater than 0 and at most 1000.
+///
+/// \param completion A completion handler that will be invoked with up to <code>maxResults</code>
+/// items and prefixes under the current <code>StorageReference</code>.
+///
 - (void)listWithMaxResults:(int64_t)maxResults
                 completion:(void (^_Nonnull)(FIRStorageListResult *_Nullable,
                                              NSError *_Nullable))completion;
-/// Resumes a previous call to list(maxResults:completion:)`, starting after a pagination token.
-/// Returns the next set of items (files) and prefixes (folders) under this StorageReference.
-/// “/” is treated as a path delimiter. Firebase Storage does not support unsupported object
-/// paths that end with “/” or contain two consecutive “/“s. All invalid objects in GCS will be
-/// filtered.
-/// <code>list(maxResults:pageToken:completion:)</code>is only available for projects using Firebase
-/// Rules Version 2.
-/// @param maxResults The maximum number of results to return in a single page. Must be greater
-/// than 0 and at most 1000.
-/// @param pageToken A page token from a previous call to list.
-/// @param completion A completion handler that will be invoked with the next items and prefixes
+/// Resumes a previous call to <code>list(maxResults:completion:)</code>, starting after a
+/// pagination token. Returns the next set of items (files) and prefixes (folders) under this
+/// <code>StorageReference</code>. “/” is treated as a path delimiter. Storage does not support
+/// unsupported object paths that end with “/” or contain two consecutive “/“s. All invalid objects
+/// in GCS will be filtered. <code>list(maxResults:pageToken:completion:)</code>is only available
+/// for projects using Firebase Rules Version 2. \param maxResults The maximum number of results to
+/// return in a single page. Must be greater than 0 and at most 1000.
+///
+/// \param pageToken A page token from a previous call to list.
+///
+/// \param completion A completion handler that will be invoked with the next items and prefixes
 /// under the current StorageReference.
+///
 - (void)listWithMaxResults:(int64_t)maxResults
                  pageToken:(NSString *_Nonnull)pageToken
                 completion:(void (^_Nonnull)(FIRStorageListResult *_Nullable,
                                              NSError *_Nullable))completion;
 /// Retrieves metadata associated with an object at the current path.
-/// @param completion A completion block which returns the object metadata on success,
+/// \param completion A completion block which returns the object metadata on success,
 /// or an error on failure.
+///
 - (void)metadataWithCompletion:(void (^_Nonnull)(FIRStorageMetadata *_Nullable,
                                                  NSError *_Nullable))completion;
 /// Updates the metadata associated with an object at the current path.
-/// @param metadata An StorageMetadata object with the metadata to update.
-/// @param completion A completion block which returns the StorageMetadata on success,
+/// \param metadata A <code>StorageMetadata</code> object with the metadata to update.
+///
+/// \param completion A completion block which returns the <code>StorageMetadata</code> on success,
 /// or an error on failure.
+///
 - (void)updateMetadata:(FIRStorageMetadata *_Nonnull)metadata
             completion:
                 (void (^_Nullable)(FIRStorageMetadata *_Nullable, NSError *_Nullable))completion;
 /// Deletes the object at the current path.
-/// @param completion A completion block which returns nil on success, or an error on failure.
+/// \param completion A completion block which returns a nonnull error on failure.
+///
 - (void)deleteWithCompletion:(void (^_Nullable)(NSError *_Nullable))completion;
 - (FIRStorageReference *_Nonnull)copy:(struct _NSZone *_Nonnull)zone SWIFT_WARN_UNUSED_RESULT;
 - (BOOL)isEqual:(id _Nullable)object SWIFT_WARN_UNUSED_RESULT;
@@ -659,22 +757,22 @@ SWIFT_CLASS_NAMED("StorageReference")
 
 @class NSProgress;
 
-/// StorageTaskSnapshot represents an immutable view of a task.
-/// A Snapshot contains a task, storage reference, metadata (if it exists),
+/// <code>StorageTaskSnapshot</code> represents an immutable view of a task.
+/// A snapshot contains a task, storage reference, metadata (if it exists),
 /// progress, and an error (if one occurred).
 SWIFT_CLASS_NAMED("StorageTaskSnapshot")
 @interface FIRStorageTaskSnapshot : NSObject
-/// Subclass of StorageTask this snapshot represents.
+/// The task this snapshot represents.
 @property(nonatomic, readonly, strong) FIRStorageTask *_Nonnull task;
-/// Metadata returned by the task, or nil if no metadata returned.
+/// Metadata returned by the task, or <code>nil</code> if no metadata returned.
 @property(nonatomic, readonly, strong) FIRStorageMetadata *_Nullable metadata;
-/// StorageReference this task is operates on.
+/// The <code>StorageReference</code> this task operates on.
 @property(nonatomic, readonly, strong) FIRStorageReference *_Nonnull reference;
-/// Progress object which tracks the progress of an upload or download.
+/// An object which tracks the progress of an upload or download.
 @property(nonatomic, readonly, strong) NSProgress *_Nullable progress;
-/// Error during task execution, or nil if no error occurred.
+/// An error raised during task execution, or <code>nil</code> if no error occurred.
 @property(nonatomic, readonly) NSError *_Nullable error;
-/// Status of the task.
+/// The status of the task.
 @property(nonatomic, readonly) enum FIRStorageTaskStatus status;
 @property(nonatomic, readonly, copy) NSString *_Nonnull description;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
@@ -687,13 +785,13 @@ typedef SWIFT_ENUM_NAMED(NSInteger, FIRStorageTaskStatus, "StorageTaskStatus", o
     FIRStorageTaskStatusSuccess = 4,  FIRStorageTaskStatusFailure = 5,
 };
 
-/// StorageUploadTask implements resumable uploads to a file in Firebase Storage.
+/// <code>StorageUploadTask</code> implements resumable uploads to a file in Firebase Storage.
 /// Uploads can be returned on completion with a completion callback, and can be monitored
-/// by attaching observers, or controlled by calling StorageTask#pause, StorageTask#resume,
-/// or StorageTask#cancel.
-/// Uploads can takeData in memory, or an URL to a file on disk.
+/// by attaching observers, or controlled by calling <code>pause()</code>, <code>resume()</code>,
+/// or <code>cancel()</code>.
+/// Uploads can be initialized from <code>Data</code> in memory, or a URL to a file on disk.
 /// Uploads are performed on a background queue, and callbacks are raised on the developer
-/// specified callbackQueue in Storage, or the main queue if left unspecified.
+/// specified <code>callbackQueue</code> in Storage, or the main queue if unspecified.
 /// Currently all uploads must be initiated and managed on the main queue.
 SWIFT_CLASS_NAMED("StorageUploadTask")
 @interface FIRStorageUploadTask : FIRStorageObservableTask <FIRStorageTaskManagement>
@@ -701,9 +799,9 @@ SWIFT_CLASS_NAMED("StorageUploadTask")
 - (void)enqueue;
 /// Pauses a task currently in progress.
 - (void)pause;
-/// Pauses a task currently in progress.
+/// Cancels a task.
 - (void)cancel;
-/// Pauses a task currently in progress.
+/// Resumes a paused task.
 - (void)resume;
 @end
 
diff --git a/ios_pod/swift_headers/SwiftProtobuf-Swift.h b/ios_pod/swift_headers/SwiftProtobuf-Swift.h
index 8f203aef65..0e02a6606f 100644
--- a/ios_pod/swift_headers/SwiftProtobuf-Swift.h
+++ b/ios_pod/swift_headers/SwiftProtobuf-Swift.h
@@ -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)
diff --git a/messaging/integration_test/Podfile b/messaging/integration_test/Podfile
index 133c62a723..8443485695 100644
--- a/messaging/integration_test/Podfile
+++ b/messaging/integration_test/Podfile
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/Messaging', '9.0.0'
+  pod 'Firebase/Messaging', '9.1.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Messaging', '9.0.0'
+  pod 'Firebase/Messaging', '9.1.0'
 end
 
 post_install do |installer|
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
index 190f7a0d73..d389878100 100644
--- a/release_build_files/readme.md
+++ b/release_build_files/readme.md
@@ -203,46 +203,46 @@ Feature                    | Required Frameworks and Cocoapods
 -------------------------- | ---------------------------------------
 Firebase AdMob             | firebase_admob.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Analytics Cocoapod (9.0.0)
+|                          | Firebase/Analytics Cocoapod (9.1.0)
 |                          | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk2)
 Firebase Analytics         | firebase_analytics.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Analytics Cocoapod (9.0.0)
+|                          | Firebase/Analytics Cocoapod (9.1.0)
 Firebase Authentication    | firebase_auth.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Auth Cocoapod (9.0.0)
+|                          | Firebase/Auth Cocoapod (9.1.0)
 Firebase Dynamic Links     | firebase_dynamic_links.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/DynamicLinks Cocoapod (9.0.0)
+|                          | Firebase/DynamicLinks Cocoapod (9.1.0)
 Cloud Firestore            | firebase_firestore.xcframework
 |                          | firebase_auth.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Firestore Cocoapod (9.0.0)
-|                          | Firebase/Auth Cocoapod (9.0.0)
+|                          | Firebase/Firestore Cocoapod (9.1.0)
+|                          | Firebase/Auth Cocoapod (9.1.0)
 Firebase Functions         | firebase_functions.xcframework
 |                          | firebase_auth.xcframework (optional)
 |                          | firebase.xcframework
-|                          | Firebase/Functions Cocoapod (9.0.0)
-|                          | Firebase/Auth Cocoapod (9.0.0)
+|                          | Firebase/Functions Cocoapod (9.1.0)
+|                          | Firebase/Auth Cocoapod (9.1.0)
 Firebase Installations     | firebase_installations.xcframework
 |                          | firebase.xcframework
-|                          | FirebaseInstallations Cocoapod (9.0.0)
+|                          | FirebaseInstallations Cocoapod (9.1.0)
 Firebase Cloud Messaging   | firebase_messaging.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Messaging Cocoapod (9.0.0)
+|                          | Firebase/Messaging Cocoapod (9.1.0)
 Firebase Realtime Database | firebase_database.xcframework
 |                          | firebase_auth.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Database Cocoapod (9.0.0)
-|                          | Firebase/Auth Cocoapod (9.0.0)
+|                          | Firebase/Database Cocoapod (9.1.0)
+|                          | Firebase/Auth Cocoapod (9.1.0)
 Firebase Remote Config     | firebase_remote_config.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/RemoteConfig Cocoapod (9.0.0)
+|                          | Firebase/RemoteConfig Cocoapod (9.1.0)
 Firebase Storage           | firebase_storage.xcframework
 |                          | firebase_auth.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Storage Cocoapod (9.0.0)
-|                          | Firebase/Auth Cocoapod (9.0.0)
+|                          | Firebase/Storage Cocoapod (9.1.0)
+|                          | Firebase/Auth Cocoapod (9.1.0)
 
 Important: Each version of the Firebase C++ SDK supports a specific version of
 the Firebase iOS SDK. Please ensure that you reference the Cocoapod versions
@@ -267,46 +267,46 @@ Feature                    | Required Libraries and Cocoapods
 -------------------------- | -----------------------------------------
 Firebase AdMob             | libfirebase_admob.a
 |                          | libfirebase_app.a
-|                          | Firebase/Analytics Cocoapod (9.0.0)
+|                          | Firebase/Analytics Cocoapod (9.1.0)
 |                          | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk2)
 Firebase Analytics         | libfirebase_analytics.a
 |                          | libfirebase_app.a
-|                          | Firebase/Analytics Cocoapod (9.0.0)
+|                          | Firebase/Analytics Cocoapod (9.1.0)
 Firebase Authentication    | libfirebase_auth.a
 |                          | libfirebase_app.a
-|                          | Firebase/Auth Cocoapod (9.0.0)
+|                          | Firebase/Auth Cocoapod (9.1.0)
 Firebase Dynamic Links     | libfirebase_dynamic_links.a
 |                          | libfirebase_app.a
-|                          | Firebase/DynamicLinks Cocoapod (9.0.0)
+|                          | Firebase/DynamicLinks Cocoapod (9.1.0)
 Cloud Firestore            | libfirebase_firestore.a
 |                          | libfirebase_app.a
 |                          | libfirebase_auth.a
-|                          | Firebase/Firestore Cocoapod (9.0.0)
-|                          | Firebase/Auth Cocoapod (9.0.0)
+|                          | Firebase/Firestore Cocoapod (9.1.0)
+|                          | Firebase/Auth Cocoapod (9.1.0)
 Firebase Functions         | libfirebase_functions.a
 |                          | libfirebase_app.a
 |                          | libfirebase_auth.a (optional)
-|                          | Firebase/Functions Cocoapod (9.0.0)
-|                          | Firebase/Auth Cocoapod (9.0.0)
+|                          | Firebase/Functions Cocoapod (9.1.0)
+|                          | Firebase/Auth Cocoapod (9.1.0)
 Firebase Installations     | libfirebase_installations.a
 |                          | libfirebase_app.a
-|                          | FirebaseInstallations Cocoapod (9.0.0)
+|                          | FirebaseInstallations Cocoapod (9.1.0)
 Firebase Cloud Messaging   | libfirebase_messaging.a
 |                          | libfirebase_app.a
-|                          | Firebase/CloudMessaging Cocoapod (9.0.0)
+|                          | Firebase/CloudMessaging Cocoapod (9.1.0)
 Firebase Realtime Database | libfirebase_database.a
 |                          | libfirebase_app.a
 |                          | libfirebase_auth.a
-|                          | Firebase/Database Cocoapod (9.0.0)
-|                          | Firebase/Auth Cocoapod (9.0.0)
+|                          | Firebase/Database Cocoapod (9.1.0)
+|                          | Firebase/Auth Cocoapod (9.1.0)
 Firebase Remote Config     | libfirebase_remote_config.a
 |                          | libfirebase_app.a
-|                          | Firebase/RemoteConfig Cocoapod (9.0.0)
+|                          | Firebase/RemoteConfig Cocoapod (9.1.0)
 Firebase Storage           | libfirebase_storage.a
 |                          | libfirebase_app.a
 |                          | libfirebase_auth.a
-|                          | Firebase/Storage Cocoapod (9.0.0)
-|                          | Firebase/Auth Cocoapod (9.0.0)
+|                          | Firebase/Storage Cocoapod (9.1.0)
+|                          | Firebase/Auth Cocoapod (9.1.0)
 
 Important: Each version of the Firebase C++ SDK supports a specific version of
 the Firebase iOS SDK. Please ensure that you reference the Cocoapod versions
diff --git a/remote_config/integration_test/Podfile b/remote_config/integration_test/Podfile
index cb23fca811..e0e1c1916d 100644
--- a/remote_config/integration_test/Podfile
+++ b/remote_config/integration_test/Podfile
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/RemoteConfig', '9.0.0'
+  pod 'Firebase/RemoteConfig', '9.1.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/RemoteConfig', '9.0.0'
+  pod 'Firebase/RemoteConfig', '9.1.0'
 end
 
 post_install do |installer|
diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile
index 15de55a65e..6a6a445c7c 100644
--- a/storage/integration_test/Podfile
+++ b/storage/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/Storage', '9.0.0'
-  pod 'Firebase/Auth', '9.0.0'
+  pod 'Firebase/Storage', '9.1.0'
+  pod 'Firebase/Auth', '9.1.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Storage', '9.0.0'
-  pod 'Firebase/Auth', '9.0.0'
+  pod 'Firebase/Storage', '9.1.0'
+  pod 'Firebase/Auth', '9.1.0'
 end
 
 post_install do |installer|

From 94b5f05e2fc3f1c77163d77261c8b977a0d1a2b3 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 31 May 2022 15:44:27 -0400
Subject: [PATCH 17/24] 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 https://github.com/firebase/firebase-ios-sdk/pull/9488.

I'm not sure _why_ these tests can't be found; but they're superfluous anyways. So just disable them.
---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb610fdc90..83b2a3fde5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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.

From 2589c43f757b7684067c1a150abd11dcfc5b2c5a Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 31 May 2022 16:01:36 -0400
Subject: [PATCH 18/24] firestore.cmake: bump pinned commit

---
 cmake/external/firestore.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 43e34f2e89..eba8656f9d 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -37,8 +37,8 @@ function(GetReleasedDep)
 
     DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
     GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git"
-    # Pinned HEAD commit as of May 27, 2022 @ 15:36 EDT.
-    GIT_TAG c2bc549a7017c456a20ee69ca7ec27ea4a6077bd
+    # Pinned HEAD commit as of May 31, 2022 @ 16:01 EDT.
+    GIT_TAG 1658c4051e742d88105a6b23ffb4f8fabb0c00f0
 
     PREFIX ${PROJECT_BINARY_DIR}
 

From 895126fc9ab804785f76d33ebfffc3cc83b1e58d Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Wed, 1 Jun 2022 14:19:45 +0000
Subject: [PATCH 19/24] value_util.cc: Fix MaxValue() to no longer use
 designated initialization.

This ports https://github.com/firebase/firebase-ios-sdk/pull/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 https://github.com/firebase/firebase-ios-sdk/pull/9868 then this commit should be reverted.
---
 cmake/external/firestore_snappy.patch.txt | 65 +++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/cmake/external/firestore_snappy.patch.txt b/cmake/external/firestore_snappy.patch.txt
index 317ecc6823..f1742fb965 100644
--- a/cmake/external/firestore_snappy.patch.txt
+++ b/cmake/external/firestore_snappy.patch.txt
@@ -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) {

From 388803782574289df178c30ffd4b2e5dae81af12 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 31 May 2022 16:01:36 -0400
Subject: [PATCH 20/24] firestore.cmake: bump pinned commit

---
 cmake/external/firestore.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index eba8656f9d..58fd8ac5c2 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -37,8 +37,8 @@ function(GetReleasedDep)
 
     DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
     GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git"
-    # Pinned HEAD commit as of May 31, 2022 @ 16:01 EDT.
-    GIT_TAG 1658c4051e742d88105a6b23ffb4f8fabb0c00f0
+    # Pinned HEAD commit as of June 01, 2022 @ 10:51 EDT.
+    GIT_TAG 89c38d1ed908dbc10d5f9f7aded4cf271113773f
 
     PREFIX ${PROJECT_BINARY_DIR}
 

From 6a7e47d94ef62947451d4c46b2265a07117e0e22 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 7 Jun 2022 15:04:47 -0400
Subject: [PATCH 21/24] replace the fancy python script with a simple patch

---
 cmake/external/firestore.cmake         |  20 +-
 cmake/external/firestore.patch.txt     |  25 +++
 cmake/external/firestore_patch.py      | 122 ------------
 cmake/external/firestore_patch_test.py | 265 -------------------------
 cmake/external/leveldb.cmake           |   3 +
 5 files changed, 30 insertions(+), 405 deletions(-)
 create mode 100644 cmake/external/firestore.patch.txt
 delete mode 100644 cmake/external/firestore_patch.py
 delete mode 100644 cmake/external/firestore_patch_test.py

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 58fd8ac5c2..cc905f943f 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -18,14 +18,6 @@ if(TARGET firestore)
   return()
 endif()
 
-if(${CMAKE_VERSION} VERSION_LESS "3.12")
-  include(FindPythonInterp)
-  set(MY_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
-else()
-  find_package(Python3 COMPONENTS Interpreter REQUIRED)
-  set(MY_PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
-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.1.0)
@@ -46,11 +38,7 @@ function(GetReleasedDep)
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     TEST_COMMAND ""
-    PATCH_COMMAND
-      ${MY_PYTHON_EXECUTABLE}
-      ${CMAKE_CURRENT_LIST_DIR}/firestore_patch.py
-      --leveldb-version-from
-      ${CMAKE_CURRENT_LIST_DIR}/leveldb.cmake
+    PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore.patch.txt
     HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
     )
 endfunction()
@@ -71,11 +59,7 @@ function(GetTag t)
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     TEST_COMMAND ""
-    PATCH_COMMAND
-      ${MY_PYTHON_EXECUTABLE}
-      ${CMAKE_CURRENT_LIST_DIR}/firestore_patch.py
-      --leveldb-version-from
-      ${CMAKE_CURRENT_LIST_DIR}/leveldb.cmake
+    PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/firestore.patch.txt
     HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
     )
 endfunction()
diff --git a/cmake/external/firestore.patch.txt b/cmake/external/firestore.patch.txt
new file mode 100644
index 0000000000..fa029b4ac1
--- /dev/null
+++ b/cmake/external/firestore.patch.txt
@@ -0,0 +1,25 @@
+diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
+index 920bf2928..c5c9cc7ee 100644
+--- a/cmake/external/leveldb.cmake
++++ b/cmake/external/leveldb.cmake
+@@ -24,7 +24,10 @@ if(TARGET leveldb)
+   return()
+ endif()
+ 
+-set(version 1.22)
++# This version must be kept in sync with cmake/external/leveldb.cmake
++# in the firebase-cpp-sdk. If this version ever changes then make sure
++# to update leveldb.cmake in the firebase-cpp-sdk accordingly.
++set(version 1.23)
+ 
+ ExternalProject_Get_property(snappy SOURCE_DIR)
+ set(snappy_source_dir "${SOURCE_DIR}")
+@@ -39,7 +42,7 @@ ExternalProject_Add(
+   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
+   DOWNLOAD_NAME leveldb-${version}.tar.gz
+   URL https://github.com/google/leveldb/archive/${version}.tar.gz
+-  URL_HASH SHA256=55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2
++  URL_HASH SHA256=9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76
+ 
+   PREFIX ${PROJECT_BINARY_DIR}
+ 
diff --git a/cmake/external/firestore_patch.py b/cmake/external/firestore_patch.py
deleted file mode 100644
index b5b50a258e..0000000000
--- a/cmake/external/firestore_patch.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2022 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""
-Modify the version in leveldb.cmake from the Firebase iOS SDK to match the
-version from this C++ SDK.
-"""
-
-import argparse
-import os
-import pathlib
-import re
-from typing import List, Tuple
-
-
-VERSION_PATTERN = r"\s*set\s*\(\s*version\s+([^)\s]+)\s*\)\s*"
-VERSION_EXPR = re.compile(VERSION_PATTERN, re.IGNORECASE)
-URL_HASH_PATTERN = r"\s*URL_HASH\s+([0-9a-zA-Z=]+)\s*"
-URL_HASH_EXPR = re.compile(URL_HASH_PATTERN, re.IGNORECASE)
-
-
-def main() -> None:
-  (src_file, dest_file) = parse_args()
-
-  leveldb_version = load_value(src_file, VERSION_EXPR)
-  url_hash = load_value(src_file, URL_HASH_EXPR)
-
-  set_value(dest_file, VERSION_EXPR, leveldb_version)
-  set_value(dest_file, URL_HASH_EXPR, url_hash)
-
-
-def parse_args() -> Tuple[pathlib.Path, pathlib.Path]:
-  arg_parser = argparse.ArgumentParser()
-  arg_parser.add_argument("--leveldb-version-from", required=True)
-  arg_parser.add_argument("--leveldb-version-to")
-
-  parsed_args = arg_parser.parse_args()
-
-  leveldb_cmake_src_file = pathlib.Path(parsed_args.leveldb_version_from)
-
-  if parsed_args.leveldb_version_to:
-    leveldb_cmake_dest_file = pathlib.Path(parsed_args.leveldb_version_to)
-  else:
-    leveldb_cmake_dest_file = pathlib.Path.cwd() \
-      / "cmake" / "external" / "leveldb.cmake"
-
-  return (leveldb_cmake_src_file, leveldb_cmake_dest_file)
-
-
-def load_value(file_: pathlib.Path, expr: re.Pattern) -> str:
-  value = None
-  value_line = None
-  value_line_number = None
-
-  with file_.open("rt", encoding="utf8") as f:
-    for (line_number, line) in enumerate(f, start=1):
-      match = expr.fullmatch(line)
-      if not match:
-        continue
-      elif value is not None:
-        raise RegexMatchError(
-          f"Multiple lines matching regex {expr.pattern} found in "
-          f"{file_}: line {value_line_number}, {value_line.strip()} "
-          f"and line {line_number}, {line.strip()}")
-
-      value = match.group(1).strip()
-      value_line = line
-      value_line_number = line_number
-
-  if value is None:
-    raise RegexMatchError(
-      f"No line matching regex {expr.pattern} found in {file_}")
-
-  return value
-
-
-def set_value(file_: pathlib.Path, expr: re.Pattern, version: str) -> None:
-  with file_.open("rt", encoding="utf8") as f:
-    lines = list(f)
-
-  matching_line = None
-  matching_line_number = None
-
-  for (line_number, line) in enumerate(lines, start=1):
-    match = expr.fullmatch(line)
-    if not match:
-      continue
-    elif matching_line is not None:
-      raise RegexMatchError(
-        f"Multiple lines matching regex {expr.pattern} found in "
-        f"{file_}: line {matching_line_number}, {matching_line.strip()} "
-        f"and line {line_number}, {line.strip()}")
-
-    lines[line_number - 1] = line[:match.start(1)] + version + line[match.end(1):]
-    matching_line = line
-    matching_line_number = line_number
-
-  if matching_line is None:
-    raise RegexMatchError(
-      f"No line matching regex {expr.pattern} found in {file_}")
-
-  with file_.open("wt", encoding="utf8") as f:
-    f.writelines(lines)
-
-
-class RegexMatchError(Exception):
-  pass
-
-
-if __name__ == "__main__":
-  main()
diff --git a/cmake/external/firestore_patch_test.py b/cmake/external/firestore_patch_test.py
deleted file mode 100644
index bf739be555..0000000000
--- a/cmake/external/firestore_patch_test.py
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 2022 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-import pathlib
-import re
-import shutil
-import tempfile
-from typing import Iterable
-import unittest
-import unittest.mock
-
-import firestore_patch
-
-
-class TestUtilsMixin:
-
-  def create_temp_file_with_lines(self, lines: Iterable[str]) -> pathlib.Path:
-    (handle, path_str) = tempfile.mkstemp()
-    os.close(handle)
-    path = pathlib.Path(path_str)
-    self.addCleanup(path.unlink, missing_ok=True) # pytype: disable=attribute-error
-
-    with path.open("wt", encoding="utf8") as f:
-      for line in lines:
-        print(line, file=f)
-
-    return path
-
-  def create_temp_file_with_line(self, line: str) -> pathlib.Path:
-    return self.create_temp_file_with_lines([line])
-
-
-class MainTest(TestUtilsMixin, unittest.TestCase):
-
-  def test(self):
-    src_file = self.create_temp_file_with_lines([
-      "aaa",
-      "bbb",
-      "set(version 1.2.3)",
-      "URL_HASH SHA256=abcdef",
-      "ccc",
-      "ddd",
-    ])
-    dest_file = self.create_temp_file_with_lines([
-      "aaa",
-      "bbb",
-      "set(version 4.5.6)",
-      "URL_HASH SHA256=ghijkl",
-      "ccc",
-      "ddd",
-    ])
-    dest_file_contents_before = dest_file.read_text(encoding="utf8")
-    patcher = unittest.mock.patch.object(
-      firestore_patch,
-      "parse_args",
-      spec_set=True,
-      autospec=True,
-      return_value=(src_file, dest_file)
-    )
-
-    with patcher:
-      firestore_patch.main()
-
-    dest_file_contents_after = dest_file.read_text(encoding="utf8")
-    self.assertEqual(
-      dest_file_contents_after,
-      dest_file_contents_before
-        .replace("4.5.6", "1.2.3")
-        .replace("ghijkl", "abcdef")
-    )
-
-
-class VersionExprTest(TestUtilsMixin, unittest.TestCase):
-
-  def test_matches_semantic_version(self):
-    path = self.create_temp_file_with_line("set(version 1.2.3)")
-
-    value = firestore_patch.load_value(path, firestore_patch.VERSION_EXPR)
-
-    self.assertEqual(value, "1.2.3")
-
-  def test_matches_sha1(self):
-    path = self.create_temp_file_with_line("set(version fd054fa01)")
-
-    value = firestore_patch.load_value(path, firestore_patch.VERSION_EXPR)
-
-    self.assertEqual(value, "fd054fa01")
-
-  def test_ignores_whitespace(self):
-    path = self.create_temp_file_with_line("  set  (  version   1.2.3  )   ")
-
-    value = firestore_patch.load_value(path, firestore_patch.VERSION_EXPR)
-
-    self.assertEqual(value, "1.2.3")
-
-  def test_case_insensitive(self):
-    path = self.create_temp_file_with_line("sEt(vErSiOn 1.2.3)")
-
-    value = firestore_patch.load_value(path, firestore_patch.VERSION_EXPR)
-
-    self.assertEqual(value, "1.2.3")
-
-
-class UrlHashExprTest(TestUtilsMixin, unittest.TestCase):
-
-  def test_matches_sha256(self):
-    path = self.create_temp_file_with_line("URL_HASH SHA256=abc123def456")
-
-    value = firestore_patch.load_value(path, firestore_patch.URL_HASH_EXPR)
-
-    self.assertEqual(value, "SHA256=abc123def456")
-
-  def test_ignores_whitespace(self):
-    path = self.create_temp_file_with_line("  URL_HASH   abc123def456  ")
-
-    value = firestore_patch.load_value(path, firestore_patch.URL_HASH_EXPR)
-
-    self.assertEqual(value, "abc123def456")
-
-  def test_case_insensitive(self):
-    path = self.create_temp_file_with_line("UrL_hAsH Sha256=abc123def456")
-
-    value = firestore_patch.load_value(path, firestore_patch.URL_HASH_EXPR)
-
-    self.assertEqual(value, "Sha256=abc123def456")
-
-
-class LoadValueTest(TestUtilsMixin, unittest.TestCase):
-
-  def test_loads_the_value(self):
-    path = self.create_temp_file_with_line("aaa1234ccc")
-    expr = re.compile(r"\D+(\d+)\D+")
-
-    value = firestore_patch.load_value(path, expr)
-
-    self.assertEqual(value, "1234")
-
-  def test_loads_the_value_ignoring_non_matching_lines(self):
-    path = self.create_temp_file_with_lines([
-      "blah",
-      "blah",
-      "aaa1234cccc",
-      "blah",
-      "blah",
-    ])
-    expr = re.compile(r"\D+(\d+)\D+")
-
-    value = firestore_patch.load_value(path, expr)
-
-    self.assertEqual(value, "1234")
-
-  def test_raises_error_if_no_matching_line_found(self):
-    path = self.create_temp_file_with_lines([
-      "blah",
-      "blah",
-      "blah",
-      "blah",
-    ])
-    expr = re.compile(r"\D+(\d+)\D+")
-
-    with self.assertRaises(firestore_patch.RegexMatchError) as cm:
-      firestore_patch.load_value(path, expr)
-
-    self.assertIn("no line matching", str(cm.exception).lower())
-    self.assertIn(expr.pattern, str(cm.exception))
-    self.assertIn(str(path), str(cm.exception))
-
-  def test_raises_error_if_multiple_matching_lines_found(self):
-    lines = ["blah"] * 100
-    lines.append("aaa123bbb")
-    lines.append("ccc456ddd")
-    path = self.create_temp_file_with_lines(lines)
-    expr = re.compile(r"\D+(\d+)\D+")
-
-    with self.assertRaises(firestore_patch.RegexMatchError) as cm:
-      firestore_patch.load_value(path, expr)
-
-    self.assertIn("multiple lines matching", str(cm.exception).lower())
-    self.assertIn(str(path), str(cm.exception))
-    self.assertIn(expr.pattern, str(cm.exception))
-    self.assertIn("line 101", str(cm.exception))
-    self.assertIn("line 102", str(cm.exception))
-    self.assertIn("123", str(cm.exception))
-    self.assertIn("456", str(cm.exception))
-
-
-class SaveValueTest(TestUtilsMixin, unittest.TestCase):
-
-  def test_saves_the_value(self):
-    path = self.create_temp_file_with_line("aaa1234ccc")
-    expr = re.compile(r"\D+(\d+)\D+")
-
-    firestore_patch.set_value(path, expr, "9876")
-
-    new_value = firestore_patch.load_value(path, expr)
-    self.assertEqual(new_value, "9876")
-
-  def test_saves_the_value_ignoring_non_matching_lines(self):
-    path = self.create_temp_file_with_lines([
-      "blah",
-      "blah",
-      "aaa1234cccc",
-      "blah",
-      "blah",
-    ])
-    expr = re.compile(r"\D+(\d+)\D+")
-    file_contents_before = path.read_text(encoding="utf8")
-
-    firestore_patch.set_value(path, expr, "9876")
-
-    file_contents_after = path.read_text(encoding="utf8")
-    self.assertEqual(
-      file_contents_after,
-      file_contents_before.replace("1234", "9876"),
-    )
-
-  def test_raises_error_if_no_matching_line_found(self):
-    path = self.create_temp_file_with_lines([
-      "blah",
-      "blah",
-      "blah",
-      "blah",
-    ])
-    expr = re.compile(r"\D+(\d+)\D+")
-
-    with self.assertRaises(firestore_patch.RegexMatchError) as cm:
-      firestore_patch.set_value(path, expr, "")
-
-    self.assertIn("no line matching", str(cm.exception).lower())
-    self.assertIn(expr.pattern, str(cm.exception))
-    self.assertIn(str(path), str(cm.exception))
-
-  def test_raises_error_if_multiple_matching_lines_found(self):
-    lines = ["blah"] * 100
-    lines.append("aaa123bbb")
-    lines.append("ccc456ddd")
-    path = self.create_temp_file_with_lines(lines)
-    expr = re.compile(r"\D+(\d+)\D+")
-
-    with self.assertRaises(firestore_patch.RegexMatchError) as cm:
-      firestore_patch.set_value(path, expr, "")
-
-    self.assertIn("multiple lines matching", str(cm.exception).lower())
-    self.assertIn(str(path), str(cm.exception))
-    self.assertIn(expr.pattern, str(cm.exception))
-    self.assertIn("line 101", str(cm.exception))
-    self.assertIn("line 102", str(cm.exception))
-    self.assertIn("123", str(cm.exception))
-    self.assertIn("456", str(cm.exception))
-
-
-if __name__ == "__main__":
-  unittest.main()
diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
index a8a154bb4e..93d4ca55c2 100644
--- a/cmake/external/leveldb.cmake
+++ b/cmake/external/leveldb.cmake
@@ -18,6 +18,9 @@ if(TARGET leveldb)
   return()
 endif()
 
+# This version must be kept in sync with the version in firestore.patch.
+# If this version ever changes then make sure to update the version in
+# firestore.patch accordingly.
 set(version 1.23)
 
 ExternalProject_Add(

From 5e758469906c49cee22411899f8e74967f8829a8 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 7 Jun 2022 15:18:36 -0400
Subject: [PATCH 22/24] leveldb.cmake: fix comment: firestore.patch ->
 firestore.patch.txt

---
 cmake/external/leveldb.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
index 93d4ca55c2..866e82ac6e 100644
--- a/cmake/external/leveldb.cmake
+++ b/cmake/external/leveldb.cmake
@@ -18,9 +18,9 @@ if(TARGET leveldb)
   return()
 endif()
 
-# This version must be kept in sync with the version in firestore.patch.
+# This version must be kept in sync with the version in firestore.patch.txt.
 # If this version ever changes then make sure to update the version in
-# firestore.patch accordingly.
+# firestore.patch.txt accordingly.
 set(version 1.23)
 
 ExternalProject_Add(

From 68d3768b43a6d3879c7386bba0d461a946ddcb9e Mon Sep 17 00:00:00 2001
From: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
Date: Wed, 22 Jun 2022 20:30:47 +0000
Subject: [PATCH 23/24] Update iOS dependencies - Wed Jun 22 2022
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### iOS

- Firebase/Analytics → 9.2.0
- Firebase/Auth → 9.2.0
- Firebase/Core → 9.2.0
- Firebase/Crashlytics → 9.2.0
- Firebase/Database → 9.2.0
- Firebase/DynamicLinks → 9.2.0
- Firebase/Firestore → 9.2.0
- Firebase/Functions → 9.2.0
- Firebase/Installations → 9.2.0
- Firebase/Messaging → 9.2.0
- Firebase/RemoteConfig → 9.2.0
- Firebase/Storage → 9.2.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/2544841237).
---
 admob/integration_test/Podfile                |  2 +-
 analytics/integration_test/Podfile            |  4 +-
 analytics/ios_headers/FIREventNames.h         |  2 +-
 analytics/ios_headers/FIRParameterNames.h     |  2 +-
 analytics/ios_headers/FIRUserPropertyNames.h  |  2 +-
 app/integration_test/Podfile                  |  2 +-
 auth/integration_test/Podfile                 |  4 +-
 cmake/external/firestore.cmake                |  2 +-
 database/integration_test/Podfile             |  8 +--
 dynamic_links/integration_test/Podfile        |  2 +-
 firestore/integration_test/Podfile            |  8 +--
 firestore/integration_test_internal/Podfile   |  8 +--
 functions/integration_test/Podfile            |  8 +--
 installations/integration_test/Podfile        |  4 +-
 ios_pod/Podfile                               | 24 ++++----
 .../FirebaseAnalyticsSwift-Swift.h            |  2 +-
 .../FirebaseCoreInternal-Swift.h              |  2 +-
 .../FirebaseDatabaseSwift-Swift.h             |  2 +-
 .../FirebaseFirestoreSwift-Swift.h            |  2 +-
 .../swift_headers/FirebaseFunctions-Swift.h   |  2 +-
 .../FirebaseInAppMessagingSwift-Swift.h       |  2 +-
 .../FirebaseMLModelDownloader-Swift.h         |  2 +-
 .../FirebaseRemoteConfigSwift-Swift.h         |  2 +-
 .../swift_headers/FirebaseSharedSwift-Swift.h |  2 +-
 ios_pod/swift_headers/FirebaseStorage-Swift.h |  2 +-
 ios_pod/swift_headers/SwiftProtobuf-Swift.h   |  2 +-
 messaging/integration_test/Podfile            |  4 +-
 release_build_files/readme.md                 | 60 +++++++++----------
 remote_config/integration_test/Podfile        |  4 +-
 storage/integration_test/Podfile              |  8 +--
 30 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile
index 82cd92953b..f2e12fd804 100644
--- a/admob/integration_test/Podfile
+++ b/admob/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '10.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '9.1.0'
+  pod 'Firebase/Analytics', '9.2.0'
   pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2'
 end
 
diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile
index 3790ca6ddd..ab38384529 100644
--- a/analytics/integration_test/Podfile
+++ b/analytics/integration_test/Podfile
@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/Analytics', '9.1.0'
+  pod 'Firebase/Analytics', '9.2.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Analytics', '9.1.0'
+  pod 'Firebase/Analytics', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/analytics/ios_headers/FIREventNames.h b/analytics/ios_headers/FIREventNames.h
index 202f81022c..ca1c6623f7 100644
--- a/analytics/ios_headers/FIREventNames.h
+++ b/analytics/ios_headers/FIREventNames.h
@@ -1,6 +1,6 @@
 // Copyright 2022 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 9.1.0.
+// Copied from Firebase Analytics iOS SDK 9.2.0.
 
 /// @file FIREventNames.h
 ///
diff --git a/analytics/ios_headers/FIRParameterNames.h b/analytics/ios_headers/FIRParameterNames.h
index 136f0f5d85..99544d75ff 100644
--- a/analytics/ios_headers/FIRParameterNames.h
+++ b/analytics/ios_headers/FIRParameterNames.h
@@ -1,6 +1,6 @@
 // Copyright 2022 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 9.1.0.
+// Copied from Firebase Analytics iOS SDK 9.2.0.
 
 /// @file FIRParameterNames.h
 ///
diff --git a/analytics/ios_headers/FIRUserPropertyNames.h b/analytics/ios_headers/FIRUserPropertyNames.h
index f1c7f267dd..edac8f3c1d 100644
--- a/analytics/ios_headers/FIRUserPropertyNames.h
+++ b/analytics/ios_headers/FIRUserPropertyNames.h
@@ -1,6 +1,6 @@
 // Copyright 2022 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 9.1.0.
+// Copied from Firebase Analytics iOS SDK 9.2.0.
 
 /// @file FIRUserPropertyNames.h
 ///
diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile
index 2b6d6dd224..340907fbe8 100644
--- a/app/integration_test/Podfile
+++ b/app/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '10.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '9.1.0'
+  pod 'Firebase/Analytics', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile
index b08f1f8862..8fb592bbde 100644
--- a/auth/integration_test/Podfile
+++ b/auth/integration_test/Podfile
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index d6a2849d02..e18efe4b55 100644
--- a/cmake/external/firestore.cmake
+++ b/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.1.0)
+set(version CocoaPods-9.2.0)
 
 function(GetReleasedDep)
   message("Getting released firebase-ios-sdk @ ${version}")
diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile
index 0f48f8d03a..e6162e6eee 100644
--- a/database/integration_test/Podfile
+++ b/database/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/Database', '9.1.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Database', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Database', '9.1.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Database', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile
index 7141ef86bc..aa2bd21ca9 100644
--- a/dynamic_links/integration_test/Podfile
+++ b/dynamic_links/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '10.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/DynamicLinks', '9.1.0'
+  pod 'Firebase/DynamicLinks', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile
index d106fbcf81..6868cb50f7 100644
--- a/firestore/integration_test/Podfile
+++ b/firestore/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/Firestore', '9.1.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Firestore', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Firestore', '9.1.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Firestore', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/firestore/integration_test_internal/Podfile b/firestore/integration_test_internal/Podfile
index 86c2bec605..7b3902c474 100644
--- a/firestore/integration_test_internal/Podfile
+++ b/firestore/integration_test_internal/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/Firestore', '9.1.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Firestore', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Firestore', '9.1.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Firestore', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile
index c843f66614..f61860b07b 100644
--- a/functions/integration_test/Podfile
+++ b/functions/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/Functions', '9.1.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Functions', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Functions', '9.1.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Functions', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile
index 1329967794..6c834f1af4 100644
--- a/installations/integration_test/Podfile
+++ b/installations/integration_test/Podfile
@@ -4,8 +4,8 @@ platform :ios, '10.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '9.1.0'
-  pod 'Firebase/Installations', '9.1.0'
+  pod 'Firebase/Analytics', '9.2.0'
+  pod 'Firebase/Installations', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/ios_pod/Podfile b/ios_pod/Podfile
index b5a4597ac2..7c80b73d31 100644
--- a/ios_pod/Podfile
+++ b/ios_pod/Podfile
@@ -3,19 +3,19 @@ platform :ios, '10.0'
 use_frameworks!
 
 target 'GetPods' do
-  pod 'Firebase/Core', '9.1.0'
+  pod 'Firebase/Core', '9.2.0'
 
   pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2'
-  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'
+  pod 'Firebase/Analytics', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
+  pod 'Firebase/Crashlytics', '9.2.0'
+  pod 'Firebase/Database', '9.2.0'
+  pod 'Firebase/DynamicLinks', '9.2.0'
+  pod 'Firebase/Firestore', '9.2.0'
+  pod 'Firebase/Functions', '9.2.0'
+  pod 'Firebase/Installations', '9.2.0'
+  pod 'Firebase/Messaging', '9.2.0'
+  pod 'Firebase/RemoteConfig', '9.2.0'
+  pod 'Firebase/Storage', '9.2.0'
 
 end
diff --git a/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h b/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h
index ca90341c73..6c84acc691 100644
--- a/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
 // clang-1316.0.20.8)
diff --git a/ios_pod/swift_headers/FirebaseCoreInternal-Swift.h b/ios_pod/swift_headers/FirebaseCoreInternal-Swift.h
index 8ed11a3e85..43652a24c8 100644
--- a/ios_pod/swift_headers/FirebaseCoreInternal-Swift.h
+++ b/ios_pod/swift_headers/FirebaseCoreInternal-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62 clang-1316.0.20.8)
 #ifndef FIREBASECOREINTERNAL_SWIFT_H
diff --git a/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h b/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h
index ebc49239ed..28123ea5c6 100644
--- a/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
 // clang-1316.0.20.8)
diff --git a/ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h b/ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h
index 49a83129fd..dc8ba3c87e 100644
--- a/ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
 // clang-1316.0.20.8)
diff --git a/ios_pod/swift_headers/FirebaseFunctions-Swift.h b/ios_pod/swift_headers/FirebaseFunctions-Swift.h
index 77640fee74..2aa246a84e 100644
--- a/ios_pod/swift_headers/FirebaseFunctions-Swift.h
+++ b/ios_pod/swift_headers/FirebaseFunctions-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62 clang-1316.0.20.8)
 #ifndef FIREBASEFUNCTIONS_SWIFT_H
diff --git a/ios_pod/swift_headers/FirebaseInAppMessagingSwift-Swift.h b/ios_pod/swift_headers/FirebaseInAppMessagingSwift-Swift.h
index fd40256f0c..207828a527 100644
--- a/ios_pod/swift_headers/FirebaseInAppMessagingSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseInAppMessagingSwift-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
 // clang-1316.0.20.8)
diff --git a/ios_pod/swift_headers/FirebaseMLModelDownloader-Swift.h b/ios_pod/swift_headers/FirebaseMLModelDownloader-Swift.h
index 33256545fd..fc9ec35250 100644
--- a/ios_pod/swift_headers/FirebaseMLModelDownloader-Swift.h
+++ b/ios_pod/swift_headers/FirebaseMLModelDownloader-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
 // clang-1316.0.20.8)
diff --git a/ios_pod/swift_headers/FirebaseRemoteConfigSwift-Swift.h b/ios_pod/swift_headers/FirebaseRemoteConfigSwift-Swift.h
index 5aa1f94856..b000c21fd5 100644
--- a/ios_pod/swift_headers/FirebaseRemoteConfigSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseRemoteConfigSwift-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
 // clang-1316.0.20.8)
diff --git a/ios_pod/swift_headers/FirebaseSharedSwift-Swift.h b/ios_pod/swift_headers/FirebaseSharedSwift-Swift.h
index df7978fd00..1d745a30aa 100644
--- a/ios_pod/swift_headers/FirebaseSharedSwift-Swift.h
+++ b/ios_pod/swift_headers/FirebaseSharedSwift-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
 // clang-1316.0.20.8)
diff --git a/ios_pod/swift_headers/FirebaseStorage-Swift.h b/ios_pod/swift_headers/FirebaseStorage-Swift.h
index 3a24d43f41..ed880f91ca 100644
--- a/ios_pod/swift_headers/FirebaseStorage-Swift.h
+++ b/ios_pod/swift_headers/FirebaseStorage-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62 clang-1316.0.20.8)
 #ifndef FIREBASESTORAGE_SWIFT_H
diff --git a/ios_pod/swift_headers/SwiftProtobuf-Swift.h b/ios_pod/swift_headers/SwiftProtobuf-Swift.h
index 0e02a6606f..76963811eb 100644
--- a/ios_pod/swift_headers/SwiftProtobuf-Swift.h
+++ b/ios_pod/swift_headers/SwiftProtobuf-Swift.h
@@ -1,5 +1,5 @@
 // Copyright 2022 Google LLC
-// Copied from Firebase iOS SDK 9.1.0.
+// Copied from Firebase iOS SDK 9.2.0.
 
 // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62
 // clang-1316.0.20.8)
diff --git a/messaging/integration_test/Podfile b/messaging/integration_test/Podfile
index 8443485695..d120a21c50 100644
--- a/messaging/integration_test/Podfile
+++ b/messaging/integration_test/Podfile
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/Messaging', '9.1.0'
+  pod 'Firebase/Messaging', '9.2.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Messaging', '9.1.0'
+  pod 'Firebase/Messaging', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
index 3612c95164..809924af91 100644
--- a/release_build_files/readme.md
+++ b/release_build_files/readme.md
@@ -216,46 +216,46 @@ Feature                    | Required Frameworks and Cocoapods
 -------------------------- | ---------------------------------------
 Firebase AdMob             | firebase_admob.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Analytics Cocoapod (9.1.0)
+|                          | Firebase/Analytics Cocoapod (9.2.0)
 |                          | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk2)
 Firebase Analytics         | firebase_analytics.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Analytics Cocoapod (9.1.0)
+|                          | Firebase/Analytics Cocoapod (9.2.0)
 Firebase Authentication    | firebase_auth.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Auth Cocoapod (9.1.0)
+|                          | Firebase/Auth Cocoapod (9.2.0)
 Firebase Dynamic Links     | firebase_dynamic_links.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/DynamicLinks Cocoapod (9.1.0)
+|                          | Firebase/DynamicLinks Cocoapod (9.2.0)
 Cloud Firestore            | firebase_firestore.xcframework
 |                          | firebase_auth.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Firestore Cocoapod (9.1.0)
-|                          | Firebase/Auth Cocoapod (9.1.0)
+|                          | Firebase/Firestore Cocoapod (9.2.0)
+|                          | Firebase/Auth Cocoapod (9.2.0)
 Firebase Functions         | firebase_functions.xcframework
 |                          | firebase_auth.xcframework (optional)
 |                          | firebase.xcframework
-|                          | Firebase/Functions Cocoapod (9.1.0)
-|                          | Firebase/Auth Cocoapod (9.1.0)
+|                          | Firebase/Functions Cocoapod (9.2.0)
+|                          | Firebase/Auth Cocoapod (9.2.0)
 Firebase Installations     | firebase_installations.xcframework
 |                          | firebase.xcframework
-|                          | FirebaseInstallations Cocoapod (9.1.0)
+|                          | FirebaseInstallations Cocoapod (9.2.0)
 Firebase Cloud Messaging   | firebase_messaging.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Messaging Cocoapod (9.1.0)
+|                          | Firebase/Messaging Cocoapod (9.2.0)
 Firebase Realtime Database | firebase_database.xcframework
 |                          | firebase_auth.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Database Cocoapod (9.1.0)
-|                          | Firebase/Auth Cocoapod (9.1.0)
+|                          | Firebase/Database Cocoapod (9.2.0)
+|                          | Firebase/Auth Cocoapod (9.2.0)
 Firebase Remote Config     | firebase_remote_config.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/RemoteConfig Cocoapod (9.1.0)
+|                          | Firebase/RemoteConfig Cocoapod (9.2.0)
 Firebase Storage           | firebase_storage.xcframework
 |                          | firebase_auth.xcframework
 |                          | firebase.xcframework
-|                          | Firebase/Storage Cocoapod (9.1.0)
-|                          | Firebase/Auth Cocoapod (9.1.0)
+|                          | Firebase/Storage Cocoapod (9.2.0)
+|                          | Firebase/Auth Cocoapod (9.2.0)
 
 Important: Each version of the Firebase C++ SDK supports a specific version of
 the Firebase iOS SDK. Please ensure that you reference the Cocoapod versions
@@ -280,46 +280,46 @@ Feature                    | Required Libraries and Cocoapods
 -------------------------- | -----------------------------------------
 Firebase AdMob             | libfirebase_admob.a
 |                          | libfirebase_app.a
-|                          | Firebase/Analytics Cocoapod (9.1.0)
+|                          | Firebase/Analytics Cocoapod (9.2.0)
 |                          | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk2)
 Firebase Analytics         | libfirebase_analytics.a
 |                          | libfirebase_app.a
-|                          | Firebase/Analytics Cocoapod (9.1.0)
+|                          | Firebase/Analytics Cocoapod (9.2.0)
 Firebase Authentication    | libfirebase_auth.a
 |                          | libfirebase_app.a
-|                          | Firebase/Auth Cocoapod (9.1.0)
+|                          | Firebase/Auth Cocoapod (9.2.0)
 Firebase Dynamic Links     | libfirebase_dynamic_links.a
 |                          | libfirebase_app.a
-|                          | Firebase/DynamicLinks Cocoapod (9.1.0)
+|                          | Firebase/DynamicLinks Cocoapod (9.2.0)
 Cloud Firestore            | libfirebase_firestore.a
 |                          | libfirebase_app.a
 |                          | libfirebase_auth.a
-|                          | Firebase/Firestore Cocoapod (9.1.0)
-|                          | Firebase/Auth Cocoapod (9.1.0)
+|                          | Firebase/Firestore Cocoapod (9.2.0)
+|                          | Firebase/Auth Cocoapod (9.2.0)
 Firebase Functions         | libfirebase_functions.a
 |                          | libfirebase_app.a
 |                          | libfirebase_auth.a (optional)
-|                          | Firebase/Functions Cocoapod (9.1.0)
-|                          | Firebase/Auth Cocoapod (9.1.0)
+|                          | Firebase/Functions Cocoapod (9.2.0)
+|                          | Firebase/Auth Cocoapod (9.2.0)
 Firebase Installations     | libfirebase_installations.a
 |                          | libfirebase_app.a
-|                          | FirebaseInstallations Cocoapod (9.1.0)
+|                          | FirebaseInstallations Cocoapod (9.2.0)
 Firebase Cloud Messaging   | libfirebase_messaging.a
 |                          | libfirebase_app.a
-|                          | Firebase/CloudMessaging Cocoapod (9.1.0)
+|                          | Firebase/CloudMessaging Cocoapod (9.2.0)
 Firebase Realtime Database | libfirebase_database.a
 |                          | libfirebase_app.a
 |                          | libfirebase_auth.a
-|                          | Firebase/Database Cocoapod (9.1.0)
-|                          | Firebase/Auth Cocoapod (9.1.0)
+|                          | Firebase/Database Cocoapod (9.2.0)
+|                          | Firebase/Auth Cocoapod (9.2.0)
 Firebase Remote Config     | libfirebase_remote_config.a
 |                          | libfirebase_app.a
-|                          | Firebase/RemoteConfig Cocoapod (9.1.0)
+|                          | Firebase/RemoteConfig Cocoapod (9.2.0)
 Firebase Storage           | libfirebase_storage.a
 |                          | libfirebase_app.a
 |                          | libfirebase_auth.a
-|                          | Firebase/Storage Cocoapod (9.1.0)
-|                          | Firebase/Auth Cocoapod (9.1.0)
+|                          | Firebase/Storage Cocoapod (9.2.0)
+|                          | Firebase/Auth Cocoapod (9.2.0)
 
 Important: Each version of the Firebase C++ SDK supports a specific version of
 the Firebase iOS SDK. Please ensure that you reference the Cocoapod versions
diff --git a/remote_config/integration_test/Podfile b/remote_config/integration_test/Podfile
index e0e1c1916d..4b99581faf 100644
--- a/remote_config/integration_test/Podfile
+++ b/remote_config/integration_test/Podfile
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/RemoteConfig', '9.1.0'
+  pod 'Firebase/RemoteConfig', '9.2.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/RemoteConfig', '9.1.0'
+  pod 'Firebase/RemoteConfig', '9.2.0'
 end
 
 post_install do |installer|
diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile
index 6a6a445c7c..11ba18b0c5 100644
--- a/storage/integration_test/Podfile
+++ b/storage/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '10.0'
-  pod 'Firebase/Storage', '9.1.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Storage', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Storage', '9.1.0'
-  pod 'Firebase/Auth', '9.1.0'
+  pod 'Firebase/Storage', '9.2.0'
+  pod 'Firebase/Auth', '9.2.0'
 end
 
 post_install do |installer|

From 1fcbbebb90cd4f69992ba69066a86fdfcbec362a Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Wed, 22 Jun 2022 16:38:40 -0400
Subject: [PATCH 24/24] remove pinned firebase-ios-sdk commit

---
 cmake/external/firestore.cmake | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 1e97b02495..8d105c196a 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -28,9 +28,7 @@ function(GetReleasedDep)
     firestore
 
     DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
-    GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git"
-    # Pinned HEAD commit as of June 01, 2022 @ 10:51 EDT.
-    GIT_TAG 89c38d1ed908dbc10d5f9f7aded4cf271113773f
+    URL https://github.com/firebase/firebase-ios-sdk/archive/${version}.tar.gz
 
     PREFIX ${PROJECT_BINARY_DIR}