Feature/integration tests

.gitignore

@@ -0,0 +1 @@
+.DS_Store

Android/firebase_dependencies.gradle

@@ -16,22 +16,23 @@ 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.1'],
-  'admob' : ['com.google.firebase:firebase-ads:18.3.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:17.2.1'],
-  'analytics' : ['com.google.firebase:firebase-analytics:17.2.1'],
-  'auth' : ['com.google.firebase:firebase-auth:19.2.0'],
-  'database' : ['com.google.firebase:firebase-database:19.2.0'],
-  'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.0.0'],
-  'functions' : ['com.google.firebase:firebase-functions:19.0.1'],
-  'instance_id' : ['com.google.firebase:firebase-iid:20.0.2'],
+  '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.3'],
+  'functions' : ['com.google.firebase:firebase-functions:19.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.4'],
-  'remote_config' : ['com.google.firebase:firebase-config:19.1.0'],
-  'storage' : ['com.google.firebase:firebase-storage:19.1.0']
+  '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']
 ]
 
 // A map of library to the gradle resources that they depend upon.
@@ -42,6 +43,7 @@ def firebaseResourceDependenciesMap = [
   'admob' : [':admob:admob_resources'],
   'auth' : [':auth:auth_resources'],
   'database' : [':database:database_resources'],
+  'firestore' : [':firestore:firestore_resources'],
   'storage' : [':storage:storage_resources']
 ]
 
@@ -74,6 +76,9 @@ class Dependencies {
   def getDynamicLinks() {
     libSet.add('dynamic_links')
   }
+  def getFirestore() {
+    libSet.add('firestore')
+  }
   def getFunctions() {
     libSet.add('functions')
   }

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.
@@ -20,32 +20,52 @@ set (CMAKE_CXX_STANDARD 11)
 # Turn on virtual folders for visual studio
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+# Top level option that determines the default behavior of the include options
+# below. Useful for turning off all at once, and then turning on a specific one.
+option(FIREBASE_INCLUDE_LIBRARY_DEFAULT
+       "Should each library be included by default." ON)
 # Different options to enable/disable each library being included during
 # configuration.
-option(FIREBASE_INCLUDE_ADMOB "Include the AdMob library." ON)
+option(FIREBASE_INCLUDE_ADMOB "Include the AdMob library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_ANALYTICS
-       "Include the Google Analytics for Firebase library." ON)
-option(FIREBASE_INCLUDE_AUTH "Include the Firebase Authentication library." ON)
+       "Include the Google Analytics for Firebase library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
+option(FIREBASE_INCLUDE_AUTH "Include the Firebase Authentication library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_DATABASE
-       "Include the Firebase Realtime Database library." ON)
+       "Include the Firebase Realtime Database library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_DYNAMIC_LINKS
-       "Include the Firebase Dynamic Links library." ON)
+       "Include the Firebase Dynamic Links library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
+option(FIREBASE_INCLUDE_FIRESTORE
+       "Include the Cloud Firestore library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_FUNCTIONS
-       "Include the Cloud Functions for Firebase library." ON)
+       "Include the Cloud Functions for Firebase library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_INSTANCE_ID
-       "Include the Firebase Instance ID library." ON)
+       "Include the Firebase Instance ID library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_MESSAGING
-       "Include the Firebase Cloud Messaging library." ON)
+       "Include the Firebase Cloud Messaging library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_REMOTE_CONFIG
-       "Include the Firebase Remote Config library." ON)
+       "Include the Firebase Remote Config library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_STORAGE
-       "Include the Cloud Storage for Firebase library." ON)
+       "Include the Cloud Storage for Firebase library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
+
 option(FIREBASE_CPP_BUILD_TESTS
        "Enable the Firebase C++ Build Tests." OFF)
 option(FIREBASE_FORCE_FAKE_SECURE_STORAGE
        "Disable use of platform secret store and use fake impl." OFF)
 option(FIREBASE_CPP_BUILD_PACKAGE
        "Bundle the Firebase C++ libraries into a zip file." OFF)
