Update iOS dependencies - Tue Jul 30 2024 (#1631)

* Update iOS dependencies - Tue Jul 30 2024 ### iOS - Firebase/Analytics → 11.0.0 - Firebase/AppCheck → 11.0.0 - Firebase/Auth → 11.0.0 - Firebase/Core → 11.0.0 - Firebase/CoreOnly → 11.0.0 - Firebase/Crashlytics → 11.0.0 - Firebase/Database → 11.0.0 - Firebase/DynamicLinks → 11.0.0 - Firebase/Firestore → 11.0.0 - Firebase/Functions → 11.0.0 - Firebase/Installations → 11.0.0 - Firebase/Messaging → 11.0.0 - Firebase/RemoteConfig → 11.0.0 - Firebase/Storage → 11.0.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/10168827736). * Fixes for Auth * Fix Firestore, and format files * File formatting * Update integration_test tvOS target * Fix Firestore internal test deployment target * Fix OAuth sign-in not disabling tvOS correctly --------- Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: a-maurice <amaurice@google.com>
firebase · Aug 2, 2024 · bb8ee5d · bb8ee5d
1 parent 5363013
commit bb8ee5d
Show file tree

Hide file tree

Showing 54 changed files with 6,379 additions and 195 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, '13.0'
-  pod 'Firebase/Analytics', '10.28.1'
+  pod 'Firebase/Analytics', '11.0.0'
 end
 
 target 'integration_test_tvos' do
-  platform :tvos, '12.0'
-  pod 'Firebase/Analytics', '10.28.1'
+  platform :tvos, '13.0'
+  pod 'Firebase/Analytics', '11.0.0'
 end
 
 post_install do |installer|

diff --git a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -565,7 +565,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.3;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Debug;
 		};
@@ -616,7 +616,7 @@
 				SDKROOT = appletvos;
 				SWIFT_VERSION = 5.3;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Release;
 		};

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

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

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

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

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, '13.0'
-  pod 'Firebase/AppCheck', '10.28.1'
-  pod 'Firebase/Database', '10.28.1'
-  pod 'Firebase/Auth', '10.28.1'
-  pod 'Firebase/Storage', '10.28.1'
-  pod 'Firebase/Functions', '10.28.1'
+  pod 'Firebase/AppCheck', '11.0.0'
+  pod 'Firebase/Database', '11.0.0'
+  pod 'Firebase/Auth', '11.0.0'
+  pod 'Firebase/Storage', '11.0.0'
+  pod 'Firebase/Functions', '11.0.0'
 end
 
 target 'integration_test_tvos' do
-  platform :tvos, '12.0'
-  pod 'Firebase/AppCheck', '10.28.1'
-  pod 'Firebase/Database', '10.28.1'
-  pod 'Firebase/Auth', '10.28.1'
-  pod 'Firebase/Storage', '10.28.1'
-  pod 'Firebase/Functions', '10.28.1'
+  platform :tvos, '13.0'
+  pod 'Firebase/AppCheck', '11.0.0'
+  pod 'Firebase/Database', '11.0.0'
+  pod 'Firebase/Auth', '11.0.0'
+  pod 'Firebase/Storage', '11.0.0'
+  pod 'Firebase/Functions', '11.0.0'
 end
 
 post_install do |installer|

diff --git a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -514,7 +514,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.3;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Debug;
 		};
@@ -565,7 +565,7 @@
 				SDKROOT = appletvos;
 				SWIFT_VERSION = 5.3;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Release;
 		};

diff --git a/auth/CMakeLists.txt b/auth/CMakeLists.txt
@@ -174,6 +174,7 @@ target_include_directories(firebase_auth
     ${CMAKE_CURRENT_LIST_DIR}/src/include
   PRIVATE
     ${FIREBASE_CPP_SDK_ROOT_DIR}
+    ${FIREBASE_CPP_SDK_ROOT_DIR}/ios_pod/swift_headers
     ${additional_include_DIR}
 )
 target_compile_definitions(firebase_auth
@@ -201,6 +202,7 @@ elseif(IOS)
     POD_NAMES
       FirebaseCore
       FirebaseAuth
+      FirebaseAuthInterop/FirebaseAuth/Interop
   )
   if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")
     set_target_properties(firebase_auth PROPERTIES

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, '13.0'
-  pod 'Firebase/Auth', '10.28.1'
+  pod 'Firebase/Auth', '11.0.0'
 end
 
 target 'integration_test_tvos' do
-  platform :tvos, '12.0'
-  pod 'Firebase/Auth', '10.28.1'
+  platform :tvos, '13.0'
+  pod 'Firebase/Auth', '11.0.0'
 end
 
 post_install do |installer|

diff --git a/auth/integration_test/integration_test.xcodeproj/project.pbxproj b/auth/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -592,7 +592,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.3;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Debug;
 		};
