Skip to content

Commit 4318a1d

Browse files
firebase-workflow-trigger[bot]firebase-workflow-trigger-botjonsimantovdconeybe
authored
Update Android dependencies - Wed Apr 19 2023 (#1276)
* Update Android dependencies - Wed Apr 19 2023 [Triggered](https://github.com/firebase/firebase-android-sdk/actions/runs/4744622642) by [firebase-android-sdk Apr 19 release](firebase/firebase-android-sdk@0451fa0). ### Android - com.google.android.gms.play_services_ads → 22.0.0 - com.google.firebase.firebase_bom → 31.5.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/4744629540). * Firestore: Fix args to AggregateQuerySnapshot constructor (#1277) * Fix call to AggregateQuerySnapshot constructor * Fix conflict for coroutines.pro file in google library. Cherry-picked from #1278 to fix the "More than one file was found with OS independent path 'META-INF/com.android.tools/proguard/coroutines.pro'" error --------- Co-authored-by: Jon Simantov <jsimantov@google.com> * Update release notes with new versions. --------- Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: Jon Simantov <jsimantov@google.com> Co-authored-by: Denver Coneybeare <dconeybe@google.com>
1 parent 5ff343a commit 4318a1d

File tree

22 files changed

+89
-22
lines changed

22 files changed

+89
-22
lines changed

‎Android/firebase_dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def firebaseDependenciesMap = [
2929
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
3030
'firestore' : ['com.google.firebase:firebase-firestore'],
3131
'functions' : ['com.google.firebase:firebase-functions'],
32-
'gma' : ['com.google.android.gms:play-services-ads:21.5.0'],
32+
'gma' : ['com.google.android.gms:play-services-ads:22.0.0'],
3333
'installations' : ['com.google.firebase:firebase-installations'],
3434
'invites' : ['com.google.firebase:firebase-invites'],
3535
// Messaging has an additional local dependency to include.
@@ -163,7 +163,7 @@ project.afterEvaluate {
163163

164164
// Add the bill-of-materials
165165
project.dependencies {
166-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
166+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
167167
}
168168
for (String lib : firebaseCpp.dependencies.libSet) {
169169
// Generate and include the proguard file

‎admob/admob_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
48+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
4949
implementation 'com.google.firebase:firebase-analytics'
5050
implementation 'com.google.firebase:firebase-ads:19.8.0'
5151
}

‎app/app_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050
}
5151

5252
dependencies {
53-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
53+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
5454
implementation 'com.google.firebase:firebase-analytics'
5555
}
5656

‎app/google_api_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
}
5454

5555
dependencies {
56-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
56+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
5757
implementation 'com.google.firebase:firebase-analytics'
5858
implementation 'com.google.android.gms:play-services-base:18.2.0'
5959
implementation project(':app:app_resources')

‎app/invites_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
52+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-dynamic-links'
5555
implementation project(':app:app_resources')

‎app_check/app_check_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
52+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
5353
implementation 'com.google.firebase:firebase-appcheck'
5454
}
5555

‎auth/auth_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
52+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-auth'
5555
implementation project(':app:app_resources')

‎auth/integration_test/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ android {
7272
proguardFile file('proguard.pro')
7373
}
7474
}
75+
packagingOptions {
76+
pickFirst 'META-INF/**/coroutines.pro'
77+
}
7578
}
7679

7780
apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

‎database/database_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
48+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
4949
implementation 'com.google.firebase:firebase-analytics'
5050
implementation 'com.google.firebase:firebase-database'
5151
//implementation project(':app:app_resources')

‎database/integration_test/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ android {
7272
proguardFile file('proguard.pro')
7373
}
7474
}
75+
packagingOptions {
76+
pickFirst 'META-INF/**/coroutines.pro'
77+
}
7578
}
7679

7780
apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

‎firestore/firestore_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
}
5454

5555
dependencies {
56-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
56+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
5757
implementation 'com.google.firebase:firebase-analytics'
5858
implementation 'com.google.firebase:firebase-firestore'
5959
}

