Update Android dependencies to androidx prebuilt versions in cl/252895236. This is effectively M49.

jonsimantov · a-maurice · commit aae355210d3e · 2019-07-01T16:14:33.000-07:00
This fixes lingering one_version issues that are discussed in cl/252891218.

This CL also fixes a broken test caused by a small issue in auth.cc unregistering listeners, which failed on some platforms because the copy/move constructor couldn't handle src/dest being the same.

PiperOrigin-RevId: 253690205
diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
@@ -14,22 +14,22 @@
 
 // A map of library to the dependencies that need to be added for it.
 def firebaseDependenciesMap = [
-  'app' : ['com.google.firebase:firebase-analytics:16.5.0'],
-  'admob' : ['com.google.firebase:firebase-ads:17.2.1',
-             'com.google.android.gms:play-services-measurement-sdk-api:16.5.0'],
-  'analytics' : ['com.google.firebase:firebase-analytics:16.5.0'],
-  'auth' : ['com.google.firebase:firebase-auth:17.0.0'],
-  'database' : ['com.google.firebase:firebase-database:17.0.0'],
-  'dynamic_links' : ['com.google.firebase:firebase-invites:17.0.0'],
-  'functions' : ['com.google.firebase:firebase-functions:17.0.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:18.0.0'],
-  'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
+  'app' : ['com.google.firebase:firebase-analytics:17.0.0'],
+  'admob' : ['com.google.firebase:firebase-ads:18.0.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:17.0.0'],
+  'analytics' : ['com.google.firebase:firebase-analytics:17.0.0'],
+  'auth' : ['com.google.firebase:firebase-auth:18.0.0'],
+  'database' : ['com.google.firebase:firebase-database:18.0.0'],
+  'dynamic_links' : ['com.google.firebase:firebase-invites:18.0.0'],
+  'functions' : ['com.google.firebase:firebase-functions:18.0.0'],
+  'instance_id' : ['com.google.firebase:firebase-iid:19.0.0'],
+  'invites' : ['com.google.firebase:firebase-invites:18.0.0'],
   // Messaging has an additional local dependency to include.
-  'messaging' : ['com.google.firebase:firebase-messaging:18.0.0',
+  'messaging' : ['com.google.firebase:firebase-messaging:19.0.0',
                  'firebase_cpp_sdk.messaging:messaging_java'],
-  'performance' : ['com.google.firebase:firebase-perf:17.0.2'],
-  'remote_config' : ['com.google.firebase:firebase-config:17.0.0'],
-  'storage' : ['com.google.firebase:firebase-storage:17.0.0']
+  'performance' : ['com.google.firebase:firebase-perf:18.0.0'],
+  'remote_config' : ['com.google.firebase:firebase-config:18.0.0'],
+  'storage' : ['com.google.firebase:firebase-storage:18.0.0']
 ]
 
 // A map of library to the gradle resources that they depend upon.
diff --git a/admob/admob_resources/build.gradle b/admob/admob_resources/build.gradle
@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:16.5.0'
-  implementation 'com.google.firebase:firebase-ads:17.2.1'
+  implementation 'com.google.firebase:firebase-analytics:17.0.0'
+  implementation 'com.google.firebase:firebase-ads:18.0.0'
 }
 
 afterEvaluate {
diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
@@ -46,7 +46,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:16.5.0'
+  implementation 'com.google.firebase:firebase-analytics:17.0.0'
 }
 
 afterEvaluate {
diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:16.5.0'
+  implementation 'com.google.firebase:firebase-analytics:17.0.0'
   implementation project(':app:app_resources')
 }
 
diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:16.5.0'
-  implementation 'com.google.firebase:firebase-invites:17.0.0'
+  implementation 'com.google.firebase:firebase-analytics:17.0.0'
+  implementation 'com.google.firebase:firebase-invites:18.0.0'
   implementation project(':app:app_resources')
 }
 
diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:16.5.0'
-  implementation 'com.google.firebase:firebase-auth:17.0.0'
+  implementation 'com.google.firebase:firebase-analytics:17.0.0'
+  implementation 'com.google.firebase:firebase-auth:18.0.0'
   implementation project(':app:app_resources')
 }
 
diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle
@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:16.5.0'
-  implementation 'com.google.firebase:firebase-database:17.0.0'
+  implementation 'com.google.firebase:firebase-analytics:17.0.0'
+  implementation 'com.google.firebase:firebase-database:18.0.0'
   //implementation project(':app:app_resources')
 }
 
diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle
@@ -51,8 +51,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:16.5.0'
-  implementation 'com.google.firebase:firebase-messaging:18.0.0'
+  implementation 'com.google.firebase:firebase-analytics:17.0.0'
+  implementation 'com.google.firebase:firebase-messaging:19.0.0'
   implementation 'com.google.flatbuffers:flatbuffers-java:1.9.0'
 }
 
diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle
@@ -14,19 +14,19 @@
 
 // A map of library to the dependencies that need to be added for it.
 def firebaseDependenciesMap = [
-  'app' : ['com.google.firebase:firebase-analytics:16.5.0'],
-  'admob' : ['com.google.firebase:firebase-ads:17.2.1',
-             'com.google.android.gms:play-services-measurement-sdk-api:16.5.0'],
-  'analytics' : ['com.google.firebase:firebase-analytics:16.5.0'],
-  'auth' : ['com.google.firebase:firebase-auth:17.0.0'],
-  'database' : ['com.google.firebase:firebase-database:17.0.0'],
-  'dynamic_links' : ['com.google.firebase:firebase-invites:17.0.0'],
-  'functions' : ['com.google.firebase:firebase-functions:17.0.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:18.0.0'],
+  'app' : ['com.google.firebase:firebase-analytics:17.0.0'],
+  'admob' : ['com.google.firebase:firebase-ads:18.0.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:17.0.0'],
+  'analytics' : ['com.google.firebase:firebase-analytics:17.0.0'],
+  'auth' : ['com.google.firebase:firebase-auth:18.0.0'],
+  'database' : ['com.google.firebase:firebase-database:18.0.0'],
+  'dynamic_links' : ['com.google.firebase:firebase-invites:18.0.0'],
+  'functions' : ['com.google.firebase:firebase-functions:18.0.0'],
+  'instance_id' : ['com.google.firebase:firebase-iid:19.0.0'],
   'messaging' : ['com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar',
-                 'com.google.firebase:firebase-messaging:18.0.0'],
-  'remote_config' : ['com.google.firebase:firebase-config:17.0.0'],
-  'storage' : ['com.google.firebase:firebase-storage:17.0.0']
+                 'com.google.firebase:firebase-messaging:19.0.0'],
+  'remote_config' : ['com.google.firebase:firebase-config:18.0.0'],
+  'storage' : ['com.google.firebase:firebase-storage:18.0.0']
 ]
 
 // Handles adding the Firebase C++ dependencies as properties.
diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle
@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:16.5.0'
-  implementation 'com.google.firebase:firebase-storage:17.0.0'
+  implementation 'com.google.firebase:firebase-analytics:17.0.0'
+  implementation 'com.google.firebase:firebase-storage:18.0.0'
 }
 
 afterEvaluate {

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ android {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`dependencies {`
`48`		`- implementation 'com.google.firebase:firebase-analytics:16.5.0'`
`49`		`- implementation 'com.google.firebase:firebase-ads:17.2.1'`
	`48`	`+ implementation 'com.google.firebase:firebase-analytics:17.0.0'`
	`49`	`+ implementation 'com.google.firebase:firebase-ads:18.0.0'`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`afterEvaluate {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ android {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`dependencies {`
`49`		`- implementation 'com.google.firebase:firebase-analytics:16.5.0'`
	`49`	`+ implementation 'com.google.firebase:firebase-analytics:17.0.0'`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`afterEvaluate {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ android {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`dependencies {`
`52`		`- implementation 'com.google.firebase:firebase-analytics:16.5.0'`
	`52`	`+ implementation 'com.google.firebase:firebase-analytics:17.0.0'`
`53`	`53`	`implementation project(':app:app_resources')`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ android {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`dependencies {`
`54`		`- implementation 'com.google.firebase:firebase-analytics:16.5.0'`
`55`		`- implementation 'com.google.firebase:firebase-messaging:18.0.0'`
	`54`	`+ implementation 'com.google.firebase:firebase-analytics:17.0.0'`
	`55`	`+ implementation 'com.google.firebase:firebase-messaging:19.0.0'`
`56`	`56`	`implementation 'com.google.flatbuffers:flatbuffers-java:1.9.0'`
`57`	`57`	`}`
`58`	`58`