Skip to content

Commit 9c7b7c5

Browse files
Googlera-maurice
authored andcommitted
Add play-services-base to Android deps for analytics/admob/remote_config.
Due to a change in the transitive dependencies of analytics, play-services-base is no longer present. This is needed to check for the presence of Google Play Services. Admob and Remote Config both depend on analytics (through 'app'), which is how they previously got that dependency. Other APIs depend directly on play-services-base at the Android level. PiperOrigin-RevId: 332267491
1 parent 4c13211 commit 9c7b7c5

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

Android/firebase_dependencies.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ import org.gradle.util.ConfigureUtil;
1818
def firebaseDependenciesMap = [
1919
'app' : ['com.google.firebase:firebase-analytics:17.5.0'],
2020
'admob' : ['com.google.firebase:firebase-ads:19.3.0',
21-
'com.google.android.gms:play-services-measurement-sdk-api:17.5.0'],
22-
'analytics' : ['com.google.firebase:firebase-analytics:17.5.0'],
21+
'com.google.android.gms:play-services-measurement-sdk-api:17.5.0',
22+
'com.google.android.gms:play-services-base:17.4.0'],
23+
'analytics' : ['com.google.firebase:firebase-analytics:17.5.0',
24+
'com.google.android.gms:play-services-base:17.4.0'],
2325
'auth' : ['com.google.firebase:firebase-auth:19.3.2'],
2426
'database' : ['com.google.firebase:firebase-database:19.4.0'],
2527
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.0'],
@@ -32,7 +34,8 @@ def firebaseDependenciesMap = [
3234
'firebase_cpp_sdk.messaging:messaging_java',
3335
'androidx.core:core:1.0.1'],
3436
'performance' : ['com.google.firebase:firebase-perf:19.0.8'],
35-
'remote_config' : ['com.google.firebase:firebase-config:19.2.0'],
37+
'remote_config' : ['com.google.firebase:firebase-config:19.2.0',
38+
'com.google.android.gms:play-services-base:17.4.0'],
3639
'storage' : ['com.google.firebase:firebase-storage:19.2.0']
3740
]
3841

release_build_files/Android/firebase_dependencies.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ import org.gradle.util.ConfigureUtil;
1818
def firebaseDependenciesMap = [
1919
'app' : ['com.google.firebase:firebase-analytics:17.5.0'],
2020
'admob' : ['com.google.firebase:firebase-ads:19.3.0',
21-
'com.google.android.gms:play-services-measurement-sdk-api:17.5.0'],
22-
'analytics' : ['com.google.firebase:firebase-analytics:17.5.0'],
21+
'com.google.android.gms:play-services-measurement-sdk-api:17.5.0',
22+
'com.google.android.gms:play-services-base:17.4.0'],
23+
'analytics' : ['com.google.firebase:firebase-analytics:17.5.0',
24+
'com.google.android.gms:play-services-base:17.4.0'],
2325
'auth' : ['com.google.firebase:firebase-auth:19.3.2'],
2426
'database' : ['com.google.firebase:firebase-database:19.4.0'],
2527
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.0'],
@@ -30,7 +32,8 @@ def firebaseDependenciesMap = [
3032
'com.google.firebase:firebase-messaging:20.2.4',
3133
'androidx.core:core:1.0.1'],
3234
'performance' : ['com.google.firebase:firebase-perf:19.0.8'],
33-
'remote_config' : ['com.google.firebase:firebase-config:19.2.0'],
35+
'remote_config' : ['com.google.firebase:firebase-config:19.2.0',
36+
'com.google.android.gms:play-services-base:17.4.0'],
3437
'storage' : ['com.google.firebase:firebase-storage:19.2.0'],
3538
'testlab' : []
3639
]

0 commit comments

Comments
 (0)