Merge branch 'main' into orangepanda83-patch-2

firebase · Jun 26, 2024 · a6b12c9 · a6b12c9
2 parents 1af4690 + d170cb6
commit a6b12c9
Show file tree

Hide file tree

Showing 70 changed files with 198 additions and 140 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -55,12 +55,32 @@ template <typename ResultType>
 class Future {
   // Empty class (used for documentation only).
 };
+
+/// @brief Firebase App class. For more information, see the <a
+/// href="https://firebase.google.com/docs/reference/cpp/class/firebase/app">Firebase
+/// C++ SDK documentation</a>.
+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<AdapterInitializationStatus> 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<AdapterInitializationStatus> Initialize(
     const ::firebase::App& app, InitResult* init_result_out = nullptr);
 
 #if FIREBASE_PLATFORM_ANDROID || defined(DOXYGEN)
@@ -107,7 +133,11 @@ Future<AdapterInitializationStatus> 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<AdapterInitializationStatus> 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<AdapterInitializationStatus> Initialize(
     JNIEnv* jni_env, jobject activity, InitResult* init_result_out = nullptr);
 
 #endif  // defined(__ANDROID__) || defined(DOXYGEN)
@@ -126,7 +156,11 @@ Future<AdapterInitializationStatus> Initialize(
 /// will contain the initialization status of each adapter once initialization
 /// is complete. Otherwise, the returned Future will have
 /// <code>kFutureStatusInvalid</code>.
-Future<AdapterInitializationStatus> 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<AdapterInitializationStatus> Initialize(
     InitResult* init_result_out = nullptr);
 #endif  // !defined(__ANDROID__) || defined(DOXYGEN)