Update dependencies to Firebase Android SDK M47.

jonsimantov · a-maurice · commit e5c790fbdae7 · 2019-05-07T11:00:09.000-07:00
Breaking changes:
- Changed firebase_core to firebase_analytics.
- Renamed all Firebase Auth Android functions related to listing Providers to listing SignInMethods. This is a straightforward rename, but since we haven't gone through C++/Unity API review we are only changing the Java implementation at this point.
- Finished removing Firebase Invites client SDK from C++. Removed testapp as well.
- minSdkVersion changed from 14 to 16 in all testapps.

All C++ testapps have been built on Blaze and run on device, to confirm no other JNI incompatibilities. b/131775539 has the only outlier.

PiperOrigin-RevId: 246236058
diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
@@ -16,20 +16,20 @@
 def firebaseDependenciesMap = [
   'app' : ['com.google.firebase:firebase-core:16.0.8'],
   'admob' : ['com.google.firebase:firebase-ads:17.2.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:16.4.0'],
-  'analytics' : ['com.google.firebase:firebase-analytics:16.4.0'],
-  'auth' : ['com.google.firebase:firebase-auth:16.2.1'],
-  'database' : ['com.google.firebase:firebase-database:16.1.0'],
-  'dynamic_links' : ['com.google.firebase:firebase-invites:16.1.1'],
-  'functions' : ['com.google.firebase:firebase-functions:16.3.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:17.1.2'],
-  'invites' : ['com.google.firebase:firebase-invites:16.1.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'],
   // Messaging has an additional local dependency to include.
-  'messaging' : ['com.google.firebase:firebase-messaging:17.6.0',
+  'messaging' : ['com.google.firebase:firebase-messaging:18.0.0',
                  'firebase_cpp_sdk.messaging:messaging_java'],
-  'performance' : ['com.google.firebase:firebase-perf:16.2.5'],
-  'remote_config' : ['com.google.firebase:firebase-config:16.5.0'],
-  'storage' : ['com.google.firebase:firebase-storage:16.1.0']
+  'performance' : ['com.google.firebase:firebase-perf:17.0.0'],
+  'remote_config' : ['com.google.firebase:firebase-config:17.0.0'],
+  'storage' : ['com.google.firebase:firebase-storage:17.0.0']
 ]
 
 // A map of library to the gradle resources that they depend upon.
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-core:16.0.8'
-  implementation 'com.google.firebase:firebase-invites:16.1.1'
+  implementation 'com.google.firebase:firebase-analytics:16.5.0'
+  implementation 'com.google.firebase:firebase-invites:17.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-core:16.0.8'
-  implementation 'com.google.firebase:firebase-auth:16.2.1'
+  implementation 'com.google.firebase:firebase-analytics:16.5.0'
+  implementation 'com.google.firebase:firebase-auth:17.0.0'
   implementation project(':app:app_resources')
 }
 
diff --git a/auth/src/android/auth_android.cc b/auth/src/android/auth_android.cc
@@ -46,7 +46,7 @@ using util::JniStringToString;
   X(RemoveIdTokenListener, "removeIdTokenListener",                            \
     "(Lcom/google/firebase/auth/FirebaseAuth$IdTokenListener;)V"),             \
   X(SignOut, "signOut", "()V"),                                                \
