Merge remote-tracking branch 'origin/master' into ghm

Author: a-maurice

Android/firebase_dependencies.gradle

@@ -16,22 +16,22 @@ 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:17.2.2'],
-  'admob' : ['com.google.firebase:firebase-ads:18.3.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:17.2.2'],
-  'analytics' : ['com.google.firebase:firebase-analytics:17.2.2'],
-  'auth' : ['com.google.firebase:firebase-auth:19.2.0'],
-  'database' : ['com.google.firebase:firebase-database:19.2.1'],
+  'app' : ['com.google.firebase:firebase-analytics:17.4.1'],
+  'admob' : ['com.google.firebase:firebase-ads:19.1.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:17.4.1'],
+  'analytics' : ['com.google.firebase:firebase-analytics:17.4.1'],
+  'auth' : ['com.google.firebase:firebase-auth:19.3.1'],
+  'database' : ['com.google.firebase:firebase-database:19.3.0'],
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.0'],
-  'firestore' : ['com.google.firebase:firebase-firestore:21.4.0'],
+  'firestore' : ['com.google.firebase:firebase-firestore:21.4.3'],
   'functions' : ['com.google.firebase:firebase-functions:19.0.2'],
-  'instance_id' : ['com.google.firebase:firebase-iid:20.0.2'],
+  'instance_id' : ['com.google.firebase:firebase-iid:20.1.7'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
-  'messaging' : ['com.google.firebase:firebase-messaging:20.1.0',
+  'messaging' : ['com.google.firebase:firebase-messaging:20.1.7',
                  'firebase_cpp_sdk.messaging:messaging_java'],
-  'performance' : ['com.google.firebase:firebase-perf:19.0.5'],
-  'remote_config' : ['com.google.firebase:firebase-config:19.1.1'],
+  'performance' : ['com.google.firebase:firebase-perf:19.0.7'],
+  'remote_config' : ['com.google.firebase:firebase-config:19.1.4'],
   'storage' : ['com.google.firebase:firebase-storage:19.1.1']
 ]
 

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright 2018 Google
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -90,7 +90,13 @@ endif()
 # Occasionally ANDROID is not being set correctly when invoked by gradle, so
 # set it manually if ANDROID_NDK has been defined.
 if(DEFINED ANDROID_NDK)
-  set(ANDROID 1)
+  set(ANDROID ON)
+endif()
+
+if(NOT ANDROID AND NOT IOS)
+  set(DESKTOP ON)
+else()
+  set(DESKTOP OFF)
 endif()
 
 # Set directories needed by the Firebase subprojects
@@ -100,7 +106,7 @@ set(FIREBASE_GEN_FILE_DIR ${CMAKE_BINARY_DIR}/generated)
 set(FIREBASE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 if (FIREBASE_CPP_BUILD_TESTS AND MSVC)
-  # Googletest requires MSVC to compile with the static version of the runtime
+  # GoogleTest requires MSVC to compile with the static version of the runtime
   # library, so define the appropriate runtime flag, before adding libraries.
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
@@ -114,6 +120,20 @@ set(FIREBASE_BINARY_DIR ${PROJECT_BINARY_DIR})
 set(FIREBASE_INSTALL_DIR ${PROJECT_BINARY_DIR}/opt)
 set(FIREBASE_DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/downloads)
 
+# Firestore is split into a public C++ component and the Firestore core, a
+# non-public C++ API used for building other language bindings. Desktop
+# platforms get the Firestore core from the CMake build in firebase-ios-sdk.
+#
+# Mobile platforms do not:
+#
+#   * Android uses the Android SDK via JNI and does not use the Firestore
+#     core.
+#   * iOS gets the Firestore core from the FirebaseFirestore CocoaPod and
+#     does not build the core via CMake.
+if(FIREBASE_INCLUDE_FIRESTORE AND DESKTOP)
+  set(FIRESTORE_USE_EXTERNAL_CMAKE_BUILD ON)
+endif()
+
 if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
   # Figure out where app's binary_dir was.
   string(REGEX REPLACE
@@ -132,7 +152,7 @@ else()
 endif()
 
 # Include Firestore's external build early to resolve conflicts on packages.
-if(NOT ANDROID AND FIREBASE_INCLUDE_FIRESTORE)
+if(FIRESTORE_USE_EXTERNAL_CMAKE_BUILD)
   set(FIRESTORE_BINARY_DIR ${FIRESTORE_SOURCE_DIR}-build)
 
   set(
@@ -151,7 +171,7 @@ set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "")
 set(FLATBUFFERS_INSTALL OFF CACHE BOOL "")
 set(FLATBUFFERS_FLATHASH OFF CACHE BOOL "")
 
-# Disable buliding flatc if cross compiling
+# Disable building flatc if cross compiling
 if(IOS OR ANDROID)
   set(FLATBUFFERS_BUILD_FLATC OFF CACHE BOOL "")
 endif()
@@ -164,13 +184,19 @@ else()
   add_external_library(flatbuffers)
 endif()
 
-if(FIREBASE_CPP_BUILD_TESTS AND NOT FIREBASE_INCLUDE_FIRESTORE)
-  # Firestore's external build pulls in googletest
+if(FIREBASE_CPP_BUILD_TESTS AND NOT FIRESTORE_USE_EXTERNAL_CMAKE_BUILD)
+  # Firestore's external build pulls in GoogleTest
   add_external_library(googletest)
 endif()
 
+if((FIREBASE_INCLUDE_DATABASE AND DESKTOP) AND NOT FIREBASE_INCLUDE_FIRESTORE)
+  # LevelDB is needed for Desktop and Firestore, but if firestore is being built
+  # LevelDB will already be included.
+  add_external_library(leveldb)
+endif()
+
 # Some of the external libraries are not used for mobile.
-if (NOT ANDROID AND NOT IOS)
+if(DESKTOP)
   # Use the static versions of the OpenSSL libraries.
   set(OPENSSL_USE_STATIC_LIBS TRUE)
   if (MSVC)
@@ -255,8 +281,8 @@ if (NOT ANDROID AND NOT IOS)
   endif()
 endif()
 
-if(NOT ANDROID)
-  if(FIREBASE_INCLUDE_FIRESTORE)
+if(DESKTOP)
+  if(FIRESTORE_USE_EXTERNAL_CMAKE_BUILD)
     # The Firestore build includes protobuf and nanopb already
     list(APPEND CMAKE_MODULE_PATH ${NANOPB_SOURCE_DIR}/extra)
     find_package(Nanopb REQUIRED)
@@ -281,7 +307,11 @@ if(NOT ANDROID)
   endif()
 endif()
 
-if(ANDROID OR IOS)
+if(DESKTOP)
+  # Desktop platforms do not need to declare this dependency, as they will build
+  # flatc correctly when needed.
+  set(FIREBASE_FLATBUFFERS_DEPENDENCIES "")
+else()
   # Mobile platforms build flatc externally so that it works on the platform
   # performing the build.
   set(firebase_external_flatc_build_dir "${FLATBUFFERS_BINARY_DIR}-flatc")
@@ -304,7 +334,7 @@ if(ANDROID OR IOS)
   set(FLATBUFFERS_FLATC_EXECUTABLE ${firebase_external_flatc} CACHE STRING "")
 
   # Setup the flatc custom build target.
-  # These commands are executed from within the currect context, which has set
+  # These commands are executed from within the current context, which has set
   # variables for the target platform. We use "env -i" to clear these
   # variables, and manually keep the PATH to regular bash path.
   # If we didn't do this, we'd end up building flatc for the target platform
@@ -340,15 +370,17 @@ if(ANDROID OR IOS)
   # Set a variable that the dependencies can use, to trigger the build before
   # using flatbuffers.
   set(FIREBASE_FLATBUFFERS_DEPENDENCIES "firebase_flatc_prebuild")
-else()
-  # Other platforms do not need to declare this dependency, as they will build
-  # flatc correctly when needed.
-  set(FIREBASE_FLATBUFFERS_DEPENDENCIES "")
 endif()
 
 include(binary_to_array)
 include(firebase_cpp_gradle)
 
+# Ensure min/max macros don't get declared on Windows
+# (so we can use std::min/max), before including the Firebase subdirectories.
+if(MSVC)
+  add_definitions(-DNOMINMAX)
+endif()
+
 add_subdirectory(ios_pod)
 
 # If we're building tests, we need to include the 'testing' folder before any

admob/admob_resources/build.gradle

@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.2.2'
-  implementation 'com.google.firebase:firebase-ads:18.3.0'
+  implementation 'com.google.firebase:firebase-analytics:17.4.1'
+  implementation 'com.google.firebase:firebase-ads:19.1.0'
 }
 
 afterEvaluate {