diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile index 42a7f29b62..955ddda801 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, '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 index 2c5a36af7e..91f3bcdec4 100644 --- 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 index f60ae421c1..00f499d091 100644 --- 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 index fce0bfa4e2..4936e730fa 100644 --- 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 index 030a579e3f..38bcf12d20 100644 --- 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 index 6e877ecc23..5eba91447c 100644 --- 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 index 84bcca180a..5b08b79851 100644 --- 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 index 2498fe55b1..d7d6c257a6 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, '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 index a7076d075d..eab1bd90e7 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-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 index d46bac178d..24cb69b6f9 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, '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/database/integration_test/src/integration_test.cc b/database/integration_test/src/integration_test.cc index 28a1f59856..3112e83d2a 100644 --- a/database/integration_test/src/integration_test.cc +++ b/database/integration_test/src/integration_test.cc @@ -430,6 +430,9 @@ TEST_F(FirebaseDatabaseTest, TestSetAndGetSimpleValues) { WaitForCompletion(f7, "SetLongDouble"); } + // Wait a moment for everything to be updated. + ProcessEvents(1000); + // Get the values that we just set, and confirm that they match what we // set them to. { diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile index 306206be5d..d770981f49 100644 --- 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 index 9f936452c2..eb9c155f9a 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, '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 index 8e15b4dc8c..61dd90aeed 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, '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 index f3b0bf9c77..589a83b953 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, '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 index f0056c5936..613dcd617a 100644 --- 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/gma/integration_test/src/integration_test.cc b/gma/integration_test/src/integration_test.cc index e7bc556ced..8b12ae74e3 100644 --- a/gma/integration_test/src/integration_test.cc +++ b/gma/integration_test/src/integration_test.cc @@ -2660,15 +2660,24 @@ TEST_F(FirebaseGmaUmpTest, TestUmpLoadForm) { EXPECT_EQ(consent_info_->GetConsentFormStatus(), firebase::gma::ump::kConsentFormStatusAvailable); - // Load the form. - firebase::Future future = consent_info_->LoadConsentForm(); + // Load the form. Run this step with retry in case of network timeout. + WaitForCompletionAnyResult( + RunWithRetry([&]() { return consent_info_->LoadConsentForm(); }), + "LoadConsentForm"); - EXPECT_TRUE(future == consent_info_->LoadConsentFormLastResult()); + firebase::Future future = consent_info_->LoadConsentFormLastResult(); - WaitForCompletion(future, "LoadConsentForm"); + // If it still timed out after all the retries, let the test pass. + EXPECT_THAT(future.error(), + AnyOf(firebase::gma::ump::kConsentFormSuccess, + firebase::gma::ump::kConsentFormErrorTimeout)); EXPECT_EQ(consent_info_->GetConsentFormStatus(), firebase::gma::ump::kConsentFormStatusAvailable); + + if (future.error() == firebase::gma::ump::kConsentFormErrorTimeout) { + LogWarning("Timed out after multiple tries, but passing anyway."); + } } TEST_F(FirebaseGmaUmpTest, TestUmpShowForm) { diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile index cf9a0fac39..dee0604d1d 100644 --- 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 index afed9324b6..86c741bc7f 100644 --- 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 index 13d9f74b4d..476dd3a6ab 100644 --- 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 index f9efa9bd4c..0fd7cff0e3 100644 --- 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 diff --git a/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h b/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h index adb0e2cfa9..3fa119493d 100644 --- a/ios_pod/swift_headers/FirebaseDatabaseSwift-Swift.h +++ b/ios_pod/swift_headers/FirebaseDatabaseSwift-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 = "FirebaseDatabaseSwift", \ - 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 = "FirebaseDatabaseSwift", \ + generated_declaration))), \ + apply_to = \ + any(function, enum, objc_interface, objc_category, objc_protocol)) #pragma pop_macro("any") #endif @@ -289,7 +289,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) @@ -555,12 +555,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 = "FirebaseDatabaseSwift", \ - 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 = "FirebaseDatabaseSwift", \ + 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/FirebaseFirestoreSwift-Swift.h b/ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h index fdea7dcb7c..ad9ce96dc7 100644 --- a/ios_pod/swift_headers/FirebaseFirestoreSwift-Swift.h +++ b/ios_pod/swift_headers/FirebaseFirestoreSwift-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 = "FirebaseFirestoreSwift", \ - 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 = "FirebaseFirestoreSwift", \ + generated_declaration))), \ + apply_to = \ + any(function, enum, objc_interface, objc_category, objc_protocol)) #pragma pop_macro("any") #endif @@ -289,7 +289,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) @@ -555,12 +555,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 = "FirebaseFirestoreSwift", \ - 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 = "FirebaseFirestoreSwift", \ + 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/FirebaseFunctions-Swift.h b/ios_pod/swift_headers/FirebaseFunctions-Swift.h index 25e474279f..9dd7649e03 100644 --- a/ios_pod/swift_headers/FirebaseFunctions-Swift.h +++ b/ios_pod/swift_headers/FirebaseFunctions-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) @@ -269,12 +269,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 = "FirebaseFunctions", \ - 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 = "FirebaseFunctions", \ + generated_declaration))), \ + apply_to = \ + any(function, enum, objc_interface, objc_category, objc_protocol)) #pragma pop_macro("any") #endif @@ -569,7 +569,7 @@ SWIFT_CLASS_NAMED("HTTPSCallableResult") #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) @@ -837,12 +837,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 = "FirebaseFunctions", \ - 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 = "FirebaseFunctions", \ + 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/FirebaseInAppMessagingSwift-Swift.h b/ios_pod/swift_headers/FirebaseInAppMessagingSwift-Swift.h index c4d9d5152f..572962989c 100644 --- a/ios_pod/swift_headers/FirebaseInAppMessagingSwift-Swift.h +++ b/ios_pod/swift_headers/FirebaseInAppMessagingSwift-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,13 +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 = "FirebaseInAppMessagingSwift", \ - 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 = "FirebaseInAppMessagingSwift", \ + generated_declaration))), \ + apply_to = \ + any(function, enum, objc_interface, objc_category, objc_protocol)) #pragma pop_macro("any") #endif @@ -289,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) @@ -555,13 +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 = "FirebaseInAppMessagingSwift", \ - 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 = "FirebaseInAppMessagingSwift", \ + 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/FirebaseMLModelDownloader-Swift.h b/ios_pod/swift_headers/FirebaseMLModelDownloader-Swift.h index a1b322280b..85df9d6da1 100644 --- a/ios_pod/swift_headers/FirebaseMLModelDownloader-Swift.h +++ b/ios_pod/swift_headers/FirebaseMLModelDownloader-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 = "FirebaseMLModelDownloader", \ - 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 = "FirebaseMLModelDownloader", \ + generated_declaration))), \ + apply_to = \ + any(function, enum, objc_interface, objc_category, objc_protocol)) #pragma pop_macro("any") #endif @@ -289,7 +289,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) @@ -555,12 +555,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 = "FirebaseMLModelDownloader", \ - 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 = "FirebaseMLModelDownloader", \ + 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/FirebaseRemoteConfigSwift-Swift.h b/ios_pod/swift_headers/FirebaseRemoteConfigSwift-Swift.h index 29b645af98..cdc363e5a2 100644 --- a/ios_pod/swift_headers/FirebaseRemoteConfigSwift-Swift.h +++ b/ios_pod/swift_headers/FirebaseRemoteConfigSwift-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 = "FirebaseRemoteConfigSwift", \ - 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 = "FirebaseRemoteConfigSwift", \ + generated_declaration))), \ + apply_to = \ + any(function, enum, objc_interface, objc_category, objc_protocol)) #pragma pop_macro("any") #endif @@ -289,7 +289,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) @@ -555,12 +555,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 = "FirebaseRemoteConfigSwift", \ - 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 = "FirebaseRemoteConfigSwift", \ + 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/FirebaseSharedSwift-Swift.h b/ios_pod/swift_headers/FirebaseSharedSwift-Swift.h index b6498d35f3..7aaf04dcd6 100644 --- a/ios_pod/swift_headers/FirebaseSharedSwift-Swift.h +++ b/ios_pod/swift_headers/FirebaseSharedSwift-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 = "FirebaseSharedSwift", \ - 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 = "FirebaseSharedSwift", \ + 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 = "FirebaseSharedSwift", \ - 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 = "FirebaseSharedSwift", \ + 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/FirebaseStorage-Swift.h b/ios_pod/swift_headers/FirebaseStorage-Swift.h index 5e93c2ab3f..a2a7e55614 100644 --- a/ios_pod/swift_headers/FirebaseStorage-Swift.h +++ b/ios_pod/swift_headers/FirebaseStorage-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) @@ -271,11 +271,11 @@ using UInt = size_t; #pragma push_macro("any") #undef any #pragma clang attribute push( \ - __attribute__((external_source_symbol( \ - language = "Swift", defined_in = "FirebaseStorage", \ - generated_declaration))), \ - apply_to = any(function, enum, objc_interface, objc_category, \ - objc_protocol)) + __attribute__((external_source_symbol(language = "Swift", \ + defined_in = "FirebaseStorage", \ + generated_declaration))), \ + apply_to = \ + any(function, enum, objc_interface, objc_category, objc_protocol)) #pragma pop_macro("any") #endif @@ -940,7 +940,7 @@ SWIFT_CLASS_NAMED("StorageUploadTask") #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) @@ -1210,11 +1210,11 @@ using UInt = size_t; #pragma push_macro("any") #undef any #pragma clang attribute push( \ - __attribute__((external_source_symbol( \ - language = "Swift", defined_in = "FirebaseStorage", \ - generated_declaration))), \ - apply_to = any(function, enum, objc_interface, objc_category, \ - objc_protocol)) + __attribute__((external_source_symbol(language = "Swift", \ + defined_in = "FirebaseStorage", \ + 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/SwiftProtobuf-Swift.h b/ios_pod/swift_headers/SwiftProtobuf-Swift.h index 973c5274e1..964d653984 100644 --- a/ios_pod/swift_headers/SwiftProtobuf-Swift.h +++ b/ios_pod/swift_headers/SwiftProtobuf-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 = "SwiftProtobuf", \ - 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 = "SwiftProtobuf", \ + 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 = "SwiftProtobuf", \ - 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 = "SwiftProtobuf", \ + generated_declaration))), \ + apply_to = \ + any(function, enum, objc_interface, objc_category, objc_protocol)) #pragma pop_macro("any") #endif diff --git a/messaging/integration_test/Podfile b/messaging/integration_test/Podfile index 22d8899915..4fdde2d56a 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, '11.0' - pod 'Firebase/Messaging', '10.15.0' + pod 'Firebase/Messaging', '10.16.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Messaging', '10.15.0' + pod 'Firebase/Messaging', '10.16.0' end post_install do |installer| diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 90990ced24..26bf145f07 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -253,7 +253,7 @@ Firebase Functions | firebase_functions.xcframework Google Mobile Ads | firebase_gma.xcframework | | firebase.xcframework | | Firebase/CoreOnly Cocoapod (10.15.0) -| | Google-Mobile-Ads-SDK Cocoapod (10.10.0) +| | Google-Mobile-Ads-SDK Cocoapod (10.12.0) | | GoogleUserMessagingPlatform Cocoapod (2.1.0) Firebase Installations | firebase_installations.xcframework | | firebase.xcframework @@ -316,7 +316,7 @@ Firebase Functions | libfirebase_functions.a Google Mobile Ads | libfirebase_gma.a | | libfirebase_app.a | | Firebase/CoreOnly Cocoapod (10.15.0) -| | Google-Mobile-Ads-SDK Cocoapod (10.10.0) +| | Google-Mobile-Ads-SDK Cocoapod (10.12.0) | | GoogleUserMessagingPlatform Cocoapod (2.1.0) Firebase Installations | libfirebase_installations.a | | libfirebase_app.a @@ -638,7 +638,7 @@ code. ### 11.6.0 - Changes - - General (iOS): Update to Firebase Cocoapods version 10.16.0. + - General (iOS): Update to Firebase Cocoapods version 10.15.0. - Firestore: Add support for disjunctions in queries (OR queries) ([#1453](https://github.com/firebase/firebase-cpp-sdk/pull/1453)). - GMA: Added the User Messaging Platform (UMP) SDK, required for obtaining diff --git a/remote_config/integration_test/Podfile b/remote_config/integration_test/Podfile index 17ecdff389..f16d040828 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, '11.0' - pod 'Firebase/RemoteConfig', '10.15.0' + pod 'Firebase/RemoteConfig', '10.16.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/RemoteConfig', '10.15.0' + pod 'Firebase/RemoteConfig', '10.16.0' end post_install do |installer| diff --git a/scripts/gha/report_build_status.py b/scripts/gha/report_build_status.py index 76b6b974df..757053d209 100644 --- a/scripts/gha/report_build_status.py +++ b/scripts/gha/report_build_status.py @@ -592,10 +592,10 @@ def main(argv): elif FLAGS.report == "test_summary": test_list = {} for day in days_sorted: - if source_tests[day]['log_results']: + if day in source_tests and source_tests[day]['log_results']: errors = aggregate_errors_from_log(source_tests[day]['log_results']) test_link = source_tests[day]['html_url'] - elif package_tests[day]['log_results']: + elif day in package_tests and package_tests[day]['log_results']: errors = aggregate_errors_from_log(package_tests[day]['log_results']) test_link = package_tests[day]['html_url'] else: diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile index 4429d53b76..45b970a425 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, '11.0' - pod 'Firebase/Storage', '10.15.0' - pod 'Firebase/Auth', '10.15.0' + pod 'Firebase/Storage', '10.16.0' + pod 'Firebase/Auth', '10.16.0' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Storage', '10.15.0' - pod 'Firebase/Auth', '10.15.0' + pod 'Firebase/Storage', '10.16.0' + pod 'Firebase/Auth', '10.16.0' end post_install do |installer|