From 9da5a983ae027cc6c5cbf557134e2fe0bb095826 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 21 Jun 2024 13:35:34 -0700 Subject: [PATCH 1/5] Add deprecation warning to GMA initialization method. --- gma/src/include/firebase/gma.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gma/src/include/firebase/gma.h b/gma/src/include/firebase/gma.h index eca1666a6a..3b6aca1e42 100644 --- a/gma/src/include/firebase/gma.h +++ b/gma/src/include/firebase/gma.h @@ -78,7 +78,10 @@ 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 +/// https://developers.google.com/admob/cpp/sdk for more information. +FIREBASE_DEPRECATED Future Initialize( const ::firebase::App& app, InitResult* init_result_out = nullptr); #if FIREBASE_PLATFORM_ANDROID || defined(DOXYGEN) @@ -107,7 +110,10 @@ 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/sdk for more information. +FIREBASE_DEPRECATED Future Initialize( JNIEnv* jni_env, jobject activity, InitResult* init_result_out = nullptr); #endif // defined(__ANDROID__) || defined(DOXYGEN) @@ -126,7 +132,10 @@ 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/sdk for more information. +FIREBASE_DEPRECATED Future Initialize( InitResult* init_result_out = nullptr); #endif // !defined(__ANDROID__) || defined(DOXYGEN) From 33cd8dcfc345e1dffea147014ec5a98cc4e6bb20 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 21 Jun 2024 13:38:22 -0700 Subject: [PATCH 2/5] Add deprecation notices to the headers. --- gma/src/include/firebase/gma.h | 3 +++ gma/src/include/firebase/gma/ad_view.h | 9 ++++++--- gma/src/include/firebase/gma/interstitial_ad.h | 9 ++++++--- gma/src/include/firebase/gma/rewarded_ad.h | 9 ++++++--- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/gma/src/include/firebase/gma.h b/gma/src/include/firebase/gma.h index 3b6aca1e42..002bbf8125 100644 --- a/gma/src/include/firebase/gma.h +++ b/gma/src/include/firebase/gma.h @@ -61,6 +61,9 @@ class Future { /// /// 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 C++ SDK is now deprecated. Please see +/// https://developers.google.com/admob/cpp/sdk for more information. namespace gma { /// Initializes Google Mobile Ads (GMA) via Firebase. diff --git a/gma/src/include/firebase/gma/ad_view.h b/gma/src/include/firebase/gma/ad_view.h index b2a1cba24d..cb80221646 100644 --- a/gma/src/include/firebase/gma/ad_view.h +++ b/gma/src/include/firebase/gma/ad_view.h @@ -63,6 +63,9 @@ 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/sdk for more information. class AdView { public: /// The possible screen positions for a @ref AdView, configured via @@ -86,7 +89,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 +97,12 @@ 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, + 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..8db7acfd28 100644 --- a/gma/src/include/firebase/gma/interstitial_ad.h +++ b/gma/src/include/firebase/gma/interstitial_ad.h @@ -69,21 +69,24 @@ class InterstitialAdInternal; /// interstitial->Show(); /// } /// @endcode +/// +/// @deprecated The Google Mobile Ads C++ SDK is now deprecated. Please see +/// https://developers.google.com/admob/cpp/sdk 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..e2bf38a3e3 100644 --- a/gma/src/include/firebase/gma/rewarded_ad.h +++ b/gma/src/include/firebase/gma/rewarded_ad.h @@ -71,6 +71,9 @@ 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/sdk for more information. class RewardedAd { public: /// Options for RewardedAd server-side verification callbacks. Set options on @@ -86,17 +89,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. /// From 7c1137a5032f11dca3345699fea7edd835610cc5 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 21 Jun 2024 13:39:05 -0700 Subject: [PATCH 3/5] Format code. --- gma/src/include/firebase/gma/ad_view.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gma/src/include/firebase/gma/ad_view.h b/gma/src/include/firebase/gma/ad_view.h index cb80221646..a935e38ba1 100644 --- a/gma/src/include/firebase/gma/ad_view.h +++ b/gma/src/include/firebase/gma/ad_view.h @@ -97,8 +97,9 @@ 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. - FIREBASE_DEPRECATED 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. From 6c7d88cffdaab738e9ead76511511b87a5b8d697 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 24 Jun 2024 11:22:06 -0700 Subject: [PATCH 4/5] Add release note about GMA SDK. --- release_build_files/readme.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index fb3f8972e6..db4a3d9beb 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -631,11 +631,13 @@ workflow use only during the development of your app, not for publicly shipping code. ## Release Notes -### Upcoming Release +### 12.1.0 - Changes - Analytics (iOS): Add support for `InitiateOnDeviceConversionMeasurementWithHashedEmailAddress` and `InitiateOnDeviceConversionMeasurementWithHashedPhoneNumber`. + - GMA: The GMA C++ SDK is now deprecated. For more information, see the + [SDK documentation](https://developers.google.com/admob/cpp/sdk). - Messaging (Android): Addressed potential race condition on receiving messages after cleanup. From 6025b1f52c13aabbc926c624bd764b10464b49cb Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 24 Jun 2024 11:37:40 -0700 Subject: [PATCH 5/5] Rephrase slightly. --- release_build_files/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index db4a3d9beb..545bec5d69 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -638,7 +638,7 @@ code. `InitiateOnDeviceConversionMeasurementWithHashedPhoneNumber`. - GMA: The GMA C++ SDK is now deprecated. For more information, see the [SDK documentation](https://developers.google.com/admob/cpp/sdk). - - Messaging (Android): Addressed potential race condition on receiving + - Messaging (Android): Fixed a potential race condition on receiving messages after cleanup. ### 12.0.0