Merge branch 'main' into ump_retry_form_timeout

firebase · Oct 19, 2023 · e72a756 · e72a756
2 parents 6988651 + 3a28fa3
commit e72a756
Show file tree

Hide file tree

Showing 32 changed files with 256 additions and 250 deletions.
diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile
@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Analytics', '10.15.0'
+  pod 'Firebase/Analytics', '10.16.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Analytics', '10.15.0'
+  pod 'Firebase/Analytics', '10.16.0'
 end
 
 post_install do |installer|

diff --git a/analytics/ios_headers/FIREventNames.h b/analytics/ios_headers/FIREventNames.h
@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.15.0.
+// Copied from Firebase Analytics iOS SDK 10.16.0.
 
 /// @file FIREventNames.h
 ///

diff --git a/analytics/ios_headers/FIRParameterNames.h b/analytics/ios_headers/FIRParameterNames.h
@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.15.0.
+// Copied from Firebase Analytics iOS SDK 10.16.0.
 
 /// @file FIRParameterNames.h
 ///

diff --git a/analytics/ios_headers/FIRUserPropertyNames.h b/analytics/ios_headers/FIRUserPropertyNames.h
@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.15.0.
+// Copied from Firebase Analytics iOS SDK 10.16.0.
 
 /// @file FIRUserPropertyNames.h
 ///

diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '11.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '10.15.0'
+  pod 'Firebase/Analytics', '10.16.0'
 end
 
 post_install do |installer|

diff --git a/app_check/CMakeLists.txt b/app_check/CMakeLists.txt
@@ -182,6 +182,8 @@ elseif(IOS)
     POD_NAMES
       FirebaseCore
       FirebaseAppCheck
+      FirebaseAppCheckInterop
+      INCLUDE_PRIVATE_HEADERS
   )
 
   if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")

diff --git a/app_check/integration_test/Podfile b/app_check/integration_test/Podfile
@@ -4,20 +4,20 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/AppCheck', '10.15.0'
-  pod 'Firebase/Database', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
-  pod 'Firebase/Storage', '10.15.0'
-  pod 'Firebase/Functions', '10.15.0'
+  pod 'Firebase/AppCheck', '10.16.0'
+  pod 'Firebase/Database', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
+  pod 'Firebase/Storage', '10.16.0'
+  pod 'Firebase/Functions', '10.16.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/AppCheck', '10.15.0'
-  pod 'Firebase/Database', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
-  pod 'Firebase/Storage', '10.15.0'
-  pod 'Firebase/Functions', '10.15.0'
+  pod 'Firebase/AppCheck', '10.16.0'
+  pod 'Firebase/Database', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
+  pod 'Firebase/Storage', '10.16.0'
+  pod 'Firebase/Functions', '10.16.0'
 end
 
 post_install do |installer|

diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Auth', '10.16.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Auth', '10.16.0'
 end
 
 post_install do |installer|

diff --git 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-10.15.0)
+set(version CocoaPods-10.16.0)
 
 function(GetReleasedDep)
   message("Getting released firebase-ios-sdk @ ${version}")

diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Database', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Database', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Database', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Database', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
 end
 
 post_install do |installer|

diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '11.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/DynamicLinks', '10.15.0'
+  pod 'Firebase/DynamicLinks', '10.16.0'
 end
 
 post_install do |installer|

diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Firestore', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Firestore', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Firestore', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Firestore', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
 end
 
 post_install do |installer|

diff --git 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, '11.0'
-  pod 'Firebase/Firestore', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Firestore', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Firestore', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Firestore', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
 end
 
 post_install do |installer|

diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Functions', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Functions', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Functions', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Functions', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
 end
 
 post_install do |installer|

diff --git a/gma/integration_test/Podfile b/gma/integration_test/Podfile
@@ -4,8 +4,8 @@ platform :ios, '11.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/CoreOnly', '10.15.0'
-  pod 'Google-Mobile-Ads-SDK', '10.10.0'
+  pod 'Firebase/CoreOnly', '10.16.0'
+  pod 'Google-Mobile-Ads-SDK', '10.12.0'
   pod 'GoogleUserMessagingPlatform', '2.1.0'
 end
 

diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile
@@ -4,8 +4,8 @@ platform :ios, '11.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '10.15.0'
-  pod 'Firebase/Installations', '10.15.0'
+  pod 'Firebase/Analytics', '10.16.0'
+  pod 'Firebase/Installations', '10.16.0'
 end
 
 post_install do |installer|

diff --git a/ios_pod/Podfile b/ios_pod/Podfile
@@ -3,21 +3,27 @@ platform :ios, '11.0'
 use_frameworks!
 
 target 'GetPods' do
-  pod 'Firebase/Core', '10.15.0'
+  pod 'Firebase/Core', '10.16.0'
 
-  pod 'Google-Mobile-Ads-SDK', '10.10.0'
+  pod 'Google-Mobile-Ads-SDK', '10.12.0'
   pod 'GoogleUserMessagingPlatform', '2.1.0'
-  pod 'Firebase/Analytics', '10.15.0'
-  pod 'Firebase/AppCheck', '10.15.0'
-  pod 'Firebase/Auth', '10.15.0'
-  pod 'Firebase/Crashlytics', '10.15.0'
-  pod 'Firebase/Database', '10.15.0'
-  pod 'Firebase/DynamicLinks', '10.15.0'
-  pod 'Firebase/Firestore', '10.15.0'
-  pod 'Firebase/Functions', '10.15.0'
-  pod 'Firebase/Installations', '10.15.0'
-  pod 'Firebase/Messaging', '10.15.0'
-  pod 'Firebase/RemoteConfig', '10.15.0'
-  pod 'Firebase/Storage', '10.15.0'
+  pod 'Firebase/Analytics', '10.16.0'
+  pod 'Firebase/AppCheck', '10.16.0'
+  pod 'Firebase/Auth', '10.16.0'
+  pod 'Firebase/Crashlytics', '10.16.0'
+  pod 'Firebase/Database', '10.16.0'
+  pod 'Firebase/DynamicLinks', '10.16.0'
+  pod 'Firebase/Firestore', '10.16.0'
+  pod 'Firebase/Functions', '10.16.0'
+  pod 'Firebase/Installations', '10.16.0'
+  pod 'Firebase/Messaging', '10.16.0'
+  pod 'Firebase/RemoteConfig', '10.16.0'
+  pod 'Firebase/Storage', '10.16.0'
 
 end
+
+post_install do |installer|
+  # Patch FirebaseAppCheck 10.16.0 header to replace @import with #import.
+  # TODO (b/304327855): Remove when iOS SDK 10.17.0 is released.
+  system("sed '-i~' 's%^@import FirebaseAppCheckInterop;%#import \"FirebaseAppCheck/Interop/FIRAppCheckInterop.h\"\\n#import \"FirebaseAppCheck/Interop/FIRAppCheckProtocol.h\"\\n#import \"FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h\"%' Pods/FirebaseAppCheck/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h")
+end
diff --git a/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h b/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h
@@ -1,7 +1,7 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
 // Copyright 2023 Google LLC
-// Copied from Firebase iOS SDK 10.15.0.
+// Copied from Firebase iOS SDK 10.16.0.
 
 // Generated by Apple Swift version 5.7.1 (swiftlang-5.7.1.135.3
 // clang-1400.0.29.51)
@@ -267,12 +267,12 @@ using UInt = size_t;
 #if __has_attribute(external_source_symbol)
 #pragma push_macro("any")
 #undef any
-#pragma clang attribute push(                                              \
-        __attribute__((external_source_symbol(                             \
-                language = "Swift", defined_in = "FirebaseAnalyticsSwift", \
-                    generated_declaration))),                              \
-            apply_to = any(function, enum, objc_interface, objc_category,  \
-                               objc_protocol))
+#pragma clang attribute push(                                      \
+    __attribute__((external_source_symbol(                         \
+        language = "Swift", defined_in = "FirebaseAnalyticsSwift", \
+        generated_declaration))),                                  \
+    apply_to =                                                     \
+        any(function, enum, objc_interface, objc_category, objc_protocol))
 #pragma pop_macro("any")
 #endif
 