‎firestore/integration_test/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ android {
7373
proguardFile file('proguard.pro')
7474
}
7575
}
76+
packagingOptions {
77+
pickFirst 'META-INF/**/coroutines.pro'
78+
}
7679
}
7780

7881
apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

‎firestore/integration_test_internal/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ android {
7373
proguardFile file('proguard.pro')
7474
}
7575
}
76+
packagingOptions {
77+
pickFirst 'META-INF/**/coroutines.pro'
78+
}
7679
lintOptions {
7780
abortOnError false
7881
}

‎firestore/src/android/aggregate_query_snapshot_android.cc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,34 @@ using jni::Env;
3030
using jni::Local;
3131
using jni::Method;
3232
using jni::Object;
33+
using jni::StaticMethod;
3334

3435
constexpr char kClassName[] =
3536
PROGUARD_KEEP_CLASS "com/google/firebase/firestore/AggregateQuerySnapshot";
3637
Constructor<Object> kConstructor(
37-
"(Lcom/google/firebase/firestore/AggregateQuery;J)V");
38+
"(Lcom/google/firebase/firestore/AggregateQuery;Ljava/util/Map;)V");
3839
Method<int64_t> kGetCount("getCount", "()J");
3940
Method<Object> kGetQuery("getQuery",
4041
"()Lcom/google/firebase/firestore/AggregateQuery;");
4142
Method<int32_t> kHashCode("hashCode", "()I");
4243

44+
constexpr char kHelperClassName[] = PROGUARD_KEEP_CLASS
45+
"com/google/firebase/firestore/internal/cpp/AggregateQuerySnapshotHelper";
46+
StaticMethod<Object> kCreateConstructorArg(
47+
"createAggregateQuerySnapshotConstructorArg", "(J)Ljava/util/Map;");
48+
4349
} // namespace
4450

4551
void AggregateQuerySnapshotInternal::Initialize(jni::Loader& loader) {
4652
loader.LoadClass(kClassName, kConstructor, kGetCount, kGetQuery, kHashCode);
53+
loader.LoadClass(kHelperClassName, kCreateConstructorArg);
4754
}
4855

4956
AggregateQuerySnapshot AggregateQuerySnapshotInternal::Create(
5057
Env& env, AggregateQueryInternal& aggregate_query_internal, int64_t count) {
58+
Local<Object> snapshot_data = env.Call(kCreateConstructorArg, count);
5159
Local<Object> instance =
52-
env.New(kConstructor, aggregate_query_internal.ToJava(), count);
60+
env.New(kConstructor, aggregate_query_internal.ToJava(), snapshot_data);
5361
return aggregate_query_internal.firestore_internal()
5462
->NewAggregateQuerySnapshot(env, instance);
5563
}

‎firestore/src_java/com/google/firebase/firestore/internal/cpp/AggregateQuerySnapshotHelper.java

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* Copyright 2023 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.firebase.firestore.internal.cpp;
18+
19+
import com.google.firestore.v1.Value;
20+
import java.util.HashMap;
21+
import java.util.Map;
22+
23+
public final class AggregateQuerySnapshotHelper {
24+
private AggregateQuerySnapshotHelper() {}
25+
26+
/**
27+
* Creates an object appropriate for specifying to the AggregateQuerySnapshot
28+
* constructor that conveys the given "count" as the lone aggregate result.
29+
*
30+
* This class should be deleted and replaced with a proper mechanism once
31+
* SUM/AVERAGE are ported to this SDK.
32+
*/
33+
public static Map<String, Value> createAggregateQuerySnapshotConstructorArg(
34+
long count) {
35+
HashMap<String, Value> map = new HashMap<>();
36+
map.put("count", Value.newBuilder().setIntegerValue(count).build());
37+
return map;
38+
}
39+
}

‎functions/integration_test/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ android {
7272
proguardFile file('proguard.pro')
7373
}
7474
}
75+
packagingOptions {
76+
pickFirst 'META-INF/**/coroutines.pro'
77+
}
7578
}
7679