@@ -643,7 +643,7 @@
 				SDKROOT = appletvos;
 				SWIFT_VERSION = 5.3;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Release;
 		};

diff --git a/auth/src/ios/auth_ios.mm b/auth/src/ios/auth_ios.mm
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-#import "FIRAdditionalUserInfo.h"
-#import "FIRAuthDataResult.h"
+#import <UIKit/UIKit.h>
+
 #import "FIRAuthErrors.h"
-#import "FIROAuthCredential.h"
 #import "FIROptions.h"
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
+// This needs to be after the FIRAuthInterop import
+#import "FirebaseAuth-Swift.h"
 
 #include "app/src/app_ios.h"
 #include "app/src/assert.h"

diff --git a/auth/src/ios/common_ios.h b/auth/src/ios/common_ios.h
@@ -18,13 +18,13 @@
 #define FIREBASE_AUTH_SRC_IOS_COMMON_IOS_H_
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 #import "FIRAuth.h"
-#import "FIRAuthCredential.h"
-#import "FIROAuthProvider.h"
 #import "FIRUser.h"
-#import "FIRUserInfo.h"
-#import "FIRUserMetadata.h"
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
+// This needs to be after the FIRAuthInterop import
+#import "FirebaseAuth-Swift.h"
 
 #include "app/src/log.h"
 #include "app/src/util_ios.h"

diff --git a/auth/src/ios/credential_ios.mm b/auth/src/ios/credential_ios.mm
@@ -19,14 +19,17 @@
 #include "auth/src/ios/common_ios.h"
 
 #import <GameKit/GameKit.h>
+#import <UIKit/UIKit.h>
 
 #import "FIREmailAuthProvider.h"
 #import "FIRFacebookAuthProvider.h"
 #import "FIRFederatedAuthProvider.h"
 #import "FIRGameCenterAuthProvider.h"
 #import "FIRGitHubAuthProvider.h"
 #import "FIRGoogleAuthProvider.h"
-#import "FIROAuthProvider.h"
+#import "FirebaseAuthInterop/FIRAuthInterop.h"
+// This needs to be after the FIRAuthInterop import
+#import "FirebaseAuth-Swift.h"
 
 #if FIREBASE_PLATFORM_IOS
 // PhoneAuth is not supported on non-iOS Apple platforms (eg: tvOS).
@@ -442,6 +445,7 @@ explicit PhoneAuthProviderData(FIRPhoneAuthProvider* objc_provider)
   assert(auth_data);
   ReferenceCountedFutureImpl& futures = auth_data->future_impl;
   const auto handle = futures.SafeAlloc<AuthResult>(kAuthFn_SignInWithProvider, AuthResult());
+#if FIREBASE_PLATFORM_IOS
   FIROAuthProvider* ios_provider = (FIROAuthProvider*)[FIROAuthProvider
       providerWithProviderID:@(provider_data_.provider_id.c_str())
                         auth:AuthImpl(auth_data)];
@@ -462,6 +466,12 @@ explicit PhoneAuthProviderData(FIRPhoneAuthProvider* objc_provider)
                                AuthResult());
     return future;
   }
