firebase · jonsimantov · Apr 21, 2023 · Apr 19, 2023 · Apr 20, 2023 · Apr 20, 2023
diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
@@ -29,7 +29,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:21.5.0'],
+  'gma' : ['com.google.android.gms:play-services-ads:22.0.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
   // Messaging has an additional local dependency to include.
@@ -163,7 +163,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:31.3.0')
+      implementation platform('com.google.firebase:firebase-bom:31.5.0')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file

diff --git a/admob/admob_resources/build.gradle b/admob/admob_resources/build.gradle
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-ads:19.8.0'
 }

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:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   implementation 'com.google.firebase:firebase-analytics'
 }
 

diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-base:18.2.0'
   implementation project(':app:app_resources')

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:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   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:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   implementation 'com.google.firebase:firebase-appcheck'
 }
 

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:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-auth'
   implementation project(':app:app_resources')

diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle
@@ -72,6 +72,9 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

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:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-database'
   //implementation project(':app:app_resources')

diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle
@@ -72,6 +72,9 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

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:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-firestore'
 }

diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle
@@ -73,6 +73,9 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle
@@ -73,6 +73,9 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
   lintOptions {
     abortOnError false
   }

diff --git a/firestore/src/android/aggregate_query_snapshot_android.cc b/firestore/src/android/aggregate_query_snapshot_android.cc
@@ -30,26 +30,34 @@ using jni::Env;
 using jni::Local;
 using jni::Method;
 using jni::Object;
+using jni::StaticMethod;
 
 constexpr char kClassName[] =
     PROGUARD_KEEP_CLASS "com/google/firebase/firestore/AggregateQuerySnapshot";
 Constructor<Object> kConstructor(
-    "(Lcom/google/firebase/firestore/AggregateQuery;J)V");
+    "(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;");
+
 }  // namespace
 
 void AggregateQuerySnapshotInternal::Initialize(jni::Loader& loader) {
   loader.LoadClass(kClassName, kConstructor, kGetCount, kGetQuery, kHashCode);
+  loader.LoadClass(kHelperClassName, kCreateConstructorArg);
 }
 
 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(), count);
+      env.New(kConstructor, aggregate_query_internal.ToJava(), snapshot_data);
   return aggregate_query_internal.firestore_internal()
       ->NewAggregateQuerySnapshot(env, instance);
 }

diff --git a/...ore/src_java/com/google/firebase/firestore/internal/cpp/AggregateQuerySnapshotHelper.java b/...ore/src_java/com/google/firebase/firestore/internal/cpp/AggregateQuerySnapshotHelper.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.firestore.internal.cpp;
+
+import com.google.firestore.v1.Value;
+import java.util.HashMap;
+import java.util.Map;
+
+public final class AggregateQuerySnapshotHelper {
+  private AggregateQuerySnapshotHelper() {}
+
+  /**
+   * Creates an object appropriate for specifying to the AggregateQuerySnapshot
+   * constructor that conveys the given "count" as the lone aggregate result.
+   *
+   * This class should be deleted and replaced with a proper mechanism once
+   * SUM/AVERAGE are ported to this SDK.
+   */
+  public static Map<String, Value> createAggregateQuerySnapshotConstructorArg(
+      long count) {
+    HashMap<String, Value> map = new HashMap<>();
+    map.put("count", Value.newBuilder().setIntegerValue(count).build());
+    return map;
+  }
+}
diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle
@@ -72,6 +72,9 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle
@@ -45,9 +45,9 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   implementation 'com.google.firebase:firebase-analytics'
-  implementation 'com.google.android.gms:play-services-ads:21.5.0'
+  implementation 'com.google.android.gms:play-services-ads:22.0.0'
 }
 
 afterEvaluate {

diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-messaging'
   implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'

diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle
@@ -29,7 +29,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:21.5.0'],
+  'gma' : ['com.google.android.gms:play-services-ads:22.0.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
   // Messaging has an additional local dependency to include.
@@ -136,7 +136,7 @@ project.afterEvaluate {
 
       // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:31.3.0')
+      implementation platform('com.google.firebase:firebase-bom:31.5.0')
     }
     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
@@ -87,7 +87,7 @@ distributed as part of the core Firebase
 
 Feature                    | Required Libraries and Gradle Packages
 -------------------------- | --------------------------------------
-All Firebase SDKs          | platform(com.google.firebase:firebase-bom:31.3.0)
+All Firebase SDKs          | platform(com.google.firebase:firebase-bom:31.5.0)
 |                          | (Android Bill of Materials)
 Firebase AdMob             | libfirebase_admob.a
 | (deprecated)             | libfirebase_app.a
@@ -133,7 +133,7 @@ Google Mobile Ads          | libfirebase_gma.a
 |                          | libfirebase_app.a
 |                          | com.google.firebase:firebase-analytics
 |                          | (Maven package)
-|                          | com.google.android.gms:play-services-ads:21.5.0
+|                          | com.google.android.gms:play-services-ads:22.0.0
 |                          | (Maven package)
 Firebase Installations     | libfirebase_installations.a
 |                          | libfirebase_app.a
@@ -146,7 +146,7 @@ Firebase Messaging         | libfirebase_messaging.a
 |                          | com.google.firebase:firebase-messaging
 |                          | (Maven package)
 |                          | libmessaging_java.jar (Android service)
-|                          | androidx.core:core:1.9.0  (Maven package)
+|                          | androidx.core:core:1.10.0  (Maven package)
 Firebase Realtime Database | libfirebase_database.a
 |                          | libfirebase_auth.a
 |                          | libfirebase_app.a
@@ -643,8 +643,10 @@ code.
 
 ## Release Notes
 ### Upcoming Release
--   10.8.0
+-   Changes
     - General (iOS): Update to Firebase Cocoapods version 10.8.0.
+    - General (Android): Update to Firebase Android BoM version 31.5.0.
+    - GMA (Android): Updated dependency to play-services-ads version 22.0.0.
     - Firestore: Added `Query::Count()`, which fetches the number of documents in the result
       set without actually downloading the documents
       ([#1207](https://github.com/firebase/firebase-cpp-sdk/pull/1207)).

diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle
@@ -72,6 +72,9 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

diff --git 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:31.3.0')
+  implementation platform('com.google.firebase:firebase-bom:31.5.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-storage'
 }