7780
apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

‎gma/gma_resources/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
48+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
4949
implementation 'com.google.firebase:firebase-analytics'
50-
implementation 'com.google.android.gms:play-services-ads:21.5.0'
50+
implementation 'com.google.android.gms:play-services-ads:22.0.0'
5151
}
5252

5353
afterEvaluate {

‎messaging/messaging_java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ android {
5555
}
5656

5757
dependencies {
58-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
58+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
5959
implementation 'com.google.firebase:firebase-analytics'
6060
implementation 'com.google.firebase:firebase-messaging'
6161
implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'

‎release_build_files/Android/firebase_dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def firebaseDependenciesMap = [
2929
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
3030
'firestore' : ['com.google.firebase:firebase-firestore'],
3131
'functions' : ['com.google.firebase:firebase-functions'],
32-
'gma' : ['com.google.android.gms:play-services-ads:21.5.0'],
32+
'gma' : ['com.google.android.gms:play-services-ads:22.0.0'],
3333
'installations' : ['com.google.firebase:firebase-installations'],
3434
'invites' : ['com.google.firebase:firebase-invites'],
3535
// Messaging has an additional local dependency to include.
@@ -136,7 +136,7 @@ project.afterEvaluate {
136136

137137
// Add the bill-of-materials
138138
project.dependencies {
139-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
139+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
140140
}
141141
for (String lib : firebaseCpp.dependencies.libSet) {
142142
// Messaging includes an aar, which to be depended on properly requires

‎release_build_files/readme.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ distributed as part of the core Firebase
8787

8888
Feature | Required Libraries and Gradle Packages
8989
-------------------------- | --------------------------------------
90-
All Firebase SDKs | platform(com.google.firebase:firebase-bom:31.3.0)
90+
All Firebase SDKs | platform(com.google.firebase:firebase-bom:31.5.0)
9191
| | (Android Bill of Materials)
9292
Firebase AdMob | libfirebase_admob.a
9393
| (deprecated) | libfirebase_app.a
@@ -133,7 +133,7 @@ Google Mobile Ads | libfirebase_gma.a
133133
| | libfirebase_app.a
134134
| | com.google.firebase:firebase-analytics
135135
| | (Maven package)
136-
| | com.google.android.gms:play-services-ads:21.5.0
136+
| | com.google.android.gms:play-services-ads:22.0.0
137137
| | (Maven package)
138138
Firebase Installations | libfirebase_installations.a
139139
| | libfirebase_app.a
@@ -146,7 +146,7 @@ Firebase Messaging | libfirebase_messaging.a
146146
| | com.google.firebase:firebase-messaging
147147
| | (Maven package)
148148
| | libmessaging_java.jar (Android service)
149-
| | androidx.core:core:1.9.0 (Maven package)
149+
| | androidx.core:core:1.10.0 (Maven package)
150150
Firebase Realtime Database | libfirebase_database.a
151151
| | libfirebase_auth.a
152152
| | libfirebase_app.a
@@ -643,8 +643,10 @@ code.
643643

644644
## Release Notes
645645
### Upcoming Release
646-
- 10.8.0
646+
- Changes
647647
- General (iOS): Update to Firebase Cocoapods version 10.8.0.
648+
- General (Android): Update to Firebase Android BoM version 31.5.0.
649+
- GMA (Android): Updated dependency to play-services-ads version 22.0.0.
648650
- Firestore: Added `Query::Count()`, which fetches the number of documents in the result
649651
set without actually downloading the documents
650652
([#1207](https://github.com/firebase/firebase-cpp-sdk/pull/1207)).

‎storage/integration_test/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ android {
7272
proguardFile file('proguard.pro')
7373
}
7474
}
75+
packagingOptions {
76+
pickFirst 'META-INF/**/coroutines.pro'
77+
}
7578
}
7679

7780
apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

‎storage/storage_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:31.3.0')
52+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-storage'
5555
}

0 commit comments

Comments
 (0)