Update Android dependencies - Fri May 26 2023 (#1334)

* Update Android dependencies - Fri May 26 2023

### Android

- com.google.android.gms.play_services_ads → 22.1.0
- com.google.firebase.firebase_bom → 32.1.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/5095229650).

* Firestore: Call new method AggregateQuerySnapshot.createWithCount(), added in firebase/firebase-android-sdk#4922, instead of using the complex AggregateQuerySnapshot constructor (#1283)

---------

Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
Co-authored-by: Denver Coneybeare <dconeybe@google.com>

Author: 3 people

Android/firebase_dependencies.gradle

@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
   'firestore' : ['com.google.firebase:firebase-firestore'],
   'functions' : ['com.google.firebase:firebase-functions'],
-  'gma' : ['com.google.android.gms:play-services-ads:22.0.0'],
+  'gma' : ['com.google.android.gms:play-services-ads:22.1.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
   // Messaging has an additional local dependency to include.
@@ -158,7 +158,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:32.0.0')
+      implementation platform('com.google.firebase:firebase-bom:32.1.0')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file

app/app_resources/build.gradle

@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.0.0')
+  implementation platform('com.google.firebase:firebase-bom:32.1.0')
   implementation 'com.google.firebase:firebase-analytics'
 }
 

app/google_api_resources/build.gradle

@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.0.0')
+  implementation platform('com.google.firebase:firebase-bom:32.1.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-base:18.2.0'
   implementation project(':app:app_resources')

app/invites_resources/build.gradle

@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.0.0')
+  implementation platform('com.google.firebase:firebase-bom:32.1.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-dynamic-links'
   implementation project(':app:app_resources')

app_check/app_check_resources/build.gradle

@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.0.0')
+  implementation platform('com.google.firebase:firebase-bom:32.1.0')
   implementation 'com.google.firebase:firebase-appcheck'
 }
 

auth/auth_resources/build.gradle

@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.0.0')
+  implementation platform('com.google.firebase:firebase-bom:32.1.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-auth'
   implementation project(':app:app_resources')

database/database_resources/build.gradle

@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.0.0')
+  implementation platform('com.google.firebase:firebase-bom:32.1.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-database'
   //implementation project(':app:app_resources')

firestore/firestore_resources/build.gradle

@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.0.0')
+  implementation platform('com.google.firebase:firebase-bom:32.1.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-firestore'
 }

firestore/src/android/aggregate_query_snapshot_android.cc

@@ -34,30 +34,26 @@ using jni::StaticMethod;
 
 constexpr char kClassName[] =
     PROGUARD_KEEP_CLASS "com/google/firebase/firestore/AggregateQuerySnapshot";
-Constructor<Object> kConstructor(
-    "(Lcom/google/firebase/firestore/AggregateQuery;Ljava/util/Map;)V");
 Method<int64_t> kGetCount("getCount", "()J");
 Method<Object> kGetQuery("getQuery",
                          "()Lcom/google/firebase/firestore/AggregateQuery;");
 Method<int32_t> kHashCode("hashCode", "()I");
-
-constexpr char kHelperClassName[] = PROGUARD_KEEP_CLASS
-    "com/google/firebase/firestore/internal/cpp/AggregateQuerySnapshotHelper";
-StaticMethod<Object> kCreateConstructorArg(
-    "createAggregateQuerySnapshotConstructorArg", "(J)Ljava/util/Map;");
+StaticMethod<Object> kCreateWithCount(
+    "createWithCount",
+    "(Lcom/google/firebase/firestore/AggregateQuery;J)"
+    "Lcom/google/firebase/firestore/AggregateQuerySnapshot;");
 
 }  // namespace
 
 void AggregateQuerySnapshotInternal::Initialize(jni::Loader& loader) {
-  loader.LoadClass(kClassName, kConstructor, kGetCount, kGetQuery, kHashCode);
-  loader.LoadClass(kHelperClassName, kCreateConstructorArg);
+  loader.LoadClass(kClassName, kGetCount, kGetQuery, kHashCode,
+                   kCreateWithCount);
 }
 
 AggregateQuerySnapshot AggregateQuerySnapshotInternal::Create(
     Env& env, AggregateQueryInternal& aggregate_query_internal, int64_t count) {
-  Local<Object> snapshot_data = env.Call(kCreateConstructorArg, count);
   Local<Object> instance =
-      env.New(kConstructor, aggregate_query_internal.ToJava(), snapshot_data);
+      env.Call(kCreateWithCount, aggregate_query_internal.ToJava(), count);
   return aggregate_query_internal.firestore_internal()
       ->NewAggregateQuerySnapshot(env, instance);
 }