+option(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD
+        "When building with Gradle, use the previously built libraries." OFF)
 
 # Define this directory to be the root of the C++ SDK, which the libraries can
 # then refer to.
@@ -70,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
@@ -80,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")
@@ -94,32 +120,95 @@ set(FIREBASE_BINARY_DIR ${PROJECT_BINARY_DIR})
 set(FIREBASE_INSTALL_DIR ${PROJECT_BINARY_DIR}/opt)
 set(FIREBASE_DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/downloads)
 
-# Run the CMake build logic that will download all the external dependencies.
-message(STATUS "Downloading external project dependencies...")
-download_external_sources()
-message(STATUS "Download complete.")
+# 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
+    "${CMAKE_CURRENT_LIST_DIR}/[^/]+/(.*)"
+    "${CMAKE_CURRENT_LIST_DIR}/app/\\1"
+    APP_BINARY_DIR "${FIREBASE_BINARY_DIR}")
+
+  set(FIRESTORE_SOURCE_DIR ${APP_BINARY_DIR}/external/src/firestore)
+else()
+  # Run the CMake build logic that will download all the external dependencies.
+  message(STATUS "Downloading external project dependencies...")
+  download_external_sources()
+  message(STATUS "Download complete.")
+
+  set(FIRESTORE_SOURCE_DIR ${FIREBASE_BINARY_DIR}/external/src/firestore)
+endif()
+
+# Include Firestore's external build early to resolve conflicts on packages.
+if(FIRESTORE_USE_EXTERNAL_CMAKE_BUILD)
+  set(FIRESTORE_BINARY_DIR ${FIRESTORE_SOURCE_DIR}-build)
+
+  set(
+    FIREBASE_IOS_BUILD_TESTS
+    ${FIREBASE_CPP_BUILD_TESTS}
+    CACHE BOOL "Force Firestore build tests to match"
+  )
+
+  add_subdirectory(${FIRESTORE_SOURCE_DIR} ${FIRESTORE_BINARY_DIR})
+
+  copy_subdirectory_definition(${FIRESTORE_SOURCE_DIR} NANOPB_SOURCE_DIR)
+endif()
 
 # Disable the Flatbuffer build tests, install and flathash
 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()
 
-# Add flatbuffers as a subdirectory, and set the directory variables for it,
-# so that the sub Firebase projects can depend upon it if necessary.
-add_external_library(flatbuffers)
+if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
+  message(STATUS "flatbuffers is added with APP_BINARY_DIR ${APP_BINARY_DIR}")
+  add_external_library(flatbuffers BINARY_DIR "${APP_BINARY_DIR}")
+else()
+  message(STATUS "flatbuffers is added normally")
+  add_external_library(flatbuffers)
+endif()
 
-if(FIREBASE_CPP_BUILD_TESTS)
+if(FIREBASE_CPP_BUILD_TESTS AND NOT FIRESTORE_USE_EXTERNAL_CMAKE_BUILD)
+  # Firestore's external build pulls in GoogleTest
   add_external_library(googletest)
-  add_external_library(absl)
+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)
+    # Get the correct version of the OpenSSL libraries based on building for MT.
+    if ("${CMAKE_CXX_FLAGS_DEBUG}" MATCHES "/MT" OR
+        "${CMAKE_CXX_FLAGS_RELEASE}" MATCHES "/MT")
+      set(OPENSSL_MSVC_STATIC_RT TRUE)
+    else()
+      set(OPENSSL_MSVC_STATIC_RT FALSE)
+    endif()
+  endif()
+
   # Build curl as a static library
   set(CURL_STATICLIB ON CACHE BOOL "")
   if (WIN32)
@@ -185,24 +274,44 @@ if (NOT ANDROID AND NOT IOS)
     )
     target_link_libraries(libuWS
       PRIVATE
-        ${OPENSSL_SSL_LIBRARY}
+        ${OPENSSL_LIBRARIES}
         uv_a
         zlibstatic
     )
   endif()