@@ -288,7 +288,7 @@ using UInt = size_t;
 
 #elif defined(__x86_64__) && __x86_64__
 // Copyright 2023 Google LLC
-// Copied from Firebase iOS SDK 10.15.0.
+// Copied from Firebase iOS SDK 10.16.0.
 
 // Generated by Apple Swift version 5.7.1 (swiftlang-5.7.1.135.3
 // clang-1400.0.29.51)
@@ -554,12 +554,12 @@ using UInt = size_t;
 #if __has_attribute(external_source_symbol)
 #pragma push_macro("any")
 #undef any
-#pragma clang attribute push(                                              \
-        __attribute__((external_source_symbol(                             \
-                language = "Swift", defined_in = "FirebaseAnalyticsSwift", \
-                    generated_declaration))),                              \
-            apply_to = any(function, enum, objc_interface, objc_category,  \
-                               objc_protocol))
+#pragma clang attribute push(                                      \
+    __attribute__((external_source_symbol(                         \
+        language = "Swift", defined_in = "FirebaseAnalyticsSwift", \
+        generated_declaration))),                                  \
+    apply_to =                                                     \
+        any(function, enum, objc_interface, objc_category, objc_protocol))
 #pragma pop_macro("any")
 #endif
 

diff --git a/ios_pod/swift_headers/FirebaseCoreInternal-Swift.h b/ios_pod/swift_headers/FirebaseCoreInternal-Swift.h
@@ -1,7 +1,7 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
 // Copyright 2023 Google LLC
-// Copied from Firebase iOS SDK 10.15.0.
+// Copied from Firebase iOS SDK 10.16.0.
 
 // Generated by Apple Swift version 5.7.1 (swiftlang-5.7.1.135.3
 // clang-1400.0.29.51)
@@ -268,12 +268,12 @@ using UInt = size_t;
 #if __has_attribute(external_source_symbol)
 #pragma push_macro("any")
 #undef any
-#pragma clang attribute push(                                             \
-        __attribute__((external_source_symbol(                            \
-                language = "Swift", defined_in = "FirebaseCoreInternal",  \
-                    generated_declaration))),                             \
-            apply_to = any(function, enum, objc_interface, objc_category, \
-                               objc_protocol))
+#pragma clang attribute push(                                                  \
+    __attribute__((external_source_symbol(language = "Swift",                  \
+                                          defined_in = "FirebaseCoreInternal", \
+                                          generated_declaration))),            \
+    apply_to =                                                                 \
+        any(function, enum, objc_interface, objc_category, objc_protocol))
 #pragma pop_macro("any")
 #endif
 
@@ -345,7 +345,7 @@ SWIFT_CLASS_NAMED("_ObjC_HeartbeatsPayload")
 
 #elif defined(__x86_64__) && __x86_64__
 // Copyright 2023 Google LLC
-// Copied from Firebase iOS SDK 10.15.0.
+// Copied from Firebase iOS SDK 10.16.0.
 
 // Generated by Apple Swift version 5.7.1 (swiftlang-5.7.1.135.3
 // clang-1400.0.29.51)
@@ -612,12 +612,12 @@ using UInt = size_t;
 #if __has_attribute(external_source_symbol)
 #pragma push_macro("any")
 #undef any
-#pragma clang attribute push(                                             \
-        __attribute__((external_source_symbol(                            \
-                language = "Swift", defined_in = "FirebaseCoreInternal",  \
-                    generated_declaration))),                             \
-            apply_to = any(function, enum, objc_interface, objc_category, \
-                               objc_protocol))
+#pragma clang attribute push(                                                  \
+    __attribute__((external_source_symbol(language = "Swift",                  \
+                                          defined_in = "FirebaseCoreInternal", \
+                                          generated_declaration))),            \
+    apply_to =                                                                 \
+        any(function, enum, objc_interface, objc_category, objc_protocol))
 #pragma pop_macro("any")
 #endif