Fix 7.2.0 test issues. (#371)

Add play-services-base to IID and Messaging dependencies, for GoogleApiAvailability.
Added better error handling in google_play_services module.
Add -DNOMINMAX to Firestore Windows build.

Author: jonsimantov

Android/firebase_dependencies.gradle

@@ -17,7 +17,7 @@ import org.gradle.util.ConfigureUtil;
 // A map of library to the dependencies that need to be added for it.
 def firebaseDependenciesMap = [
   'app' : ['com.google.firebase:firebase-analytics:18.0.3'],
-  'admob' : ['com.google.firebase:firebase-ads:20.0.0',
+  'admob' : ['com.google.firebase:firebase-ads:19.8.0',
              'com.google.android.gms:play-services-measurement-sdk-api:18.0.3',
              'com.google.android.gms:play-services-base:17.6.0'],
   'analytics' : ['com.google.firebase:firebase-analytics:18.0.3',
@@ -29,17 +29,20 @@ def firebaseDependenciesMap = [
   'functions' : ['com.google.firebase:firebase-functions:19.2.0'],
   'installations' : ['com.google.firebase:firebase-installations:16.3.5',
                      'com.google.android.gms:play-services-base:17.6.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:21.1.0'],
+  'instance_id' : ['com.google.firebase:firebase-iid:21.1.0',
+                   'com.google.android.gms:play-services-base:17.6.0'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
   'messaging' : ['com.google.firebase:firebase-messaging:21.1.0',
                  'firebase_cpp_sdk.messaging:messaging_java',
-                 'androidx.core:core:1.0.2',
-                 'com.google.flatbuffers:flatbuffers-java:1.9.0'],
+                 'androidx.core:core:1.0.1',
+                 'com.google.flatbuffers:flatbuffers-java:1.9.0',
+                 'com.google.android.gms:play-services-base:17.6.0'],
   'performance' : ['com.google.firebase:firebase-perf:19.1.1'],
   'remote_config' : ['com.google.firebase:firebase-config:20.0.4',
                      'com.google.android.gms:play-services-base:17.6.0'],
-  'storage' : ['com.google.firebase:firebase-storage:19.2.2']
+  'storage' : ['com.google.firebase:firebase-storage:19.2.2'],
+  'testlab' : []
 ]
 
 // A map of library to the gradle resources that they depend upon.

app/src/google_play_services/availability_android.cc

@@ -184,7 +184,10 @@ bool Initialize(JNIEnv* env, jobject activity) {
     }
     firebase::util::Terminate(env);
   }
-
+  if (env->ExceptionCheck()) {
+    env->ExceptionDescribe();
+    env->ExceptionClear();
+  }
   firebase::LogError(
       "Unable to check Google Play services availablity as the "
       "com.google.android.gms.common.GoogleApiAvailability class is not "
@@ -196,7 +199,11 @@ bool Initialize(JNIEnv* env, jobject activity) {
 }
 
 void Terminate(JNIEnv* env) {
-  FIREBASE_ASSERT(g_initialized_count);
+  if (g_initialized_count == 0) {
+    // Nothing to terminate.
+    firebase::LogWarning("Extraneous call to google_play_services::Terminate");
+    return;
+  }
   g_initialized_count--;
   if (g_data && g_initialized_count == 0) {
     if (g_data->classes_loaded) {

firestore/CMakeLists.txt

@@ -324,7 +324,7 @@ set(FIREBASE_FIRESTORE_CPP_DEFINES -DINTERNAL_EXPERIMENTAL=1)
 if (WIN32 AND NOT ANDROID AND NOT IOS)
   # On Windows, gRPC gives a compiler error in firebase_metadata_provider_desktop.cc
   # unless _WIN32_WINNT is defined to this value (0x0600, Windows Vista).
-  set(FIREBASE_FIRESTORE_CPP_DEFINES ${FIREBASE_FIRESTORE_CPP_DEFINES} -D_WIN32_WINNT=0x0600)
+  set(FIREBASE_FIRESTORE_CPP_DEFINES ${FIREBASE_FIRESTORE_CPP_DEFINES} -D_WIN32_WINNT=0x0600 -DNOMINMAX)
 endif()
 
 target_compile_definitions(firebase_firestore

release_build_files/Android/firebase_dependencies.gradle

@@ -17,7 +17,7 @@ import org.gradle.util.ConfigureUtil;
 // A map of library to the dependencies that need to be added for it.
 def firebaseDependenciesMap = [
   'app' : ['com.google.firebase:firebase-analytics:18.0.3'],
-  'admob' : ['com.google.firebase:firebase-ads:20.0.0',
+  'admob' : ['com.google.firebase:firebase-ads:19.8.0',
              'com.google.android.gms:play-services-measurement-sdk-api:18.0.3',
              'com.google.android.gms:play-services-base:17.6.0'],
   'analytics' : ['com.google.firebase:firebase-analytics:18.0.3',
@@ -29,14 +29,16 @@ def firebaseDependenciesMap = [
   'functions' : ['com.google.firebase:firebase-functions:19.2.0'],
   'installations' : ['com.google.firebase:firebase-installations:16.3.5',
                      'com.google.android.gms:play-services-base:17.6.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:21.1.0'],
+  'instance_id' : ['com.google.firebase:firebase-iid:21.1.0',
+                   'com.google.android.gms:play-services-base:17.6.0'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
   'messaging' : ['com.google.firebase:firebase-messaging:21.1.0',
                  'com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar',
-                 'androidx.core:core:1.0.2',
-                 'com.google.flatbuffers:flatbuffers-java:1.9.0'],
-  'performance' : ['com.google.firebase:firebase-perf:19.1.0'],
+                 'androidx.core:core:1.0.1',
+                 'com.google.flatbuffers:flatbuffers-java:1.9.0',
+                 'com.google.android.gms:play-services-base:17.6.0'],
+  'performance' : ['com.google.firebase:firebase-perf:19.1.1'],
   'remote_config' : ['com.google.firebase:firebase-config:20.0.4',
                      'com.google.android.gms:play-services-base:17.6.0'],
   'storage' : ['com.google.firebase:firebase-storage:19.2.2'],