Merge d9e6ec7 into 939a521

firebase · Mar 15, 2024 · 1582fb9 · 1582fb9
2 parents 939a521 + d9e6ec7
commit 1582fb9
Show file tree

Hide file tree

Showing 93 changed files with 68,350 additions and 63,997 deletions.
diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
@@ -328,7 +328,7 @@ jobs:
 
     strategy:
       matrix:
-        target: [iOS, tvOS, macOS]
+        target: [iOS, macOS, tvOS]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -160,6 +160,10 @@ unset(RANDOM_FILE CACHE)
 set(CARES_INSTALL OFF CACHE BOOL "Disabled")
 
 set(protobuf_BUILD_TESTS OFF CACHE BOOL "Disabled")
+# See https://github.com/protocolbuffers/protobuf/issues/12185#issuecomment-1887892723
+set(protobuf_INSTALL OFF)
+set(utf8_range_ENABLE_INSTALL OFF)
+
 if(IOS OR ANDROID)
   # C-Ares includes a number of example binaries (e.g. `ahost`) that fail to
   # build when compiling for non-host targets.
@@ -207,17 +211,6 @@ set(PROTOBUF_ROOT_DIR ${FIREBASE_EXTERNAL_SOURCE_DIR}/protobuf)
 
 add_external_subdirectory(grpc)
 
-
-# Fix up targets included by gRPC
-if(CXX_CLANG)
-  target_compile_options(
-    absl_time_zone PRIVATE
-    -Wno-unused-template
-    -Wno-shadow
-    -Wno-tautological-type-limit-compare
-  )
-endif()
-
 # Fix up targets included by boringssl (ver: b9232f9e27e5668bc0414879dcdedb2a59ea75f2)
 # We might be able to remove this with newer versions.
 if(CXX_CLANG)

diff --git a/Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Example_iOS.xcscheme b/Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Example_iOS.xcscheme
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6003F589195388D20070C39A"
+            BuildableName = "Firestore_Example_iOS.app"
+            BlueprintName = "Firestore_Example_iOS"
+            ReferencedContainer = "container:Firestore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -59,17 +68,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6003F589195388D20070C39A"
-            BuildableName = "Firestore_Example_iOS.app"
-            BlueprintName = "Firestore_Example_iOS"
-            ReferencedContainer = "container:Firestore.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -91,8 +89,6 @@
             ReferencedContainer = "container:Firestore.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/...store/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Example_macOS.xcscheme b/...store/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Example_macOS.xcscheme
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DAFF0CF421E64AC30062958F"
+            BuildableName = "Firestore_Example_macOS.app"
+            BlueprintName = "Firestore_Example_macOS"
+            ReferencedContainer = "container:Firestore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -49,17 +58,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DAFF0CF421E64AC30062958F"
-            BuildableName = "Firestore_Example_macOS.app"
-            BlueprintName = "Firestore_Example_macOS"
-            ReferencedContainer = "container:Firestore.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -81,8 +79,6 @@
             ReferencedContainer = "container:Firestore.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Example_tvOS.xcscheme b/Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Example_tvOS.xcscheme
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "54AA338E224BF935006CE580"
+            BuildableName = "Firestore_Example_tvOS.app"
+            BlueprintName = "Firestore_Example_tvOS"
+            ReferencedContainer = "container:Firestore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -49,17 +58,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "54AA338E224BF935006CE580"
-            BuildableName = "Firestore_Example_tvOS.app"
-            BlueprintName = "Firestore_Example_tvOS"
-            ReferencedContainer = "container:Firestore.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -81,8 +79,6 @@
             ReferencedContainer = "container:Firestore.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile
@@ -99,6 +99,8 @@ if is_platform(:ios)
 
     configure_local_pods()
 
+    pod 'abseil', '~> 1.20240116.1'
+
     target 'Firestore_Tests_iOS' do
       inherit! :search_paths
 
@@ -141,6 +143,8 @@ if is_platform(:osx)
 
     configure_local_pods()
 
+    pod 'abseil', '~> 1.20240116.1'
+
     target 'Firestore_Tests_macOS' do
       inherit! :search_paths
 
@@ -170,6 +174,8 @@ if is_platform(:tvos)
 
     configure_local_pods()
 
+    pod 'abseil', '~> 1.20240116.1'
+
     target 'Firestore_Tests_tvOS' do
       inherit! :search_paths
 

diff --git a/Firestore/Example/ProtobufCpp.podspec b/Firestore/Example/ProtobufCpp.podspec
@@ -17,7 +17,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ProtobufCpp'
-  s.version          = '3.11.4'
+  s.version          = '25.0'
   s.summary          = 'Protocol Buffers v.3 runtime library for C++.'
   s.homepage         = 'https://github.com/protocolbuffers/protobuf'
   s.license          = '3-Clause BSD License'
@@ -33,7 +33,9 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.13'
   s.tvos.deployment_target = '12.0'
 
-  s.source_files = 'src/**/*.{h,cc,inc}'
+  s.source_files = 'src/**/*.{h,cc,inc}',
+                   # utf8_range is needed too, to avoid build errors.
+                   'third_party/utf8_range/*.{h,cc,inc}'
   s.exclude_files = # skip test files. (Yes, the test files are intermixed with
                     # the source. No there doesn't seem to be a common/simple
                     # pattern we could use to exclude them; 'test' appears in
@@ -46,20 +48,26 @@ Pod::Spec.new do |s|
                     'src/**/*[^y]test*.*',
                     'src/**/testing/**',
                     'src/**/mock*',
+                    'third_party/utf8_range/*_test.{h,cc,inc}',
+                    # skip benchmark code that failed to compile.
+                    'src/**/map_probe_benchmark.cc',
                     # skip the javascript handling code.
                     'src/**/js/**',
                     # skip the protoc compiler
                     'src/google/protobuf/compiler/**/*'
 
   s.header_mappings_dir = 'src/'
 
+  s.dependency 'abseil', '~> 1.20240116.1'
+
   # Set a CPP symbol so the code knows to use framework imports.
   s.pod_target_xcconfig = {
+    'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14',
     'GCC_PREPROCESSOR_DEFINITIONS' =>
       '$(inherited) ' +
       'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ' +
       'HAVE_PTHREAD=1',
-    'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/ProtobufCpp/src"',
+    'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/ProtobufCpp/src" "${PODS_ROOT}/ProtobufCpp/third_party/utf8_range"',
 
     # Cocoapods flattens header imports, leading to much anguish.  The
     # following two statements work around this.