+endif()
+
+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)
 
-  find_package(Protobuf)
-  if (PROTOBUF_FOUND)
-    # NanoPB requires Protobuf to be present, so only add it if it was found.
-    add_external_library(nanopb)
-    # NanoPB has a FindNanopb which defines the function to generate files, so
-    # add it to the module path, and use that.
-    list(INSERT CMAKE_MODULE_PATH 0 ${NANOPB_SOURCE_DIR}/extra)
-    find_package(Nanopb)
+    set(PROTOBUF_FOUND ON)
+  else()
+    find_package(Protobuf)
+    if (PROTOBUF_FOUND)
+      # NanoPB requires Protobuf to be present, so only add it if it was found.
+      add_external_library(nanopb)
+
+      # NanoPB has a FindNanopb which defines the function to generate files,
+      # so add it to the module path, and use that.
+      list(APPEND CMAKE_MODULE_PATH ${NANOPB_SOURCE_DIR}/extra)
+      find_package(Nanopb)
+
+      target_compile_definitions(
+        protobuf-nanopb-static
+        PUBLIC -DPB_FIELD_32BIT -DPB_ENABLE_MALLOC
+      )
+    endif()
   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")
@@ -225,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
@@ -261,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
@@ -278,8 +389,24 @@ if(FIREBASE_CPP_BUILD_TESTS)
   add_subdirectory(testing)
 endif()
 
-# App needs to come first, since other libraries will depend upon it.
-add_subdirectory(app)
+if(NOT FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
+  add_subdirectory(app)
+else()
+  # Add firebase_app as a target on the previously built app.
+  add_library(firebase_app STATIC IMPORTED GLOBAL)
+  file(MAKE_DIRECTORY "${APP_BINARY_DIR}/generated")
+  file(MAKE_DIRECTORY "${FIREBASE_BINARY_DIR}/generated")
+  set(app_include_dirs
+      "${CMAKE_CURRENT_LIST_DIR}/app/src/include"
+      "${APP_BINARY_DIR}/generated"
+      "${FIREBASE_BINARY_DIR}/generated"
+  )
+  set_target_properties(firebase_app PROPERTIES
+    IMPORTED_LOCATION "${APP_BINARY_DIR}/libfirebase_app.a"
+    INTERFACE_INCLUDE_DIRECTORIES "${app_include_dirs}"
+  )
+endif()
+
 if (FIREBASE_INCLUDE_ADMOB)
   add_subdirectory(admob)
 endif()
@@ -295,6 +422,9 @@ endif()
 if (FIREBASE_INCLUDE_DYNAMIC_LINKS)
   add_subdirectory(dynamic_links)
 endif()
+if (FIREBASE_INCLUDE_FIRESTORE)
+  add_subdirectory(firestore)
+endif()
 if (FIREBASE_INCLUDE_FUNCTIONS)
   add_subdirectory(functions)
 endif()

README.md

@@ -190,14 +190,14 @@ Currently, the third party libraries that can be provided this way are:
 
 #### Building with CMake for iOS
 The Firebase C++ SDK comes with a CMake config file to build the library for
-iOS platforms, [cmake/ios.cmake](/cmake/ios.cmake).  In order to build with it,
-when running the CMake configuration pass it in with the CMAKE_TOOLCHAIN_FILE
-definition.  For example, to build the Analytics library for iOS, you could run
-the following commands:
+iOS platforms, [cmake/toolchains/ios.cmake](/cmake/toolchains/ios.cmake).  In
+order to build with it, when running the CMake configuration pass it in with
+the CMAKE_TOOLCHAIN_FILE definition.  For example, to build the Analytics
+library for iOS, you could run the following commands:
 
 ``` bash
 mkdir ios_build && cd ios_build
-cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.cmake ..
+cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/ios.cmake ..
 cmake --build . --target firebase_analytics
 ```