Skip to content

Commit a8fc5e3

Browse files
firebase-workflow-trigger[bot]firebase-workflow-trigger-botdconeybe
authored
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 <[email protected]> Co-authored-by: Denver Coneybeare <[email protected]>
1 parent 0cd8b7c commit a8fc5e3

File tree

16 files changed

+26
-69
lines changed

16 files changed

+26
-69
lines changed

‎Android/firebase_dependencies.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
2727
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
2828
'firestore' : ['com.google.firebase:firebase-firestore'],
2929
'functions' : ['com.google.firebase:firebase-functions'],
30-
'gma' : ['com.google.android.gms:play-services-ads:22.0.0'],
30+
'gma' : ['com.google.android.gms:play-services-ads:22.1.0'],
3131
'installations' : ['com.google.firebase:firebase-installations'],
3232
'invites' : ['com.google.firebase:firebase-invites'],
3333
// Messaging has an additional local dependency to include.
@@ -158,7 +158,7 @@ project.afterEvaluate {
158158

159159
// Add the bill-of-materials
160160
project.dependencies {
161-
implementation platform('com.google.firebase:firebase-bom:32.0.0')
161+
implementation platform('com.google.firebase:firebase-bom:32.1.0')
162162
}
163163
for (String lib : firebaseCpp.dependencies.libSet) {
164164
// Generate and include the proguard file

‎app/app_resources/build.gradle

+1-1
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:32.0.0')
53+
implementation platform('com.google.firebase:firebase-bom:32.1.0')
5454
implementation 'com.google.firebase:firebase-analytics'
5555
}
5656

‎app/google_api_resources/build.gradle

+1-1
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:32.0.0')
56+
implementation platform('com.google.firebase:firebase-bom:32.1.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

+1-1
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:32.0.0')
52+
implementation platform('com.google.firebase:firebase-bom:32.1.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

+1-1
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:32.0.0')
52+
implementation platform('com.google.firebase:firebase-bom:32.1.0')
5353
implementation 'com.google.firebase:firebase-appcheck'
5454
}
5555

‎auth/auth_resources/build.gradle

+1-1
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:32.0.0')
52+
implementation platform('com.google.firebase:firebase-bom:32.1.0')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-auth'
5555
implementation project(':app:app_resources')

‎database/database_resources/build.gradle

+1-1
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:32.0.0')
48+
implementation platform('com.google.firebase:firebase-bom:32.1.0')
4949
implementation 'com.google.firebase:firebase-analytics'
5050
implementation 'com.google.firebase:firebase-database'
5151
//implementation project(':app:app_resources')

‎firestore/firestore_resources/build.gradle

+1-1
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:32.0.0')
56+
implementation platform('com.google.firebase:firebase-bom:32.1.0')
5757
implementation 'com.google.firebase:firebase-analytics'
5858
implementation 'com.google.firebase:firebase-firestore'
5959
}

‎firestore/src/android/aggregate_query_snapshot_android.cc

+7-11
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,26 @@ using jni::StaticMethod;
3434

3535
constexpr char kClassName[] =
3636
PROGUARD_KEEP_CLASS "com/google/firebase/firestore/AggregateQuerySnapshot";
37-
Constructor<Object> kConstructor(
38-
"(Lcom/google/firebase/firestore/AggregateQuery;Ljava/util/Map;)V");
3937
Method<int64_t> kGetCount("getCount", "()J");
4038
Method<Object> kGetQuery("getQuery",
4139
"()Lcom/google/firebase/firestore/AggregateQuery;");
4240
Method<int32_t> kHashCode("hashCode", "()I");
43-
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;");
41+
StaticMethod<Object> kCreateWithCount(
42+
"createWithCount",
43+
"(Lcom/google/firebase/firestore/AggregateQuery;J)"
44+
"Lcom/google/firebase/firestore/AggregateQuerySnapshot;");
4845

4946
} // namespace
5047

5148
void AggregateQuerySnapshotInternal::Initialize(jni::Loader& loader) {
52-
loader.LoadClass(kClassName, kConstructor, kGetCount, kGetQuery, kHashCode);
53-
loader.LoadClass(kHelperClassName, kCreateConstructorArg);
49+
loader.LoadClass(kClassName, kGetCount, kGetQuery, kHashCode,
50+
kCreateWithCount);
5451
}
5552

