From d8455fd9437fc532b7904b115eb9b610d3d5d459 Mon Sep 17 00:00:00 2001 From: firebase-workflow-trigger-bot Date: Mon, 10 Oct 2022 20:32:27 +0000 Subject: [PATCH 1/9] Update iOS dependencies - Mon Oct 10 2022 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### iOS - Firebase/Analytics → 10.0.0 - Firebase/Auth → 10.0.0 - Firebase/Core → 10.0.0 - Firebase/Crashlytics → 10.0.0 - Firebase/Database → 10.0.0 - Firebase/DynamicLinks → 10.0.0 - Firebase/Firestore → 10.0.0 - Firebase/Functions → 10.0.0 - Firebase/Installations → 10.0.0 - Firebase/Messaging → 10.0.0 - Firebase/RemoteConfig → 10.0.0 - Firebase/Storage → 10.0.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/3222063557). --- 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 +-- gma/integration_test/Podfile | 2 +- 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 | 34 ++++++---- ios_pod/swift_headers/SwiftProtobuf-Swift.h | 2 +- messaging/integration_test/Podfile | 4 +- release_build_files/readme.md | 64 +++++++++---------- remote_config/integration_test/Podfile | 4 +- storage/integration_test/Podfile | 8 +-- 31 files changed, 114 insertions(+), 104 deletions(-) diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile index c6e592d0b5..71fe57d6f3 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.6.0' + pod 'Firebase/Analytics', '10.0.0' pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2' end diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile index 3e0596213f..a275f91a79 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.6.0' + pod 'Firebase/Analytics', '10.0.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Analytics', '9.6.0' + pod 'Firebase/Analytics', '10.0.0' end post_install do |installer| diff --git a/analytics/ios_headers/FIREventNames.h b/analytics/ios_headers/FIREventNames.h index a8b79171ef..192f6de1d3 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.6.0. +// Copied from Firebase Analytics iOS SDK 10.0.0. /// @file FIREventNames.h /// diff --git a/analytics/ios_headers/FIRParameterNames.h b/analytics/ios_headers/FIRParameterNames.h index 2edc3b12c5..fb26e3c378 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.6.0. +// Copied from Firebase Analytics iOS SDK 10.0.0. /// @file FIRParameterNames.h /// diff --git a/analytics/ios_headers/FIRUserPropertyNames.h b/analytics/ios_headers/FIRUserPropertyNames.h index c60890a1c4..c43ebe41e5 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.6.0. +// Copied from Firebase Analytics iOS SDK 10.0.0. /// @file FIRUserPropertyNames.h /// diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile index 47fd3ac8ed..d0f86c3f1c 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.6.0' + pod 'Firebase/Analytics', '10.0.0' end post_install do |installer| diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile index ad591c3dfa..5a4937bba0 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.6.0' + pod 'Firebase/Auth', '10.0.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Auth', '10.0.0' end post_install do |installer| diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index ee2b0316ca..45401444b4 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.6.0) +set(version CocoaPods-10.0.0) function(GetReleasedDep) message("Getting released firebase-ios-sdk @ ${version}") diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile index d299592d5c..ce4e9ee1dd 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.6.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Database', '10.0.0' + pod 'Firebase/Auth', '10.0.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Database', '9.6.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Database', '10.0.0' + pod 'Firebase/Auth', '10.0.0' end post_install do |installer| diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile index bbf3761dba..ebd3bde88b 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.6.0' + pod 'Firebase/DynamicLinks', '10.0.0' end post_install do |installer| diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile index 6e74d06aaa..2dbc9f4fe7 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.6.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Firestore', '10.0.0' + pod 'Firebase/Auth', '10.0.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Firestore', '9.6.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Firestore', '10.0.0' + pod 'Firebase/Auth', '10.0.0' end post_install do |installer| diff --git a/firestore/integration_test_internal/Podfile b/firestore/integration_test_internal/Podfile index e32c1b6651..ffa0d77a23 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.6.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Firestore', '10.0.0' + pod 'Firebase/Auth', '10.0.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Firestore', '9.6.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Firestore', '10.0.0' + pod 'Firebase/Auth', '10.0.0' end post_install do |installer| diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile index f25bdb4d7d..754fda5965 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.6.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Functions', '10.0.0' + pod 'Firebase/Auth', '10.0.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Functions', '9.6.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Functions', '10.0.0' + pod 'Firebase/Auth', '10.0.0' end post_install do |installer| diff --git a/gma/integration_test/Podfile b/gma/integration_test/Podfile index dca019a954..221c6e02e1 100644 --- a/gma/integration_test/Podfile +++ b/gma/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' use_frameworks! :linkage => :static target 'integration_test' do - pod 'Firebase/Analytics', '9.6.0' + pod 'Firebase/Analytics', '10.0.0' pod 'Google-Mobile-Ads-SDK', '9.11.0' end diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile index 4b849d89d0..414b56af9d 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.6.0' - pod 'Firebase/Installations', '9.6.0' + pod 'Firebase/Analytics', '10.0.0' + pod 'Firebase/Installations', '10.0.0' end post_install do |installer| diff --git a/ios_pod/Podfile b/ios_pod/Podfile index 2b1e2fdcdf..5beaafad4d 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.6.0' + pod 'Firebase/Core', '10.0.0' pod 'Google-Mobile-Ads-SDK', '9.11.0' - pod 'Firebase/Analytics', '9.6.0' - pod 'Firebase/Auth', '9.6.0' - pod 'Firebase/Crashlytics', '9.6.0' - pod 'Firebase/Database', '9.6.0' - pod 'Firebase/DynamicLinks', '9.6.0' - pod 'Firebase/Firestore', '9.6.0' - pod 'Firebase/Functions', '9.6.0' - pod 'Firebase/Installations', '9.6.0' - pod 'Firebase/Messaging', '9.6.0' - pod 'Firebase/RemoteConfig', '9.6.0' - pod 'Firebase/Storage', '9.6.0' + pod 'Firebase/Analytics', '10.0.0' + pod 'Firebase/Auth', '10.0.0' + pod 'Firebase/Crashlytics', '10.0.0' + pod 'Firebase/Database', '10.0.0' + pod 'Firebase/DynamicLinks', '10.0.0' + pod 'Firebase/Firestore', '10.0.0' + pod 'Firebase/Functions', '10.0.0' + pod 'Firebase/Installations', '10.0.0' + pod 'Firebase/Messaging', '10.0.0' + pod 'Firebase/RemoteConfig', '10.0.0' + pod 'Firebase/Storage', '10.0.0' end diff --git a/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h b/ios_pod/swift_headers/FirebaseAnalyticsSwift-Swift.h index 8e7173a33e..53f2627dbf 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.6.0. +// Copied from Firebase iOS SDK 10.0.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 02caf52c91..76d80aef41 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.6.0. +// Copied from Firebase iOS SDK 10.0.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 1133c176e6..4e297efa4a 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.6.0. +// Copied from Firebase iOS SDK 10.0.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 daa632a2bf..77ec88fe86 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.6.0. +// Copied from Firebase iOS SDK 10.0.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 033a544473..4c057d7084 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.6.0. +// Copied from Firebase iOS SDK 10.0.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 1d8e7a4d62..8cc7b5ca9d 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.6.0. +// Copied from Firebase iOS SDK 10.0.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 c7ab0c65c5..c09263bf6a 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.6.0. +// Copied from Firebase iOS SDK 10.0.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 5fc604c973..651a673bbd 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.6.0. +// Copied from Firebase iOS SDK 10.0.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 bd18624033..7df1505df5 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.6.0. +// Copied from Firebase iOS SDK 10.0.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 bdf5e909d2..47ef116a53 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.6.0. +// Copied from Firebase iOS SDK 10.0.0. // Generated by Apple Swift version 5.6 (swiftlang-5.6.0.323.62 clang-1316.0.20.8) #ifndef FIREBASESTORAGE_SWIFT_H @@ -298,11 +298,12 @@ SWIFT_CLASS_NAMED("Storage") /// returns: /// An instance of StorageReference 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.downloadURL(completion:) or the gs:// -/// URL from StorageReference.description. \param url A gs // or https:// URL to -/// initialize the reference with. +/// Creates a StorageReference given a gs://, http://, or +/// https:// URL pointing to a Firebase Storage location. For example, you can pass in +/// an https:// download URL retrieved from +/// StorageReference.downloadURL(completion:) or the gs:// URL from +/// StorageReference.description. +/// \param url A gs // or https:// URL to initialize the reference with. /// /// /// throws: @@ -328,7 +329,6 @@ SWIFT_CLASS_NAMED("Storage") - (id _Nonnull)copy SWIFT_WARN_UNUSED_RESULT; - (BOOL)isEqual:(id _Nullable)object SWIFT_WARN_UNUSED_RESULT; @property(nonatomic, readonly) NSUInteger hash; -@property(nonatomic, readonly, copy) NSString *_Nonnull description; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end @@ -416,6 +416,10 @@ SWIFT_CLASS_NAMED("StorageDownloadTask") - (void)resume; @end +/// Adds wrappers for common Firebase Storage errors (including creating errors from GCS errors). +/// For more information on unwrapping GCS errors, see the GCS errors docs: +/// https://cloud.google.com/storage/docs/json_api/v1/status-codes +/// This is never publicly exposed to end developers (as they will simply see an NSError). typedef SWIFT_ENUM_NAMED(NSInteger, FIRStorageErrorCode, "StorageErrorCode", open){ FIRStorageErrorCodeUnknown = -13000, FIRStorageErrorCodeObjectNotFound = -13010, @@ -430,6 +434,7 @@ typedef SWIFT_ENUM_NAMED(NSInteger, FIRStorageErrorCode, "StorageErrorCode", ope FIRStorageErrorCodeCancelled = -13040, FIRStorageErrorCodeInvalidArgument = -13050, }; +static NSString *_Nonnull const FIRStorageErrorCodeDomain = @"FirebaseStorage.StorageErrorCode"; /// Contains the prefixes and items returned by a StorageReference.list() call. SWIFT_CLASS_NAMED("StorageListResult") @@ -496,11 +501,12 @@ SWIFT_CLASS_NAMED("StorageMetadata") @property(nonatomic, readonly, copy) NSDate *_Nullable timeCreated; /// The modification time of the object metadata in RFC 3339 format. @property(nonatomic, readonly, copy) NSDate *_Nullable updated; -/// A reference to the object in Firebase Storage. -@property(nonatomic, readonly, strong) FIRStorageReference *_Nullable storageReference; +/// Never used API +@property(nonatomic, readonly, strong) + FIRStorageReference *_Nullable storageReference SWIFT_DEPRECATED; /// Creates a Dictionary from the contents of the metadata. /// @return A Dictionary that represents the contents of the metadata. -- (NSDictionary *_Nonnull)dictionaryRepresentation SWIFT_WARN_UNUSED_RESULT; +- (NSDictionary *_Nonnull)dictionaryRepresentation SWIFT_WARN_UNUSED_RESULT; /// Determines if the current metadata represents a “file”. @property(nonatomic, readonly) BOOL isFile; /// Determines if the current metadata represents a “folder”. @@ -508,7 +514,8 @@ SWIFT_CLASS_NAMED("StorageMetadata") - (nonnull instancetype)init; /// Creates an instance of StorageMetadata from the contents of a dictionary. /// @return An instance of StorageMetadata that represents the contents of a dictionary. -- (nonnull instancetype)initWithDictionary:(NSDictionary *_Nonnull)dictionary; +- (nonnull instancetype)initWithDictionary: + (NSDictionary *_Nonnull)dictionary OBJC_DESIGNATED_INITIALIZER; - (id _Nonnull)copy SWIFT_WARN_UNUSED_RESULT; - (BOOL)isEqual:(id _Nullable)object SWIFT_WARN_UNUSED_RESULT; @property(nonatomic, readonly) NSUInteger hash; @@ -608,6 +615,7 @@ SWIFT_CLASS_NAMED("StorageReference") completion:(void (^_Nullable)(FIRStorageMetadata *_Nullable, NSError *_Nullable))completion; /// Asynchronously uploads a file to the currently specified StorageReference. +/// putData should be used instead of putFile in Extensions. /// \param fileURL A URL representing the system file path of the object to be uploaded. /// /// \param metadata StorageMetadata containing additional information (MIME type, etc.) @@ -621,10 +629,12 @@ SWIFT_CLASS_NAMED("StorageReference") metadata:(FIRStorageMetadata *_Nullable)metadata; /// Asynchronously uploads a file to the currently specified StorageReference, /// without additional metadata. +/// putData should be used instead of putFile in Extensions. /// @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. +/// putData should be used instead of putFile in Extensions. /// \param fileURL A URL representing the system file path of the object to be uploaded. /// /// \param metadata StorageMetadata containing additional information (MIME type, etc.) @@ -747,7 +757,7 @@ SWIFT_CLASS_NAMED("StorageReference") /// \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; +- (id _Nonnull)copy SWIFT_WARN_UNUSED_RESULT; - (BOOL)isEqual:(id _Nullable)object SWIFT_WARN_UNUSED_RESULT; @property(nonatomic, readonly) NSUInteger hash; @property(nonatomic, readonly, copy) NSString *_Nonnull description; diff --git a/ios_pod/swift_headers/SwiftProtobuf-Swift.h b/ios_pod/swift_headers/SwiftProtobuf-Swift.h index 7b1894b8f2..1e8c76986e 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.6.0. +// Copied from Firebase iOS SDK 10.0.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 854acafa3f..4cd4e99878 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.6.0' + pod 'Firebase/Messaging', '10.0.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Messaging', '9.6.0' + pod 'Firebase/Messaging', '10.0.0' end post_install do |installer| diff --git a/release_build_files/readme.md b/release_build_files/readme.md index d1b357c61c..fb6b231ddb 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -224,50 +224,50 @@ Feature | Required Frameworks and Cocoapods -------------------------- | --------------------------------------- Firebase AdMob | firebase_admob.xcframework | (deprecated) | firebase.xcframework -| | Firebase/Analytics Cocoapod (9.6.0) +| | Firebase/Analytics Cocoapod (10.0.0) | | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk2) Firebase Analytics | firebase_analytics.xcframework | | firebase.xcframework -| | Firebase/Analytics Cocoapod (9.6.0) +| | Firebase/Analytics Cocoapod (10.0.0) Firebase Authentication | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Auth Cocoapod (9.6.0) +| | Firebase/Auth Cocoapod (10.0.0) Firebase Dynamic Links | firebase_dynamic_links.xcframework | | firebase.xcframework -| | Firebase/DynamicLinks Cocoapod (9.6.0) +| | Firebase/DynamicLinks Cocoapod (10.0.0) Cloud Firestore | firebase_firestore.xcframework | | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Firestore Cocoapod (9.6.0) -| | Firebase/Auth Cocoapod (9.6.0) +| | Firebase/Firestore Cocoapod (10.0.0) +| | Firebase/Auth Cocoapod (10.0.0) Firebase Functions | firebase_functions.xcframework | | firebase_auth.xcframework (optional) | | firebase.xcframework -| | Firebase/Functions Cocoapod (9.6.0) -| | Firebase/Auth Cocoapod (9.6.0) +| | Firebase/Functions Cocoapod (10.0.0) +| | Firebase/Auth Cocoapod (10.0.0) Google Mobile Ads | firebase_gma.xcframework | | firebase.xcframework -| | Firebase/Analytics Cocoapod (9.6.0) +| | Firebase/Analytics Cocoapod (10.0.0) | | Google-Mobile-Ads-SDK Cocoapod (9.11.0) Firebase Installations | firebase_installations.xcframework | | firebase.xcframework -| | FirebaseInstallations Cocoapod (9.6.0) +| | FirebaseInstallations Cocoapod (10.0.0) Firebase Cloud Messaging | firebase_messaging.xcframework | | firebase.xcframework -| | Firebase/Messaging Cocoapod (9.6.0) +| | Firebase/Messaging Cocoapod (10.0.0) Firebase Realtime Database | firebase_database.xcframework | | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Database Cocoapod (9.6.0) -| | Firebase/Auth Cocoapod (9.6.0) +| | Firebase/Database Cocoapod (10.0.0) +| | Firebase/Auth Cocoapod (10.0.0) Firebase Remote Config | firebase_remote_config.xcframework | | firebase.xcframework -| | Firebase/RemoteConfig Cocoapod (9.6.0) +| | Firebase/RemoteConfig Cocoapod (10.0.0) Firebase Storage | firebase_storage.xcframework | | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Storage Cocoapod (9.6.0) -| | Firebase/Auth Cocoapod (9.6.0) +| | Firebase/Storage Cocoapod (10.0.0) +| | Firebase/Auth Cocoapod (10.0.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 @@ -292,50 +292,50 @@ Feature | Required Libraries and Cocoapods -------------------------- | ----------------------------------------- Firebase AdMob | libfirebase_admob.a | (deprecated) | libfirebase_app.a -| | Firebase/Analytics Cocoapod (9.6.0) +| | Firebase/Analytics Cocoapod (10.0.0) | | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk2) Firebase Analytics | libfirebase_analytics.a | | libfirebase_app.a -| | Firebase/Analytics Cocoapod (9.6.0) +| | Firebase/Analytics Cocoapod (10.0.0) Firebase Authentication | libfirebase_auth.a | | libfirebase_app.a -| | Firebase/Auth Cocoapod (9.6.0) +| | Firebase/Auth Cocoapod (10.0.0) Firebase Dynamic Links | libfirebase_dynamic_links.a | | libfirebase_app.a -| | Firebase/DynamicLinks Cocoapod (9.6.0) +| | Firebase/DynamicLinks Cocoapod (10.0.0) Cloud Firestore | libfirebase_firestore.a | | libfirebase_app.a | | libfirebase_auth.a -| | Firebase/Firestore Cocoapod (9.6.0) -| | Firebase/Auth Cocoapod (9.6.0) +| | Firebase/Firestore Cocoapod (10.0.0) +| | Firebase/Auth Cocoapod (10.0.0) Firebase Functions | libfirebase_functions.a | | libfirebase_app.a | | libfirebase_auth.a (optional) -| | Firebase/Functions Cocoapod (9.6.0) -| | Firebase/Auth Cocoapod (9.6.0) +| | Firebase/Functions Cocoapod (10.0.0) +| | Firebase/Auth Cocoapod (10.0.0) Google Mobile Ads | libfirebase_gma.a | | libfirebase_app.a -| | Firebase/Analytics Cocoapod (9.6.0) +| | Firebase/Analytics Cocoapod (10.0.0) | | Google-Mobile-Ads-SDK Cocoapod (9.11.0) Firebase Installations | libfirebase_installations.a | | libfirebase_app.a -| | FirebaseInstallations Cocoapod (9.6.0) +| | FirebaseInstallations Cocoapod (10.0.0) Firebase Cloud Messaging | libfirebase_messaging.a | | libfirebase_app.a -| | Firebase/CloudMessaging Cocoapod (9.6.0) +| | Firebase/CloudMessaging Cocoapod (10.0.0) Firebase Realtime Database | libfirebase_database.a | | libfirebase_app.a | | libfirebase_auth.a -| | Firebase/Database Cocoapod (9.6.0) -| | Firebase/Auth Cocoapod (9.6.0) +| | Firebase/Database Cocoapod (10.0.0) +| | Firebase/Auth Cocoapod (10.0.0) Firebase Remote Config | libfirebase_remote_config.a | | libfirebase_app.a -| | Firebase/RemoteConfig Cocoapod (9.6.0) +| | Firebase/RemoteConfig Cocoapod (10.0.0) Firebase Storage | libfirebase_storage.a | | libfirebase_app.a | | libfirebase_auth.a -| | Firebase/Storage Cocoapod (9.6.0) -| | Firebase/Auth Cocoapod (9.6.0) +| | Firebase/Storage Cocoapod (10.0.0) +| | Firebase/Auth Cocoapod (10.0.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 8ae30f183c..98e12670aa 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.6.0' + pod 'Firebase/RemoteConfig', '10.0.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/RemoteConfig', '9.6.0' + pod 'Firebase/RemoteConfig', '10.0.0' end post_install do |installer| diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile index 62bc21e5da..41c7ca2f09 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.6.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Storage', '10.0.0' + pod 'Firebase/Auth', '10.0.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Storage', '9.6.0' - pod 'Firebase/Auth', '9.6.0' + pod 'Firebase/Storage', '10.0.0' + pod 'Firebase/Auth', '10.0.0' end post_install do |installer| From 0df8e4cd18e5cade016c5fd607a3bd0d00d2838b Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Mon, 10 Oct 2022 13:45:04 -0700 Subject: [PATCH 2/9] Manuall tune some changes --- admob/integration_test/Podfile | 4 ++-- analytics/integration_test/Podfile | 4 ++-- app/integration_test/Podfile | 2 +- auth/integration_test/Podfile | 2 +- cmake/external/firestore.patch.txt | 18 ------------------ database/integration_test/Podfile | 2 +- dynamic_links/integration_test/Podfile | 2 +- firestore/integration_test/Podfile | 2 +- firestore/integration_test_internal/Podfile | 2 +- functions/integration_test/Podfile | 2 +- gma/integration_test/Podfile | 2 +- installations/integration_test/Podfile | 2 +- ios_pod/Podfile | 4 ++-- messaging/integration_test/Podfile | 2 +- remote_config/integration_test/Podfile | 2 +- storage/integration_test/Podfile | 2 +- 16 files changed, 18 insertions(+), 36 deletions(-) diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile index 71fe57d6f3..52eccdbbfd 100644 --- a/admob/integration_test/Podfile +++ b/admob/integration_test/Podfile @@ -1,11 +1,11 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '10.0' +platform :ios, '11.0' # Firebase AdMob test application. use_frameworks! :linkage => :static target 'integration_test' do pod 'Firebase/Analytics', '10.0.0' - pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2' + pod 'Google-Mobile-Ads-SDK', '9.11.0.1' end post_install do |installer| diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile index a275f91a79..45ab91e98b 100644 --- a/analytics/integration_test/Podfile +++ b/analytics/integration_test/Podfile @@ -1,10 +1,10 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '10.0' +platform :ios, '11.0' # Firebase Analytics test application. use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '10.0' + platform :ios, '11.0' pod 'Firebase/Analytics', '10.0.0' end diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile index d0f86c3f1c..0125c9e447 100644 --- a/app/integration_test/Podfile +++ b/app/integration_test/Podfile @@ -1,5 +1,5 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '10.0' +platform :ios, '11.0' # Firebase App test application. use_frameworks! :linkage => :static diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile index 5a4937bba0..a5b4fd8436 100644 --- a/auth/integration_test/Podfile +++ b/auth/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '10.0' + platform :ios, '11.0' pod 'Firebase/Auth', '10.0.0' end diff --git a/cmake/external/firestore.patch.txt b/cmake/external/firestore.patch.txt index 99b7f7f061..52674d3129 100644 --- a/cmake/external/firestore.patch.txt +++ b/cmake/external/firestore.patch.txt @@ -80,21 +80,3 @@ index 96353b65f..57f159e9c 100644 private: friend bool operator==(const FieldIndex& lhs, const FieldIndex& rhs); friend bool operator!=(const FieldIndex& lhs, const FieldIndex& rhs); -diff --git a/Firestore/core/test/unit/local/leveldb_local_store_test.cc b/Firestore/core/test/unit/local/leveldb_local_store_test.cc -index 4813b9816..54f24e90b 100644 ---- a/Firestore/core/test/unit/local/leveldb_local_store_test.cc -+++ b/Firestore/core/test/unit/local/leveldb_local_store_test.cc -@@ -69,12 +69,7 @@ std::unique_ptr Factory() { - // This lambda function takes a rvalue vector as parameter, - // then coverts it to a sorted set based on the compare function. - auto convertToSet = [](std::vector&& vec) { -- auto cmp = [](const FieldIndex& left, const FieldIndex& right) { -- return FieldIndex::SemanticCompare(left, right) == -- util::ComparisonResult::Ascending; -- }; -- -- std::set result(cmp); -+ std::set result; - for (auto& index : vec) { - result.insert(std::move(index)); - } diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile index ce4e9ee1dd..f642522003 100644 --- a/database/integration_test/Podfile +++ b/database/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '10.0' + platform :ios, '11.0' pod 'Firebase/Database', '10.0.0' pod 'Firebase/Auth', '10.0.0' end diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile index ebd3bde88b..c64d5f751c 100644 --- a/dynamic_links/integration_test/Podfile +++ b/dynamic_links/integration_test/Podfile @@ -1,5 +1,5 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '10.0' +platform :ios, '11.0' # Firebase Dynamic Links test application. use_frameworks! :linkage => :static diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile index 2dbc9f4fe7..f6e4d121b6 100644 --- a/firestore/integration_test/Podfile +++ b/firestore/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '10.0' + platform :ios, '11.0' pod 'Firebase/Firestore', '10.0.0' pod 'Firebase/Auth', '10.0.0' end diff --git a/firestore/integration_test_internal/Podfile b/firestore/integration_test_internal/Podfile index ffa0d77a23..6f97558a72 100644 --- a/firestore/integration_test_internal/Podfile +++ b/firestore/integration_test_internal/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '10.0' + platform :ios, '11.0' pod 'Firebase/Firestore', '10.0.0' pod 'Firebase/Auth', '10.0.0' end diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile index 754fda5965..02d4c349c0 100644 --- a/functions/integration_test/Podfile +++ b/functions/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '10.0' + platform :ios, '11.0' pod 'Firebase/Functions', '10.0.0' pod 'Firebase/Auth', '10.0.0' end diff --git a/gma/integration_test/Podfile b/gma/integration_test/Podfile index 221c6e02e1..b9e57bf792 100644 --- a/gma/integration_test/Podfile +++ b/gma/integration_test/Podfile @@ -1,5 +1,5 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '10.0' +platform :ios, '11.0' # Firebase GMA test application. use_frameworks! :linkage => :static diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile index 414b56af9d..9ff054920f 100644 --- a/installations/integration_test/Podfile +++ b/installations/integration_test/Podfile @@ -1,5 +1,5 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '10.0' +platform :ios, '11.0' # Firebase Installations test application. use_frameworks! :linkage => :static diff --git a/ios_pod/Podfile b/ios_pod/Podfile index 5beaafad4d..f4a234df28 100644 --- a/ios_pod/Podfile +++ b/ios_pod/Podfile @@ -1,11 +1,11 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '10.0' +platform :ios, '11.0' use_frameworks! target 'GetPods' do pod 'Firebase/Core', '10.0.0' - pod 'Google-Mobile-Ads-SDK', '9.11.0' + pod 'Google-Mobile-Ads-SDK', '9.11.0.1' pod 'Firebase/Analytics', '10.0.0' pod 'Firebase/Auth', '10.0.0' pod 'Firebase/Crashlytics', '10.0.0' diff --git a/messaging/integration_test/Podfile b/messaging/integration_test/Podfile index 4cd4e99878..46a295cc17 100644 --- a/messaging/integration_test/Podfile +++ b/messaging/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '10.0' + platform :ios, '11.0' pod 'Firebase/Messaging', '10.0.0' end diff --git a/remote_config/integration_test/Podfile b/remote_config/integration_test/Podfile index 98e12670aa..1c758e4059 100644 --- a/remote_config/integration_test/Podfile +++ b/remote_config/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '10.0' + platform :ios, '11.0' pod 'Firebase/RemoteConfig', '10.0.0' end diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile index 41c7ca2f09..970e011deb 100644 --- a/storage/integration_test/Podfile +++ b/storage/integration_test/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '10.0' + platform :ios, '11.0' pod 'Firebase/Storage', '10.0.0' pod 'Firebase/Auth', '10.0.0' end From 5ddd74b9d6fb08090ab2481000b44963c5a5e90d Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Mon, 10 Oct 2022 15:38:02 -0700 Subject: [PATCH 3/9] update GMA integration test --- gma/integration_test/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gma/integration_test/Podfile b/gma/integration_test/Podfile index b9e57bf792..04e64c605f 100644 --- a/gma/integration_test/Podfile +++ b/gma/integration_test/Podfile @@ -5,7 +5,7 @@ use_frameworks! :linkage => :static target 'integration_test' do pod 'Firebase/Analytics', '10.0.0' - pod 'Google-Mobile-Ads-SDK', '9.11.0' + pod 'Google-Mobile-Ads-SDK', '9.11.0.1' end post_install do |installer| From 26ed07d80dfe65a8990d8c67a50e78ded5292a5d Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Tue, 11 Oct 2022 10:10:51 -0700 Subject: [PATCH 4/9] admob integration pod version revert --- admob/integration_test/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile index 52eccdbbfd..536664ed91 100644 --- a/admob/integration_test/Podfile +++ b/admob/integration_test/Podfile @@ -5,7 +5,7 @@ use_frameworks! :linkage => :static target 'integration_test' do pod 'Firebase/Analytics', '10.0.0' - pod 'Google-Mobile-Ads-SDK', '9.11.0.1' + pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2' end post_install do |installer| From 7de3ff8275f45655bf3b59292f0b68e24daeb8a3 Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Tue, 11 Oct 2022 15:07:25 -0700 Subject: [PATCH 5/9] test admob GMA cpp sdk --- admob/integration_test/Podfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile index 536664ed91..0d291b758c 100644 --- a/admob/integration_test/Podfile +++ b/admob/integration_test/Podfile @@ -1,3 +1,4 @@ +source 'https://github.com/firebase/SpecsStaging.git' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '11.0' # Firebase AdMob test application. @@ -5,7 +6,7 @@ use_frameworks! :linkage => :static target 'integration_test' do pod 'Firebase/Analytics', '10.0.0' - pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2' + pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk3' end post_install do |installer| From 26a64f157d41c3bddb62b6d65d5ca575bb8f116e Mon Sep 17 00:00:00 2001 From: a-maurice Date: Tue, 11 Oct 2022 17:34:37 -0700 Subject: [PATCH 6/9] Update the iOS deployment targets to 11 --- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- .../gameloop_apple/gameloop.xcodeproj/project.pbxproj | 8 ++++---- .../integration_test.xcodeproj/project.pbxproj | 4 ++-- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/admob/integration_test/integration_test.xcodeproj/project.pbxproj b/admob/integration_test/integration_test.xcodeproj/project.pbxproj index 2587fd7a06..d20b6a36cb 100644 --- a/admob/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/admob/integration_test/integration_test.xcodeproj/project.pbxproj @@ -242,7 +242,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -279,7 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj index 53b960e16b..7dbeda497b 100644 --- a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj @@ -407,7 +407,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -444,7 +444,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/app/integration_test/integration_test.xcodeproj/project.pbxproj b/app/integration_test/integration_test.xcodeproj/project.pbxproj index 03e93aa3e0..82593ef7f4 100644 --- a/app/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/app/integration_test/integration_test.xcodeproj/project.pbxproj @@ -242,7 +242,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -279,7 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/auth/integration_test/integration_test.xcodeproj/project.pbxproj b/auth/integration_test/integration_test.xcodeproj/project.pbxproj index 8349a00ed8..9503d69287 100644 --- a/auth/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/auth/integration_test/integration_test.xcodeproj/project.pbxproj @@ -430,7 +430,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -467,7 +467,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/database/integration_test/integration_test.xcodeproj/project.pbxproj b/database/integration_test/integration_test.xcodeproj/project.pbxproj index 172df6cd81..8a2ef30286 100644 --- a/database/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/database/integration_test/integration_test.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -391,7 +391,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj b/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj index 8c01e30e2c..bf61e2a445 100644 --- a/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/dynamic_links/integration_test/integration_test.xcodeproj/project.pbxproj @@ -242,7 +242,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -279,7 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj index 88d6e2c186..6f53ba0b95 100644 --- a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj @@ -450,7 +450,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -487,7 +487,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj index a2b4b16315..641b7bdeb2 100644 --- a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj +++ b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj @@ -677,7 +677,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -714,7 +714,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/functions/integration_test/integration_test.xcodeproj/project.pbxproj b/functions/integration_test/integration_test.xcodeproj/project.pbxproj index a8d92dae8e..c142aa743c 100644 --- a/functions/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/functions/integration_test/integration_test.xcodeproj/project.pbxproj @@ -433,7 +433,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -470,7 +470,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/gma/integration_test/integration_test.xcodeproj/project.pbxproj b/gma/integration_test/integration_test.xcodeproj/project.pbxproj index 42a0aef4c6..54ac389b36 100644 --- a/gma/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/gma/integration_test/integration_test.xcodeproj/project.pbxproj @@ -242,7 +242,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -279,7 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/installations/integration_test/integration_test.xcodeproj/project.pbxproj b/installations/integration_test/integration_test.xcodeproj/project.pbxproj index 9a53686fe7..ba76407391 100644 --- a/installations/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/installations/integration_test/integration_test.xcodeproj/project.pbxproj @@ -242,7 +242,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -279,7 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj index 13c995bd36..50397c4fc1 100644 --- a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj @@ -431,7 +431,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -468,7 +468,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj index a2804b2a1e..9d7e4a4d38 100644 --- a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj @@ -407,7 +407,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -444,7 +444,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj index 121fd8fbbb..498027e55f 100644 --- a/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj +++ b/scripts/gha/integration_testing/gameloop_apple/gameloop.xcodeproj/project.pbxproj @@ -532,7 +532,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -587,7 +587,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -603,7 +603,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = gameloop/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -622,7 +622,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = gameloop/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/storage/integration_test/integration_test.xcodeproj/project.pbxproj b/storage/integration_test/integration_test.xcodeproj/project.pbxproj index d24b64205c..764c0c9a16 100644 --- a/storage/integration_test/integration_test.xcodeproj/project.pbxproj +++ b/storage/integration_test/integration_test.xcodeproj/project.pbxproj @@ -418,7 +418,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -455,7 +455,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; From a3593f51502ec5712dbf90ed55829f95ea28c4b5 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Tue, 11 Oct 2022 17:43:41 -0700 Subject: [PATCH 7/9] Remove workarounds from the firestore patch --- cmake/external/firestore.patch.txt | 57 ------------------------------ 1 file changed, 57 deletions(-) diff --git a/cmake/external/firestore.patch.txt b/cmake/external/firestore.patch.txt index 52674d3129..fa029b4ac1 100644 --- a/cmake/external/firestore.patch.txt +++ b/cmake/external/firestore.patch.txt @@ -23,60 +23,3 @@ index 920bf2928..c5c9cc7ee 100644 PREFIX ${PROJECT_BINARY_DIR} -diff --git a/Firestore/core/src/local/local_store.cc b/Firestore/core/src/local/local_store.cc -index 7685f1959..b48b4f9d2 100644 ---- a/Firestore/core/src/local/local_store.cc -+++ b/Firestore/core/src/local/local_store.cc -@@ -662,15 +662,10 @@ absl::optional LocalStore::GetNamedQuery( - - void LocalStore::ConfigureFieldIndexes( - std::vector new_field_indexes) { -- auto cmp = [](const FieldIndex& left, const FieldIndex& right) { -- return FieldIndex::SemanticCompare(left, right) == -- util::ComparisonResult::Ascending; -- }; -- - // This lambda function takes a rvalue vector as parameter, - // then coverts it to a sorted set based on the compare function above. -- auto convertToSet = [&](std::vector&& vec) { -- std::set result(cmp); -+ auto convertToSet = [](std::vector&& vec) { -+ std::set result; - for (auto& index : vec) { - result.insert(std::move(index)); - } -@@ -678,7 +673,7 @@ void LocalStore::ConfigureFieldIndexes( - }; - - return persistence_->Run("Configure indexes", [&] { -- return util::DiffSets( -+ return util::DiffSets( - convertToSet(index_manager_->GetFieldIndexes()), - convertToSet(std::move(new_field_indexes)), FieldIndex::SemanticCompare, - [this](const model::FieldIndex& index) { -diff --git a/Firestore/core/src/model/field_index.h b/Firestore/core/src/model/field_index.h -index 96353b65f..57f159e9c 100644 ---- a/Firestore/core/src/model/field_index.h -+++ b/Firestore/core/src/model/field_index.h -@@ -285,6 +285,21 @@ class FieldIndex { - /** Returns the ArrayContains/ArrayContainsAny segment for this index. */ - absl::optional GetArraySegment() const; - -+ /** -+ * A type that can be used as the "Compare" template parameter of ordered -+ * collections to have the elements ordered using -+ * `FieldIndex::SemanticCompare()`. -+ * -+ * Example: -+ * std::set result; -+ */ -+ struct SemanticLess { -+ bool operator()(const FieldIndex& left, const FieldIndex& right) const { -+ return FieldIndex::SemanticCompare(left, right) == -+ util::ComparisonResult::Ascending; -+ } -+ }; -+ - private: - friend bool operator==(const FieldIndex& lhs, const FieldIndex& rhs); - friend bool operator!=(const FieldIndex& lhs, const FieldIndex& rhs); From fcf0aecc776ff5ce95700e4c905ec1931f9c1937 Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Wed, 12 Oct 2022 08:39:53 -0700 Subject: [PATCH 8/9] revert the stagingspec for admob --- admob/integration_test/Podfile | 1 - 1 file changed, 1 deletion(-) diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile index 0d291b758c..92bfd8e9c4 100644 --- a/admob/integration_test/Podfile +++ b/admob/integration_test/Podfile @@ -1,4 +1,3 @@ -source 'https://github.com/firebase/SpecsStaging.git' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '11.0' # Firebase AdMob test application. From 35f00f1716160fefa774f6026085665e877e3bb7 Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Wed, 12 Oct 2022 11:33:17 -0700 Subject: [PATCH 9/9] update readme --- release_build_files/readme.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index fb6b231ddb..80cb3950c9 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -225,7 +225,7 @@ Feature | Required Frameworks and Cocoapods Firebase AdMob | firebase_admob.xcframework | (deprecated) | firebase.xcframework | | Firebase/Analytics Cocoapod (10.0.0) -| | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk2) +| | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk3) Firebase Analytics | firebase_analytics.xcframework | | firebase.xcframework | | Firebase/Analytics Cocoapod (10.0.0) @@ -248,7 +248,7 @@ Firebase Functions | firebase_functions.xcframework Google Mobile Ads | firebase_gma.xcframework | | firebase.xcframework | | Firebase/Analytics Cocoapod (10.0.0) -| | Google-Mobile-Ads-SDK Cocoapod (9.11.0) +| | Google-Mobile-Ads-SDK Cocoapod (9.11.0.1) Firebase Installations | firebase_installations.xcframework | | firebase.xcframework | | FirebaseInstallations Cocoapod (10.0.0) @@ -293,7 +293,7 @@ Feature | Required Libraries and Cocoapods Firebase AdMob | libfirebase_admob.a | (deprecated) | libfirebase_app.a | | Firebase/Analytics Cocoapod (10.0.0) -| | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk2) +| | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk3) Firebase Analytics | libfirebase_analytics.a | | libfirebase_app.a | | Firebase/Analytics Cocoapod (10.0.0) @@ -316,7 +316,7 @@ Firebase Functions | libfirebase_functions.a Google Mobile Ads | libfirebase_gma.a | | libfirebase_app.a | | Firebase/Analytics Cocoapod (10.0.0) -| | Google-Mobile-Ads-SDK Cocoapod (9.11.0) +| | Google-Mobile-Ads-SDK Cocoapod (9.11.0.1) Firebase Installations | libfirebase_installations.a | | libfirebase_app.a | | FirebaseInstallations Cocoapod (10.0.0) @@ -634,15 +634,19 @@ workflow use only during the development of your app, not for publicly shipping code. ## Release Notes -### Upcoming +### 10.0.0 - Changes + - General (iOS): Update to Firebase Cocoapods version 10.0.0. - General: Remove unused headers for performance and test lab from the package. - Auth (Android/iOS): Deprecating `PhoneAuthProvider::kMaxTimeoutMs`. The actual range is determined by the underlying SDK, ex. [PhoneAuthOptions.Builder from Android SDK](https://firebase.google.com/docs/reference/android/com/google/firebase/auth/PhoneAuthOptions.Builder). - GMA (iOS): Updated iOS dependency to Google Mobile Ads SDK version - 9.11.0. + 9.11.0.1. + - AdMob (iOS): Temporarily pinned AdMob dependency to a special version of + the Google-Mobile-Ads-SDK Cocoapod, "7.69.0-cppsdk3", to maintain + compatibility with version 10.x of the Firebase iOS SDK. ### 9.6.0 - Changes