diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index 1465af1f5d..ecba080954 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -20,7 +20,7 @@ def firebaseDependenciesMap = [ 'app_check' : ['com.google.firebase:firebase-appcheck', 'com.google.firebase:firebase-appcheck-debug', 'com.google.firebase:firebase-appcheck-playintegrity'], - 'play_services' : ['com.google.android.gms:play-services-base:18.4.0'], + 'play_services' : ['com.google.android.gms:play-services-base:18.5.0'], 'analytics' : ['com.google.firebase:firebase-analytics'], 'auth' : ['com.google.firebase:firebase-auth'], 'database' : ['com.google.firebase:firebase-database'], @@ -159,7 +159,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') } for (String lib : firebaseCpp.dependencies.libSet) { // Generate and include the proguard file diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile index 623fc24da5..cc2b93c7db 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, '13.0' - pod 'Firebase/Analytics', '10.25.0' + pod 'Firebase/Analytics', '10.28.1' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Analytics', '10.25.0' + pod 'Firebase/Analytics', '10.28.1' end post_install do |installer| diff --git a/analytics/ios_headers/FIREventNames.h b/analytics/ios_headers/FIREventNames.h index 6fcd8c28fd..cdab3ebab4 100644 --- a/analytics/ios_headers/FIREventNames.h +++ b/analytics/ios_headers/FIREventNames.h @@ -1,6 +1,6 @@ // Copyright 2024 Google LLC -// Copied from Firebase Analytics iOS SDK 10.25.0. +// Copied from Firebase Analytics iOS SDK 10.28.1. /// @file FIREventNames.h /// diff --git a/analytics/ios_headers/FIRParameterNames.h b/analytics/ios_headers/FIRParameterNames.h index 357fd600ec..4f60b2f9dc 100644 --- a/analytics/ios_headers/FIRParameterNames.h +++ b/analytics/ios_headers/FIRParameterNames.h @@ -1,6 +1,6 @@ // Copyright 2024 Google LLC -// Copied from Firebase Analytics iOS SDK 10.25.0. +// Copied from Firebase Analytics iOS SDK 10.28.1. /// @file FIRParameterNames.h /// diff --git a/analytics/ios_headers/FIRUserPropertyNames.h b/analytics/ios_headers/FIRUserPropertyNames.h index 56bcf776fd..f7af176e5b 100644 --- a/analytics/ios_headers/FIRUserPropertyNames.h +++ b/analytics/ios_headers/FIRUserPropertyNames.h @@ -1,6 +1,6 @@ // Copyright 2024 Google LLC -// Copied from Firebase Analytics iOS SDK 10.25.0. +// Copied from Firebase Analytics iOS SDK 10.28.1. /// @file FIRUserPropertyNames.h /// diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index 7edb61108c..7cd22afb7f 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -50,7 +50,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-analytics' } diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index d93916c1b0..19dec0345f 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -53,9 +53,9 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-analytics' - implementation 'com.google.android.gms:play-services-base:18.4.0' + implementation 'com.google.android.gms:play-services-base:18.5.0' implementation project(':app:app_resources') } diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile index a87700f7e6..5be3f21f65 100644 --- a/app/integration_test/Podfile +++ b/app/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '13.0' use_frameworks! :linkage => :static target 'integration_test' do - pod 'Firebase/Analytics', '10.25.0' + pod 'Firebase/Analytics', '10.28.1' end post_install do |installer| diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index 55d3f65fb8..6c893215db 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-dynamic-links' implementation project(':app:app_resources') diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index b1f0c1785d..41fc49625e 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-appcheck' } diff --git a/app_check/integration_test/Podfile b/app_check/integration_test/Podfile index 01cc2bf297..d17e04dc72 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, '13.0' - pod 'Firebase/AppCheck', '10.25.0' - pod 'Firebase/Database', '10.25.0' - pod 'Firebase/Auth', '10.25.0' - pod 'Firebase/Storage', '10.25.0' - pod 'Firebase/Functions', '10.25.0' + pod 'Firebase/AppCheck', '10.28.1' + pod 'Firebase/Database', '10.28.1' + pod 'Firebase/Auth', '10.28.1' + pod 'Firebase/Storage', '10.28.1' + pod 'Firebase/Functions', '10.28.1' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/AppCheck', '10.25.0' - pod 'Firebase/Database', '10.25.0' - pod 'Firebase/Auth', '10.25.0' - pod 'Firebase/Storage', '10.25.0' - pod 'Firebase/Functions', '10.25.0' + pod 'Firebase/AppCheck', '10.28.1' + pod 'Firebase/Database', '10.28.1' + pod 'Firebase/Auth', '10.28.1' + pod 'Firebase/Storage', '10.28.1' + pod 'Firebase/Functions', '10.28.1' end post_install do |installer| diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index f3f1500188..96f229908a 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-auth' implementation project(':app:app_resources') diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile index 93df932bfd..bd89bb51a5 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, '13.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Auth', '10.28.1' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Auth', '10.28.1' end post_install do |installer| diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index cad3404dbc..0d432f8d8e 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.25.0) +set(version CocoaPods-10.28.1) function(GetReleasedDep) message("Getting released firebase-ios-sdk @ ${version}") diff --git a/cpp_sdk_version.json b/cpp_sdk_version.json index a44408e9ed..aa00031b76 100644 --- a/cpp_sdk_version.json +++ b/cpp_sdk_version.json @@ -1,5 +1,5 @@ { - "released": "12.0.0", - "stable": "12.0.0", - "head": "12.0.0" + "released": "12.1.0", + "stable": "12.1.0", + "head": "12.1.0" } diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index 96ee2b4e6b..d75ae209d8 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -45,7 +45,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-database' //implementation project(':app:app_resources') diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile index 1ce27b882f..557e9eaa0c 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, '13.0' - pod 'Firebase/Database', '10.25.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Database', '10.28.1' + pod 'Firebase/Auth', '10.28.1' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Database', '10.25.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Database', '10.28.1' + pod 'Firebase/Auth', '10.28.1' end post_install do |installer| diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile index 0b46900b4c..237e58d4e6 100644 --- a/dynamic_links/integration_test/Podfile +++ b/dynamic_links/integration_test/Podfile @@ -5,7 +5,7 @@ use_frameworks! :linkage => :static target 'integration_test' do platform :ios, '13.0' - pod 'Firebase/DynamicLinks', '10.25.0' + pod 'Firebase/DynamicLinks', '10.28.1' end post_install do |installer| diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index 63ba21a1b6..6cc43bd3ae 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -53,7 +53,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-firestore' } diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile index 35832a90ad..fa8f9fe252 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, '13.0' - pod 'Firebase/Firestore', '10.25.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Firestore', '10.28.1' + pod 'Firebase/Auth', '10.28.1' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Firestore', '10.25.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Firestore', '10.28.1' + pod 'Firebase/Auth', '10.28.1' end post_install do |installer| diff --git a/firestore/integration_test_internal/Podfile b/firestore/integration_test_internal/Podfile index 7561273ffb..f43b5d970a 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, '13.0' - pod 'Firebase/Firestore', '10.25.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Firestore', '10.28.1' + pod 'Firebase/Auth', '10.28.1' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Firestore', '10.25.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Firestore', '10.28.1' + pod 'Firebase/Auth', '10.28.1' end post_install do |installer| diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile index 692253dba9..9fa495b0d3 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, '13.0' - pod 'Firebase/Functions', '10.25.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Functions', '10.28.1' + pod 'Firebase/Auth', '10.28.1' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Functions', '10.25.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Functions', '10.28.1' + pod 'Firebase/Auth', '10.28.1' end post_install do |installer| diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index 06c4e36ee4..0598c018ef 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -50,7 +50,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.android.gms:play-services-ads:23.0.0' implementation 'com.google.android.ump:user-messaging-platform:2.2.0' diff --git a/gma/integration_test/Podfile b/gma/integration_test/Podfile index e07e6a117d..3f35ccaa75 100644 --- a/gma/integration_test/Podfile +++ b/gma/integration_test/Podfile @@ -5,7 +5,7 @@ use_frameworks! :linkage => :static target 'integration_test' do platform :ios, '13.0' - pod 'Firebase/CoreOnly', '10.25.0' + pod 'Firebase/CoreOnly', '10.28.1' pod 'Google-Mobile-Ads-SDK', '11.2.0' pod 'GoogleUserMessagingPlatform', '2.3.0' end diff --git a/gma/src/include/firebase/gma.h b/gma/src/include/firebase/gma.h index eca1666a6a..0d95f536f5 100644 --- a/gma/src/include/firebase/gma.h +++ b/gma/src/include/firebase/gma.h @@ -55,12 +55,32 @@ template class Future { // Empty class (used for documentation only). }; + +/// @brief Firebase App class. For more information, see the Firebase +/// C++ SDK documentation. +class App { + // Empty class (used for documentation only). +}; + #endif // defined(DOXYGEN_ADMOB) /// @brief API for Google Mobile Ads with Firebase. /// /// The GMA API allows you to load and display mobile ads using the Google /// Mobile Ads SDK. Each ad format has its own header file. +/// +/// @deprecated **The Google Mobile Ads (GMA) C++ SDK is _deprecated_ as of June +/// 17, 2024 and should not be adopted in projects that don't already use it. It +/// will enter _End-of-Maintenance (EoM)_ on June 17, 2025. Note that versions +/// of the SDK released before the EoM date will continue to function, but no +/// further bug fixes or changes will be released after the EoM date.** +/// +/// Instead of the Google Mobile Ads C++ SDK, consider using the +/// [iOS](/docs/admob/ios/quick-start) and +/// [Android](/docs/admob/android/quick-start) SDKs from AdMob. For support, +/// reach out to the [Google Mobile Ads SDK Technical +/// Forum](https://groups.google.com/g/google-admob-ads-sdk). namespace gma { /// Initializes Google Mobile Ads (GMA) via Firebase. @@ -78,7 +98,13 @@ namespace gma { /// @return If init_result_out is kInitResultSuccess, this Future will contain /// the initialization status of each adapter once initialization is complete. /// Otherwise, the returned Future will have kFutureStatusInvalid. -Future Initialize( +/// +/// @deprecated The Google Mobile Ads C++ SDK is now deprecated. Please see +/// the [SDK reference +/// documentation]( +/// /admob/cpp/reference/namespace/firebase/gma) +/// for more information. +FIREBASE_DEPRECATED Future Initialize( const ::firebase::App& app, InitResult* init_result_out = nullptr); #if FIREBASE_PLATFORM_ANDROID || defined(DOXYGEN) @@ -107,7 +133,11 @@ Future Initialize( /// @return If init_result_out is kInitResultSuccess, this Future will contain /// the initialization status of each adapter once initialization is complete. /// Otherwise, the returned Future will have kFutureStatusInvalid. -Future Initialize( +/// +/// @deprecated The Google Mobile Ads C++ SDK is now deprecated. Please see +/// https://developers.google.com/admob/cpp/reference/namespace/firebase/gma +/// for more information. +FIREBASE_DEPRECATED Future Initialize( JNIEnv* jni_env, jobject activity, InitResult* init_result_out = nullptr); #endif // defined(__ANDROID__) || defined(DOXYGEN) @@ -126,7 +156,11 @@ Future Initialize( /// will contain the initialization status of each adapter once initialization /// is complete. Otherwise, the returned Future will have /// kFutureStatusInvalid. -Future Initialize( +/// +/// @deprecated The Google Mobile Ads C++ SDK is now deprecated. Please see +/// https://developers.google.com/admob/cpp/reference/namespace/firebase/gma +/// for more information. +FIREBASE_DEPRECATED Future Initialize( InitResult* init_result_out = nullptr); #endif // !defined(__ANDROID__) || defined(DOXYGEN) diff --git a/gma/src/include/firebase/gma/ad_view.h b/gma/src/include/firebase/gma/ad_view.h index b2a1cba24d..d2d73db67d 100644 --- a/gma/src/include/firebase/gma/ad_view.h +++ b/gma/src/include/firebase/gma/ad_view.h @@ -63,6 +63,10 @@ struct BoundingBox; /// ad_view->LoadAd(your_ad_request); /// } /// @endcode +/// +/// @deprecated The Google Mobile Ads C++ SDK is now deprecated. Please see +/// https://developers.google.com/admob/cpp/reference/namespace/firebase/gma +/// for more information. class AdView { public: /// The possible screen positions for a @ref AdView, configured via @@ -86,7 +90,7 @@ class AdView { /// Creates an uninitialized @ref AdView object. /// @ref Initialize must be called before the object is used. - AdView(); + FIREBASE_DEPRECATED AdView(); ~AdView(); @@ -94,12 +98,13 @@ class AdView { /// @param[in] parent The platform-specific UI element that will host the ad. /// @param[in] ad_unit_id The ad unit ID to use when requesting ads. /// @param[in] size The desired ad size for the ad. - Future Initialize(AdParent parent, const char* ad_unit_id, - const AdSize& size); + FIREBASE_DEPRECATED Future Initialize(AdParent parent, + const char* ad_unit_id, + const AdSize& size); /// Returns a @ref Future that has the status of the last call to /// @ref Initialize. - Future InitializeLastResult() const; + FIREBASE_DEPRECATED Future InitializeLastResult() const; /// Begins an asynchronous request for an ad. If successful, the ad will /// automatically be displayed in the AdView. diff --git a/gma/src/include/firebase/gma/interstitial_ad.h b/gma/src/include/firebase/gma/interstitial_ad.h index 4680537178..4173209f42 100644 --- a/gma/src/include/firebase/gma/interstitial_ad.h +++ b/gma/src/include/firebase/gma/interstitial_ad.h @@ -69,21 +69,25 @@ class InterstitialAdInternal; /// interstitial->Show(); /// } /// @endcode +/// +/// @deprecated The Google Mobile Ads C++ SDK is now deprecated. Please see +/// https://developers.google.com/admob/cpp/reference/namespace/firebase/gma +/// for more information. class InterstitialAd { public: /// Creates an uninitialized @ref InterstitialAd object. /// @ref Initialize must be called before the object is used. - InterstitialAd(); + FIREBASE_DEPRECATED InterstitialAd(); ~InterstitialAd(); /// Initialize the @ref InterstitialAd object. /// @param[in] parent The platform-specific UI element that will host the ad. - Future Initialize(AdParent parent); + FIREBASE_DEPRECATED Future Initialize(AdParent parent); /// Returns a @ref Future containing the status of the last call to /// @ref Initialize. - Future InitializeLastResult() const; + FIREBASE_DEPRECATED Future InitializeLastResult() const; /// Begins an asynchronous request for an ad. /// diff --git a/gma/src/include/firebase/gma/rewarded_ad.h b/gma/src/include/firebase/gma/rewarded_ad.h index a3c5431486..6aaafbb798 100644 --- a/gma/src/include/firebase/gma/rewarded_ad.h +++ b/gma/src/include/firebase/gma/rewarded_ad.h @@ -71,6 +71,10 @@ class RewardedAdInternal; /// rewarded->Show(&my_user_earned_reward_listener); /// } /// @endcode +/// +/// @deprecated The Google Mobile Ads C++ SDK is now deprecated. Please see +/// https://developers.google.com/admob/cpp/reference/namespace/firebase/gma +/// for more information. class RewardedAd { public: /// Options for RewardedAd server-side verification callbacks. Set options on @@ -86,17 +90,17 @@ class RewardedAd { /// Creates an uninitialized @ref RewardedAd object. /// @ref Initialize must be called before the object is used. - RewardedAd(); + FIREBASE_DEPRECATED RewardedAd(); ~RewardedAd(); /// Initialize the @ref RewardedAd object. /// @param[in] parent The platform-specific UI element that will host the ad. - Future Initialize(AdParent parent); + FIREBASE_DEPRECATED Future Initialize(AdParent parent); /// Returns a @ref Future containing the status of the last call to /// @ref Initialize. - Future InitializeLastResult() const; + FIREBASE_DEPRECATED Future InitializeLastResult() const; /// Begins an asynchronous request for an ad. /// diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile index c5d63ddfbe..4b7eda38f0 100644 --- a/installations/integration_test/Podfile +++ b/installations/integration_test/Podfile @@ -5,8 +5,8 @@ use_frameworks! :linkage => :static target 'integration_test' do platform :ios, '13.0' - pod 'Firebase/Analytics', '10.25.0' - pod 'Firebase/Installations', '10.25.0' + pod 'Firebase/Analytics', '10.28.1' + pod 'Firebase/Installations', '10.28.1' end post_install do |installer| diff --git a/ios_pod/Podfile b/ios_pod/Podfile index 84414ddd0c..12540faf0a 100644 --- a/ios_pod/Podfile +++ b/ios_pod/Podfile @@ -3,22 +3,22 @@ platform :ios, '13.0' use_frameworks! target 'GetPods' do - pod 'Firebase/Core', '10.25.0' + pod 'Firebase/Core', '10.28.1' pod 'Google-Mobile-Ads-SDK', '11.2.0' pod 'GoogleUserMessagingPlatform', '2.3.0' - pod 'Firebase/Analytics', '10.25.0' - pod 'Firebase/AppCheck', '10.25.0' - pod 'Firebase/Auth', '10.25.0' - pod 'Firebase/Crashlytics', '10.25.0' - pod 'Firebase/Database', '10.25.0' - pod 'Firebase/DynamicLinks', '10.25.0' - pod 'Firebase/Firestore', '10.25.0' - pod 'Firebase/Functions', '10.25.0' - pod 'Firebase/Installations', '10.25.0' - pod 'Firebase/Messaging', '10.25.0' - pod 'Firebase/RemoteConfig', '10.25.0' - pod 'Firebase/Storage', '10.25.0' + pod 'Firebase/Analytics', '10.28.1' + pod 'Firebase/AppCheck', '10.28.1' + pod 'Firebase/Auth', '10.28.1' + pod 'Firebase/Crashlytics', '10.28.1' + pod 'Firebase/Database', '10.28.1' + pod 'Firebase/DynamicLinks', '10.28.1' + pod 'Firebase/Firestore', '10.28.1' + pod 'Firebase/Functions', '10.28.1' + pod 'Firebase/Installations', '10.28.1' + pod 'Firebase/Messaging', '10.28.1' + pod 'Firebase/RemoteConfig', '10.28.1' + pod 'Firebase/Storage', '10.28.1' end diff --git a/messaging/integration_test/Podfile b/messaging/integration_test/Podfile index dd70df720b..e819022057 100644 --- a/messaging/integration_test/Podfile +++ b/messaging/integration_test/Podfile @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static target 'integration_test' do platform :ios, '13.0' - pod 'Firebase/Messaging', '10.25.0' - pod 'Firebase/Functions', '10.25.0' + pod 'Firebase/Messaging', '10.28.1' + pod 'Firebase/Functions', '10.28.1' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Messaging', '10.25.0' - pod 'Firebase/Functions', '10.25.0' + pod 'Firebase/Messaging', '10.28.1' + pod 'Firebase/Functions', '10.28.1' end post_install do |installer| diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index 8eb9292ffd..3121a3148a 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -59,7 +59,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-messaging' implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0' diff --git a/messaging/src/ios/messaging.mm b/messaging/src/ios/messaging.mm index 5a44264bfc..3029bc21c0 100644 --- a/messaging/src/ios/messaging.mm +++ b/messaging/src/ios/messaging.mm @@ -906,11 +906,11 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)notificationCenter #endif ::firebase::messaging::g_message_notification_opened = true; ::firebase::messaging::NotifyApplicationAndServiceOfMessage(userInfo); - id user_delegate = ::firebase::messaging::g_user_delegate; - [user_delegate userNotificationCenter:notificationCenter - didReceiveNotificationResponse:response - withCompletionHandler:completionHandler]; } + id user_delegate = ::firebase::messaging::g_user_delegate; + [user_delegate userNotificationCenter:notificationCenter + didReceiveNotificationResponse:response + withCompletionHandler:completionHandler]; } #endif // FIREBASE_PLATFORM_IOS diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle index bf1cbbc2ff..c076938eaa 100644 --- a/release_build_files/Android/firebase_dependencies.gradle +++ b/release_build_files/Android/firebase_dependencies.gradle @@ -20,7 +20,7 @@ def firebaseDependenciesMap = [ 'app_check' : ['com.google.firebase:firebase-appcheck', 'com.google.firebase:firebase-appcheck-debug', 'com.google.firebase:firebase-appcheck-playintegrity'], - 'play_services' : ['com.google.android.gms:play-services-base:18.4.0'], + 'play_services' : ['com.google.android.gms:play-services-base:18.5.0'], 'analytics' : ['com.google.firebase:firebase-analytics'], 'auth' : ['com.google.firebase:firebase-auth'], 'database' : ['com.google.firebase:firebase-database'], @@ -132,7 +132,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') } for (String lib : firebaseCpp.dependencies.libSet) { // Messaging includes an aar, which to be depended on properly requires diff --git a/release_build_files/readme.md b/release_build_files/readme.md index fb3f8972e6..f0ba0827df 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -86,7 +86,7 @@ distributed as part of the core Firebase Feature | Required Libraries and Gradle Packages -------------------------- | -------------------------------------- -All Firebase SDKs | platform(com.google.firebase:firebase-bom:33.0.0) +All Firebase SDKs | platform(com.google.firebase:firebase-bom:33.1.1) | | (Android Bill of Materials) Firebase Analytics | libfirebase_analytics.a | | libfirebase_app.a @@ -174,7 +174,7 @@ Firebase Storage | libfirebase_storage.a | | (Maven package) | | com.google.firebase:firebase-auth | | (Maven package) -Google Play services module| com.google.android.gms:play-services-base:18.4.0 +Google Play services module| com.google.android.gms:play-services-base:18.5.0 | | (Maven package) The Firebase C++ SDK uses an Android BoM (Bill of Materials) to specify a single @@ -230,50 +230,50 @@ Feature | Required Frameworks and Cocoapods -------------------------- | --------------------------------------- Firebase Analytics | firebase_analytics.xcframework | | firebase.xcframework -| | Firebase/Analytics Cocoapod (10.25.0) +| | Firebase/Analytics Cocoapod (10.28.1) Firebase App Check | firebase_app_check.xcframework | | firebase.xcframework -| | Firebase/AppCheck Cocoapod (10.25.0) +| | Firebase/AppCheck Cocoapod (10.28.1) Firebase Authentication | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Auth Cocoapod (10.25.0) +| | Firebase/Auth Cocoapod (10.28.1) Firebase Dynamic Links | firebase_dynamic_links.xcframework | | firebase.xcframework -| | Firebase/DynamicLinks Cocoapod (10.25.0) +| | Firebase/DynamicLinks Cocoapod (10.28.1) Cloud Firestore | firebase_firestore.xcframework | | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Firestore Cocoapod (10.25.0) -| | Firebase/Auth Cocoapod (10.25.0) +| | Firebase/Firestore Cocoapod (10.28.1) +| | Firebase/Auth Cocoapod (10.28.1) Firebase Functions | firebase_functions.xcframework | | firebase_auth.xcframework (optional) | | firebase.xcframework -| | Firebase/Functions Cocoapod (10.25.0) -| | Firebase/Auth Cocoapod (10.25.0) +| | Firebase/Functions Cocoapod (10.28.1) +| | Firebase/Auth Cocoapod (10.28.1) Google Mobile Ads | firebase_gma.xcframework | | firebase.xcframework -| | Firebase/CoreOnly Cocoapod (10.25.0) +| | Firebase/CoreOnly Cocoapod (10.28.1) | | Google-Mobile-Ads-SDK Cocoapod (11.2.0) | | GoogleUserMessagingPlatform Cocoapod (2.3.0) Firebase Installations | firebase_installations.xcframework | | firebase.xcframework -| | FirebaseInstallations Cocoapod (10.25.0) +| | FirebaseInstallations Cocoapod (10.28.0) Firebase Cloud Messaging | firebase_messaging.xcframework | | firebase.xcframework -| | Firebase/Messaging Cocoapod (10.25.0) +| | Firebase/Messaging Cocoapod (10.28.1) Firebase Realtime Database | firebase_database.xcframework | | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Database Cocoapod (10.25.0) -| | Firebase/Auth Cocoapod (10.25.0) +| | Firebase/Database Cocoapod (10.28.1) +| | Firebase/Auth Cocoapod (10.28.1) Firebase Remote Config | firebase_remote_config.xcframework | | firebase.xcframework -| | Firebase/RemoteConfig Cocoapod (10.25.0) +| | Firebase/RemoteConfig Cocoapod (10.28.1) Firebase Storage | firebase_storage.xcframework | | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Storage Cocoapod (10.25.0) -| | Firebase/Auth Cocoapod (10.25.0) +| | Firebase/Storage Cocoapod (10.28.1) +| | Firebase/Auth Cocoapod (10.28.1) 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 @@ -293,50 +293,50 @@ Feature | Required Libraries and Cocoapods -------------------------- | ----------------------------------------- Firebase Analytics | libfirebase_analytics.a | | libfirebase_app.a -| | Firebase/Analytics Cocoapod (10.25.0) +| | Firebase/Analytics Cocoapod (10.28.1) Firebase App Check | firebase_app_check.xcframework | | firebase.xcframework -| | Firebase/AppCheck Cocoapod (10.25.0) +| | Firebase/AppCheck Cocoapod (10.28.1) Firebase Authentication | libfirebase_auth.a | | libfirebase_app.a -| | Firebase/Auth Cocoapod (10.25.0) +| | Firebase/Auth Cocoapod (10.28.1) Firebase Dynamic Links | libfirebase_dynamic_links.a | | libfirebase_app.a -| | Firebase/DynamicLinks Cocoapod (10.25.0) +| | Firebase/DynamicLinks Cocoapod (10.28.1) Cloud Firestore | libfirebase_firestore.a | | libfirebase_app.a | | libfirebase_auth.a -| | Firebase/Firestore Cocoapod (10.25.0) -| | Firebase/Auth Cocoapod (10.25.0) +| | Firebase/Firestore Cocoapod (10.28.1) +| | Firebase/Auth Cocoapod (10.28.1) Firebase Functions | libfirebase_functions.a | | libfirebase_app.a | | libfirebase_auth.a (optional) -| | Firebase/Functions Cocoapod (10.25.0) -| | Firebase/Auth Cocoapod (10.25.0) +| | Firebase/Functions Cocoapod (10.28.1) +| | Firebase/Auth Cocoapod (10.28.1) Google Mobile Ads | libfirebase_gma.a | | libfirebase_app.a -| | Firebase/CoreOnly Cocoapod (10.25.0) +| | Firebase/CoreOnly Cocoapod (10.28.1) | | Google-Mobile-Ads-SDK Cocoapod (11.2.0) | | GoogleUserMessagingPlatform Cocoapod (2.3.0) Firebase Installations | libfirebase_installations.a | | libfirebase_app.a -| | FirebaseInstallations Cocoapod (10.25.0) +| | FirebaseInstallations Cocoapod (10.28.0) Firebase Cloud Messaging | libfirebase_messaging.a | | libfirebase_app.a -| | Firebase/CloudMessaging Cocoapod (10.25.0) +| | Firebase/CloudMessaging Cocoapod (10.28.1) Firebase Realtime Database | libfirebase_database.a | | libfirebase_app.a | | libfirebase_auth.a -| | Firebase/Database Cocoapod (10.25.0) -| | Firebase/Auth Cocoapod (10.25.0) +| | Firebase/Database Cocoapod (10.28.1) +| | Firebase/Auth Cocoapod (10.28.1) Firebase Remote Config | libfirebase_remote_config.a | | libfirebase_app.a -| | Firebase/RemoteConfig Cocoapod (10.25.0) +| | Firebase/RemoteConfig Cocoapod (10.28.1) Firebase Storage | libfirebase_storage.a | | libfirebase_app.a | | libfirebase_auth.a -| | Firebase/Storage Cocoapod (10.25.0) -| | Firebase/Auth Cocoapod (10.25.0) +| | Firebase/Storage Cocoapod (10.28.1) +| | Firebase/Auth Cocoapod (10.28.1) 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 @@ -631,13 +631,19 @@ workflow use only during the development of your app, not for publicly shipping code. ## Release Notes -### Upcoming Release +### 12.1.0 - Changes + - General (Android): Update to Firebase Android BoM version 33.1.1. + - General (iOS): Update to Firebase Cocoapods version 10.28.1. - Analytics (iOS): Add support for `InitiateOnDeviceConversionMeasurementWithHashedEmailAddress` and `InitiateOnDeviceConversionMeasurementWithHashedPhoneNumber`. - - Messaging (Android): Addressed potential race condition on receiving + - GMA: The GMA C++ SDK is now deprecated. For more information, see the + [SDK documentation](https://developers.google.com/admob/cpp/sdk). + - Messaging (Android): Fixed a potential race condition on receiving messages after cleanup. + - Messaging (iOS): Fixed an issue with notifications being lost if they + were received before Firebase Messaging was initialized. ### 12.0.0 - Changes diff --git a/remote_config/integration_test/Podfile b/remote_config/integration_test/Podfile index 8be5b9df52..6898897435 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, '13.0' - pod 'Firebase/RemoteConfig', '10.25.0' + pod 'Firebase/RemoteConfig', '10.28.1' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/RemoteConfig', '10.25.0' + pod 'Firebase/RemoteConfig', '10.28.1' end post_install do |installer| diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index 3b50188258..5da476ff93 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-config' } diff --git a/scripts/gha-encrypted/analytics/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/analytics/GoogleService-Info.plist.gpg index 41b2b8de63..a7fad00c75 100644 Binary files a/scripts/gha-encrypted/analytics/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/analytics/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/analytics/google-services.json.gpg b/scripts/gha-encrypted/analytics/google-services.json.gpg index cc73d92f29..8e2a09d363 100644 Binary files a/scripts/gha-encrypted/analytics/google-services.json.gpg and b/scripts/gha-encrypted/analytics/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/app/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/app/GoogleService-Info.plist.gpg index a3403e4542..c23fa61c31 100644 Binary files a/scripts/gha-encrypted/app/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/app/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/app/google-services.json.gpg b/scripts/gha-encrypted/app/google-services.json.gpg index b244d8ffcd..05ef8e1d38 100644 Binary files a/scripts/gha-encrypted/app/google-services.json.gpg and b/scripts/gha-encrypted/app/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/app_check/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/app_check/GoogleService-Info.plist.gpg index a1df2ac0c8..7147f4df2a 100644 Binary files a/scripts/gha-encrypted/app_check/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/app_check/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/app_check/app_check_token.txt.gpg b/scripts/gha-encrypted/app_check/app_check_token.txt.gpg index 86502b1de0..6c5dd80f56 100644 Binary files a/scripts/gha-encrypted/app_check/app_check_token.txt.gpg and b/scripts/gha-encrypted/app_check/app_check_token.txt.gpg differ diff --git a/scripts/gha-encrypted/app_check/google-services.json.gpg b/scripts/gha-encrypted/app_check/google-services.json.gpg index c69f5d33d0..4c433f4e03 100644 Binary files a/scripts/gha-encrypted/app_check/google-services.json.gpg and b/scripts/gha-encrypted/app_check/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/auth/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/auth/GoogleService-Info.plist.gpg index c3d4f09eee..896aeabf09 100644 Binary files a/scripts/gha-encrypted/auth/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/auth/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/auth/google-services.json.gpg b/scripts/gha-encrypted/auth/google-services.json.gpg index 750b8049c5..9f86b0a3f0 100644 Binary files a/scripts/gha-encrypted/auth/google-services.json.gpg and b/scripts/gha-encrypted/auth/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/database/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/database/GoogleService-Info.plist.gpg index dee0488e07..9d7f62a886 100644 Binary files a/scripts/gha-encrypted/database/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/database/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/database/google-services.json.gpg b/scripts/gha-encrypted/database/google-services.json.gpg index fea24ec816..a9421faae4 100644 Binary files a/scripts/gha-encrypted/database/google-services.json.gpg and b/scripts/gha-encrypted/database/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/dynamic_links/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/dynamic_links/GoogleService-Info.plist.gpg index de36a45f3a..7d577bef1b 100644 Binary files a/scripts/gha-encrypted/dynamic_links/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/dynamic_links/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/dynamic_links/google-services.json.gpg b/scripts/gha-encrypted/dynamic_links/google-services.json.gpg index 65e64171ce..0db36dbf67 100644 Binary files a/scripts/gha-encrypted/dynamic_links/google-services.json.gpg and b/scripts/gha-encrypted/dynamic_links/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/dynamic_links/uri_prefix.txt.gpg b/scripts/gha-encrypted/dynamic_links/uri_prefix.txt.gpg index 8e0a86d83e..4806b1830e 100644 Binary files a/scripts/gha-encrypted/dynamic_links/uri_prefix.txt.gpg and b/scripts/gha-encrypted/dynamic_links/uri_prefix.txt.gpg differ diff --git a/scripts/gha-encrypted/firestore/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/firestore/GoogleService-Info.plist.gpg index 10b767212b..4ae5fb4154 100644 Binary files a/scripts/gha-encrypted/firestore/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/firestore/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/firestore/google-services.json.gpg b/scripts/gha-encrypted/firestore/google-services.json.gpg index e68131024e..9807334757 100644 Binary files a/scripts/gha-encrypted/firestore/google-services.json.gpg and b/scripts/gha-encrypted/firestore/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/functions/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/functions/GoogleService-Info.plist.gpg index 5d5fd9d237..6ed5b9d8f0 100644 Binary files a/scripts/gha-encrypted/functions/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/functions/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/functions/google-services.json.gpg b/scripts/gha-encrypted/functions/google-services.json.gpg index 38bbb36bc1..c9edac069d 100644 Binary files a/scripts/gha-encrypted/functions/google-services.json.gpg and b/scripts/gha-encrypted/functions/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/gcs_key_file.json.gpg b/scripts/gha-encrypted/gcs_key_file.json.gpg index 15fbf850d2..d792ec8bb6 100644 Binary files a/scripts/gha-encrypted/gcs_key_file.json.gpg and b/scripts/gha-encrypted/gcs_key_file.json.gpg differ diff --git a/scripts/gha-encrypted/gma/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/gma/GoogleService-Info.plist.gpg index c43db0afa2..65b703ce7e 100644 Binary files a/scripts/gha-encrypted/gma/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/gma/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/gma/google-services.json.gpg b/scripts/gha-encrypted/gma/google-services.json.gpg index c4fb97533c..c46f596425 100644 Binary files a/scripts/gha-encrypted/gma/google-services.json.gpg and b/scripts/gha-encrypted/gma/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/installations/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/installations/GoogleService-Info.plist.gpg index bd3777a19a..ec47259fe0 100644 Binary files a/scripts/gha-encrypted/installations/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/installations/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/installations/google-services.json.gpg b/scripts/gha-encrypted/installations/google-services.json.gpg index 87f969e34a..ca21cd1005 100644 Binary files a/scripts/gha-encrypted/installations/google-services.json.gpg and b/scripts/gha-encrypted/installations/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/messaging/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/messaging/GoogleService-Info.plist.gpg index fdbff29584..cf95c652d8 100644 Binary files a/scripts/gha-encrypted/messaging/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/messaging/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/messaging/google-services.json.gpg b/scripts/gha-encrypted/messaging/google-services.json.gpg index 60646cbdf9..8ad06ccf68 100644 Binary files a/scripts/gha-encrypted/messaging/google-services.json.gpg and b/scripts/gha-encrypted/messaging/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/remote_config/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/remote_config/GoogleService-Info.plist.gpg index 40e7cddc02..ea9dc94610 100644 Binary files a/scripts/gha-encrypted/remote_config/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/remote_config/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/remote_config/google-services.json.gpg b/scripts/gha-encrypted/remote_config/google-services.json.gpg index a62a8a6c1b..b9dd70a0f3 100644 Binary files a/scripts/gha-encrypted/remote_config/google-services.json.gpg and b/scripts/gha-encrypted/remote_config/google-services.json.gpg differ diff --git a/scripts/gha-encrypted/storage/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/storage/GoogleService-Info.plist.gpg index 06bc08010a..01d28ec9c6 100644 Binary files a/scripts/gha-encrypted/storage/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/storage/GoogleService-Info.plist.gpg differ diff --git a/scripts/gha-encrypted/storage/google-services.json.gpg b/scripts/gha-encrypted/storage/google-services.json.gpg index 481d6bd168..57ba134aa5 100644 Binary files a/scripts/gha-encrypted/storage/google-services.json.gpg and b/scripts/gha-encrypted/storage/google-services.json.gpg differ diff --git a/scripts/gha/restore_secrets.py b/scripts/gha/restore_secrets.py index 93aefcfd72..1c34010dd7 100644 --- a/scripts/gha/restore_secrets.py +++ b/scripts/gha/restore_secrets.py @@ -169,7 +169,8 @@ def _decrypt(encrypted_file, passphrase): encrypted_file], check=False, text=True, - capture_output=True) + capture_output=True, + encoding="cp1252") if result.returncode: # Remove any instances of the passphrase from error before logging it. raise RuntimeError(result.stderr.replace(passphrase, "****")) @@ -183,10 +184,14 @@ def _patch_reverse_id(service_plist_path): print("Attempting to patch reverse id in Info.plist") with open(service_plist_path, "rb") as f: service_plist = plistlib.load(f) - _patch_file( - path=os.path.join(os.path.dirname(service_plist_path), "Info.plist"), - placeholder="REPLACE_WITH_REVERSED_CLIENT_ID", - value=service_plist["REVERSED_CLIENT_ID"]) + + try: + _patch_file( + path=os.path.join(os.path.dirname(service_plist_path), "Info.plist"), + placeholder="REPLACE_WITH_REVERSED_CLIENT_ID", + value=service_plist["REVERSED_CLIENT_ID"]) + except KeyError as e: + print("No REVERSED_CLIENT_ID in plist, skipping.") def _patch_bundle_id(service_plist_path): diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile index d97a029981..33f9cb06a1 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, '13.0' - pod 'Firebase/Storage', '10.25.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Storage', '10.28.1' + pod 'Firebase/Auth', '10.28.1' end target 'integration_test_tvos' do platform :tvos, '12.0' - pod 'Firebase/Storage', '10.25.0' - pod 'Firebase/Auth', '10.25.0' + pod 'Firebase/Storage', '10.28.1' + pod 'Firebase/Auth', '10.28.1' end post_install do |installer| diff --git a/storage/integration_test/readme.md b/storage/integration_test/readme.md index 6b9efa6fcd..24f677cdfc 100644 --- a/storage/integration_test/readme.md +++ b/storage/integration_test/readme.md @@ -85,7 +85,7 @@ Building and Running the integration test the build settings. Scroll down to "Search Paths", and add your path to "Framework Search Paths". - In XCode, build & run the sample on an iOS device or simulator. - - The integration test has no interativity. The output of the app can be + - The integration test has no interactivity. The output of the app can be viewed via the console or on the device's display. In Xcode, select "View --> Debug Area --> Activate Console" from the menu to view the console. diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 064541bd70..4d5d251e6d 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-storage' }