5653
AggregateQuerySnapshot AggregateQuerySnapshotInternal::Create(
5754
Env& env, AggregateQueryInternal& aggregate_query_internal, int64_t count) {
58-
Local<Object> snapshot_data = env.Call(kCreateConstructorArg, count);
5955
Local<Object> instance =
60-
env.New(kConstructor, aggregate_query_internal.ToJava(), snapshot_data);
56+
env.Call(kCreateWithCount, aggregate_query_internal.ToJava(), count);
6157
return aggregate_query_internal.firestore_internal()
6258
->NewAggregateQuerySnapshot(env, instance);
6359
}

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

-39
This file was deleted.

‎gma/gma_resources/build.gradle

+2-2
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:32.0.0')
48+
implementation platform('com.google.firebase:firebase-bom:32.1.0')
4949
implementation 'com.google.firebase:firebase-analytics'
50-
implementation 'com.google.android.gms:play-services-ads:22.0.0'
50+
implementation 'com.google.android.gms:play-services-ads:22.1.0'
5151
}
5252

5353
afterEvaluate {

‎messaging/messaging_java/build.gradle

+1-1
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:32.0.0')
58+
implementation platform('com.google.firebase:firebase-bom:32.1.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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
2727
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
2828
'firestore' : ['com.google.firebase:firebase-firestore'],
2929
'functions' : ['com.google.firebase:firebase-functions'],
30-
'gma' : ['com.google.android.gms:play-services-ads:22.0.0'],
30+
'gma' : ['com.google.android.gms:play-services-ads:22.1.0'],
3131
'installations' : ['com.google.firebase:firebase-installations'],
3232
'invites' : ['com.google.firebase:firebase-invites'],
3333
// Messaging has an additional local dependency to include.
@@ -131,7 +131,7 @@ project.afterEvaluate {
131131

132132
// Add the bill-of-materials
133133
project.dependencies {
134-
implementation platform('com.google.firebase:firebase-bom:32.0.0')
134+
implementation platform('com.google.firebase:firebase-bom:32.1.0')
135135
}
136136
for (String lib : firebaseCpp.dependencies.libSet) {
137137
// Messaging includes an aar, which to be depended on properly requires

‎release_build_files/readme.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ distributed as part of the core Firebase
8686

8787
Feature | Required Libraries and Gradle Packages
8888
-------------------------- | --------------------------------------
89-
All Firebase SDKs | platform(com.google.firebase:firebase-bom:32.0.0)
89+
All Firebase SDKs | platform(com.google.firebase:firebase-bom:32.1.0)
9090
| | (Android Bill of Materials)
9191
Firebase Analytics | libfirebase_analytics.a
9292
| | libfirebase_app.a
@@ -134,7 +134,7 @@ Google Mobile Ads | libfirebase_gma.a
134134
| | libfirebase_app.a
135135
| | com.google.firebase:firebase-analytics
136136
| | (Maven package)
137-
| | com.google.android.gms:play-services-ads:22.0.0
137+
| | com.google.android.gms:play-services-ads:22.1.0
138138
| | (Maven package)
139139
Firebase Installations | libfirebase_installations.a
140140
| | libfirebase_app.a
@@ -147,7 +147,7 @@ Firebase Messaging | libfirebase_messaging.a
147147
| | com.google.firebase:firebase-messaging
148148
| | (Maven package)
149149
| | libmessaging_java.jar (Android service)
150-
| | androidx.core:core:1.10.0 (Maven package)
150+
| | androidx.core:core:1.10.1 (Maven package)
151151
Firebase Realtime Database | libfirebase_database.a
152152
| | libfirebase_auth.a
153153
| | libfirebase_app.a

‎remote_config/remote_config_resources/build.gradle

+1-1
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:32.0.0')
52+
implementation platform('com.google.firebase:firebase-bom:32.1.0')
5353
implementation 'com.google.firebase:firebase-config'
5454
}
5555

‎storage/storage_resources/build.gradle

+1-1
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:32.0.0')
52+
implementation platform('com.google.firebase:firebase-bom:32.1.0')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-storage'
5555
}

0 commit comments

Comments
 (0)