-  X(FetchProvidersForEmail, "fetchProvidersForEmail",                          \
+  X(FetchSignInMethodsForEmail, "fetchSignInMethodsForEmail",                  \
     "(Ljava/lang/String;)"                                                     \
     "Lcom/google/android/gms/tasks/Task;"),                                    \
   X(SignInWithCustomToken, "signInWithCustomToken",                            \
@@ -75,14 +75,14 @@ METHOD_LOOKUP_DEFINITION(auth,
                          AUTH_METHODS)
 
 // clang-format off
-#define PROVIDER_QUERY_RESULT_METHODS(X)                                       \
-  X(GetProviders, "getProviders", "()Ljava/util/List;")
+#define SIGNIN_METHOD_QUERY_RESULT_METHODS(X)                                  \
+  X(GetSignInMethods, "getSignInMethods", "()Ljava/util/List;")
 // clang-format on
-METHOD_LOOKUP_DECLARATION(providerqueryresult, PROVIDER_QUERY_RESULT_METHODS)
-METHOD_LOOKUP_DEFINITION(providerqueryresult,
+METHOD_LOOKUP_DECLARATION(signinmethodquery, SIGNIN_METHOD_QUERY_RESULT_METHODS)
+METHOD_LOOKUP_DEFINITION(signinmethodquery,
                          PROGUARD_KEEP_CLASS
-                         "com/google/firebase/auth/ProviderQueryResult",
-                         PROVIDER_QUERY_RESULT_METHODS)
+                         "com/google/firebase/auth/SignInMethodQueryResult",
+                         SIGNIN_METHOD_QUERY_RESULT_METHODS)
 
 // clang-format off
 #define JNI_LISTENER_CALLBACK_METHODS(X)                                       \
@@ -125,7 +125,7 @@ static const JNINativeMethod kNativeOnIdTokenChangedMethod = {
 bool CacheAuthMethodIds(JNIEnv* env, jobject activity,
                         const std::vector<util::EmbeddedFile>& embedded_files) {
   if (!(auth::CacheMethodIds(env, activity) &&
-        providerqueryresult::CacheMethodIds(env, activity))) {
+        signinmethodquery::CacheMethodIds(env, activity))) {
     return false;
   }
 
@@ -147,7 +147,7 @@ bool CacheAuthMethodIds(JNIEnv* env, jobject activity,
 
 void ReleaseAuthClasses(JNIEnv* env) {
   auth::ReleaseClass(env);
-  providerqueryresult::ReleaseClass(env);
+  signinmethodquery::ReleaseClass(env);
   jnilistener::ReleaseClass(env);
   jni_id_token_listener::ReleaseClass(env);
 }
@@ -315,11 +315,12 @@ static void ReadProviderResult(
   // `result` comes from the successfully completed Task in Java. If the Task
   // completed successfully, `result` should be valid.
   FIREBASE_ASSERT(!success || result != nullptr);
-  // `result` is of type ProviderQueryResult when `success` is true.
-  jobject list = success ? env->CallObjectMethod(
-                               result, providerqueryresult::GetMethodId(
-                                           providerqueryresult::kGetProviders))
-                         : nullptr;
+  // `result` is of type SignInMethodQueryResult when `success` is true.
+  jobject list = success
+                     ? env->CallObjectMethod(
+                           result, signinmethodquery::GetMethodId(
+                                       signinmethodquery::kGetSignInMethods))
+                     : nullptr;
   if (firebase::util::CheckAndClearJniExceptions(env)) list = nullptr;
 
   // `list` is of type List<String>. Loop through it.
@@ -347,8 +348,8 @@ Future<Auth::FetchProvidersResult> Auth::FetchProvidersForEmail(
 
   jstring j_email = env->NewStringUTF(email);
   jobject pending_result = env->CallObjectMethod(
-      AuthImpl(auth_data_), auth::GetMethodId(auth::kFetchProvidersForEmail),
-      j_email);
+      AuthImpl(auth_data_),
+      auth::GetMethodId(auth::kFetchSignInMethodsForEmail), j_email);
   env->DeleteLocalRef(j_email);
 
   if (!CheckAndCompleteFutureOnError(env, &futures, handle)) {
diff --git a/auth/src/android/credential_android.cc b/auth/src/android/credential_android.cc
@@ -15,6 +15,7 @@
  */
 
 #include <jni.h>
+
 #include <algorithm>
 #include <cstring>
 
@@ -31,7 +32,7 @@ using util::JniStringToString;
 
 // clang-format off
 #define CREDENTIAL_METHODS(X)                                                  \
-    X(GetProvider, "getProvider", "()Ljava/lang/String;")
+    X(GetSignInMethod, "getSignInMethod", "()Ljava/lang/String;")
 // clang-format on
 METHOD_LOOKUP_DECLARATION(credential, CREDENTIAL_METHODS)
 METHOD_LOOKUP_DEFINITION(credential,
@@ -289,9 +290,9 @@ Credential& Credential::operator=(const Credential& rhs) {
 std::string Credential::provider() const {
   JNIEnv* env = GetJniEnv();
   if (!impl_) return std::string();
-  jobject j_provider =
-      env->CallObjectMethod(CredentialFromImpl(impl_),
-                            credential::GetMethodId(credential::kGetProvider));
+  jobject j_provider = env->CallObjectMethod(
+      CredentialFromImpl(impl_),
+      credential::GetMethodId(credential::kGetSignInMethod));
   return JniStringToString(env, j_provider);
 }
 
@@ -471,8 +472,8 @@ Future<Credential> GameCenterAuthProvider::GetCredential() {
   bool is_gamecenter_available_on_android = false;
 
   auto future_api = GetCredentialFutureImpl();
-  const auto handle = future_api->SafeAlloc<Credential>(
-      kCredentialFn_GameCenterGetCredential);
+  const auto handle =
+      future_api->SafeAlloc<Credential>(kCredentialFn_GameCenterGetCredential);
 
   future_api->Complete(handle, kAuthErrorInvalidCredential,
                        "GameCenter is not supported on Android.");
@@ -538,8 +539,9 @@ PhoneAuthProvider::ForceResendingToken::ForceResendingToken(
   data_->SetRef(rhs.data_->token_global_ref());
 }
 
-PhoneAuthProvider::ForceResendingToken& PhoneAuthProvider::ForceResendingToken::
-operator=(const ForceResendingToken& rhs) {
+PhoneAuthProvider::ForceResendingToken&
+PhoneAuthProvider::ForceResendingToken::operator=(
+    const ForceResendingToken& rhs) {
   data_->SetRef(rhs.data_->token_global_ref());
   return *this;
 }
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-core:16.0.8'
-  implementation 'com.google.firebase:firebase-database:16.1.0'
+  implementation 'com.google.firebase:firebase-analytics:16.5.0'
+  implementation 'com.google.firebase:firebase-database:17.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-core:16.0.8'
-  implementation 'com.google.firebase:firebase-messaging:17.6.0'
+  implementation 'com.google.firebase:firebase-analytics:16.5.0'
+  implementation 'com.google.firebase:firebase-messaging:18.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,20 +14,18 @@
 
 // A map of library to the dependencies that need to be added for it.
 def firebaseDependenciesMap = [
-  'app' : ['com.google.firebase:firebase-core:16.0.8'],
-  'admob' : ['com.google.firebase:firebase-ads:17.2.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:16.4.0'],
-  'analytics' : ['com.google.firebase:firebase-analytics:16.4.0'],
-  'auth' : ['com.google.firebase:firebase-auth:16.2.1'],
-  'database' : ['com.google.firebase:firebase-database:16.1.0'],
-  'dynamic_links' : ['com.google.firebase:firebase-invites:16.1.1'],
-  'functions' : ['com.google.firebase:firebase-functions:16.3.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:17.1.2'],
-  'invites' : ['com.google.firebase:firebase-invites:16.1.1'],
+  'app' : ['com.google.firebase:firebase-analytics:16.5.0'],
+  'admob' : ['com.google.firebase:firebase-ads:17.2.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'],
   'messaging' : ['com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar',
-                 'com.google.firebase:firebase-messaging:17.6.0'],
-  'remote_config' : ['com.google.firebase:firebase-config:16.5.0'],
-  'storage' : ['com.google.firebase:firebase-storage:16.1.0']
+                 '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']
 ]
 
 // 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-core:16.0.8'
-  implementation 'com.google.firebase:firebase-storage:16.1.0'
+  implementation 'com.google.firebase:firebase-analytics:16.5.0'
+  implementation 'com.google.firebase:firebase-storage:17.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-core:16.0.8'`
`49`		`- implementation 'com.google.firebase:firebase-invites:16.1.1'`
	`48`	`+ implementation 'com.google.firebase:firebase-analytics:16.5.0'`
	`49`	`+ implementation 'com.google.firebase:firebase-invites:17.0.0'`
`50`	`50`	`implementation project(':app:app_resources')`
`51`	`51`	`}`
`52`	`52`
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-core:16.0.8'`
`55`		`- implementation 'com.google.firebase:firebase-messaging:17.6.0'`
	`54`	`+ implementation 'com.google.firebase:firebase-analytics:16.5.0'`
	`55`	`+ implementation 'com.google.firebase:firebase-messaging:18.0.0'`
`56`	`56`	`implementation 'com.google.flatbuffers:flatbuffers-java:1.9.0'`
`57`	`57`	`}`
`58`	`58`