+
+#else   // non-iOS Apple platforms (eg: tvOS)
+  Future<AuthResult> future = MakeFuture(&futures, handle);
+  futures.Complete(handle, kAuthErrorApiNotAvailable,
+                   "OAuth provider sign-in is not supported on non-iOS Apple platforms.");
+#endif  // FIREBASE_PLATFORM_IOS
 }
 
 Future<AuthResult> FederatedOAuthProvider::Link(AuthData* auth_data) {

diff --git a/auth/src/ios/user_ios.mm b/auth/src/ios/user_ios.mm
@@ -17,10 +17,6 @@
 #include "app/src/time.h"
 #include "auth/src/ios/common_ios.h"
 
-#if FIREBASE_PLATFORM_IOS
-#import "FIRPhoneAuthCredential.h"
-#endif
-
 namespace firebase {
 namespace auth {
 

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

diff --git a/cmake/toolchains/apple.toolchain.cmake b/cmake/toolchains/apple.toolchain.cmake
@@ -257,7 +257,7 @@ if(NOT DEFINED DEPLOYMENT_TARGET)
     set(DEPLOYMENT_TARGET "13.0")
   else()
     # Unless specified, SDK version 11.0 is used by default as minimum target version (iOS, tvOS).
-    set(DEPLOYMENT_TARGET "11.0")
+    set(DEPLOYMENT_TARGET "13.0")
   endif()
   message(STATUS "[DEFAULTS] Using the default min-version since DEPLOYMENT_TARGET not provided!")
 elseif(DEFINED DEPLOYMENT_TARGET AND PLATFORM STREQUAL "MAC_CATALYST" AND ${DEPLOYMENT_TARGET} VERSION_LESS "13.0")

diff --git a/cmake/toolchains/ios.cmake b/cmake/toolchains/ios.cmake
@@ -35,7 +35,7 @@ set(CMAKE_OSX_ARCHITECTURES arm64 CACHE STRING "")
 set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
-set(CMAKE_OSX_DEPLOYMENT_TARGET "8.0" CACHE STRING "")
+set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "")
 
 # skip TRY_COMPILE checks
 set(CMAKE_CXX_COMPILER_WORKS TRUE)

diff --git a/cmake/toolchains/ios_simulator.cmake b/cmake/toolchains/ios_simulator.cmake
@@ -17,7 +17,7 @@ set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "")
 set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
-set(CMAKE_OSX_DEPLOYMENT_TARGET "8.0" CACHE STRING "")
+set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "")
 set(IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
 
 # skip TRY_COMPILE checks

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, '13.0'
-  pod 'Firebase/Database', '10.28.1'
-  pod 'Firebase/Auth', '10.28.1'
+  pod 'Firebase/Database', '11.0.0'
+  pod 'Firebase/Auth', '11.0.0'
 end
 
 target 'integration_test_tvos' do
-  platform :tvos, '12.0'
-  pod 'Firebase/Database', '10.28.1'
-  pod 'Firebase/Auth', '10.28.1'
+  platform :tvos, '13.0'
+  pod 'Firebase/Database', '11.0.0'
+  pod 'Firebase/Auth', '11.0.0'
 end
 
 post_install do |installer|

diff --git a/database/integration_test/integration_test.xcodeproj/project.pbxproj b/database/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -514,7 +514,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.3;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Debug;
 		};
@@ -565,7 +565,7 @@
 				SDKROOT = appletvos;
 				SWIFT_VERSION = 5.3;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Release;
 		};

diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile
@@ -5,7 +5,7 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '13.0'
-  pod 'Firebase/DynamicLinks', '10.28.1'
+  pod 'Firebase/DynamicLinks', '11.0.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, '13.0'
-  pod 'Firebase/Firestore', '10.28.1'
-  pod 'Firebase/Auth', '10.28.1'
+  pod 'Firebase/Firestore', '11.0.0'
+  pod 'Firebase/Auth', '11.0.0'
 end
 
 target 'integration_test_tvos' do
-  platform :tvos, '12.0'
-  pod 'Firebase/Firestore', '10.28.1'
-  pod 'Firebase/Auth', '10.28.1'
+  platform :tvos, '13.0'
+  pod 'Firebase/Firestore', '11.0.0'
+  pod 'Firebase/Auth', '11.0.0'
 end
 
 post_install do |installer|

diff --git a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -613,7 +613,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.3;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Debug;
 		};
@@ -667,7 +667,7 @@
 				SDKROOT = appletvos;
 				SWIFT_VERSION = 5.3;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Release;
 		};

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, '13.0'
-  pod 'Firebase/Firestore', '10.28.1'
-  pod 'Firebase/Auth', '10.28.1'
+  pod 'Firebase/Firestore', '11.0.0'
+  pod 'Firebase/Auth', '11.0.0'
 end
 
 target 'integration_test_tvos' do
-  platform :tvos, '12.0'
-  pod 'Firebase/Firestore', '10.28.1'
-  pod 'Firebase/Auth', '10.28.1'
+  platform :tvos, '13.0'
+  pod 'Firebase/Firestore', '11.0.0'
+  pod 'Firebase/Auth', '11.0.0'
 end
 
 post_install do |installer|