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

Author: a-maurice

Android/firebase_dependencies.gradle

@@ -16,20 +16,20 @@ 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.0'],
-  'admob' : ['com.google.firebase:firebase-ads:18.2.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:17.2.0'],
-  'analytics' : ['com.google.firebase:firebase-analytics:17.2.0'],
+  '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.1.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.0'],
+  'instance_id' : ['com.google.firebase:firebase-iid:20.0.1'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
-  'messaging' : ['com.google.firebase:firebase-messaging:20.0.0',
+  'messaging' : ['com.google.firebase:firebase-messaging:20.0.1',
                  'firebase_cpp_sdk.messaging:messaging_java'],
-  'performance' : ['com.google.firebase:firebase-perf:19.0.1'],
+  'performance' : ['com.google.firebase:firebase-perf:19.0.2'],
   'remote_config' : ['com.google.firebase:firebase-config:19.0.3'],
   'storage' : ['com.google.firebase:firebase-storage:19.1.0']
 ]

CMakeLists.txt

@@ -68,23 +68,6 @@ if(DEFINED ANDROID_NDK)
   set(ANDROID 1)
 endif()
 
-if(DEFINED CMAKE_TOOLCHAIN_FILE AND NOT ANDROID)
-  # Force using the toolchain file, as otherwise it loads it later in the
-  # process, after several of the checks against it have failed.
-  if(IS_ABSOLUTE ${CMAKE_TOOLCHAIN_FILE})
-    message("Using Toolchain File: ${CMAKE_TOOLCHAIN_FILE}")
-    include("${CMAKE_TOOLCHAIN_FILE}")
-  else()
-    message("Using Toolchain File: ${CMAKE_BINARY_DIR}/${CMAKE_TOOLCHAIN_FILE}")
-    include("${CMAKE_BINARY_DIR}/${CMAKE_TOOLCHAIN_FILE}")
-  endif()
-endif()
-
-# We're on iOS if the system root is set to "iphone" or some variant.
-if("${CMAKE_OSX_SYSROOT}" MATCHES "iphone")
-  set(IOS TRUE CACHE BOOL "Target platform is iOS.")
-endif()
-
 # Set directories needed by the Firebase subprojects
 # Directory to store generated files.
 set(FIREBASE_GEN_FILE_DIR ${CMAKE_BINARY_DIR}/generated)
@@ -113,8 +96,15 @@ set(FIREBASE_DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/downloads)
 # Run the CMake build logic that will download all the external dependencies.
 download_external_sources()
 
-# Disable the Flatbuffer build tests
+# 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
+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.
@@ -230,7 +220,6 @@ if(ANDROID OR IOS)
   endif()
 
   set(FLATBUFFERS_FLATC_EXECUTABLE ${firebase_external_flatc} CACHE STRING "")
-  set(FLATBUFFERS_BUILD_FLATC OFF CACHE BOOL "")
 
   # Setup the flatc custom build target.
   # These commands are executed from within the currect context, which has set
@@ -279,6 +268,11 @@ endif()
 # then refer to.
 set(FIREBASE_CPP_SDK_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
+include(binary_to_array)
+include(firebase_cpp_gradle)
+
+add_subdirectory(ios_pod)
+
 # If we're building tests, we need to include the 'testing' folder before any
 # of the tests actually get built.
 if(FIREBASE_CPP_BUILD_TESTS)

admob/CMakeLists.txt

@@ -14,17 +14,6 @@
 
 # CMake file for the firebase_admob library
 
-cmake_minimum_required (VERSION 3.1)
-set (CMAKE_CXX_STANDARD 11)
-
-include(binary_to_array)
-include(download_pod_headers)
-include(firebase_cpp_gradle)
-
-project(firebase_admob NONE)
-enable_language(C)
-enable_language(CXX)
-
 # Common source files used by all platforms
 set(common_SRCS
     src/common/admob_common.cc
@@ -121,29 +110,13 @@ elseif(IOS)
     APPEND_STRING PROPERTY
     COMPILE_FLAGS "-fobjc-arc")
 
-  # Setup the target for getting the Firebase iOS SDK headers through Cocoapods.
-  set(pod_target_name "download_admob_pod_headers")
-  set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
-  set(pod_list "")
-  list(APPEND pod_list "'Firebase/AdMob', '6.10.0'")
-
-  setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
-
-  # Add the Cocoapod headers to the include directories
-  set(base_header_dir "${pods_dir}/Pods/Headers/Public")
-  target_include_directories(firebase_admob
-    PRIVATE
-      ${base_header_dir}/Google-Mobile-Ads-SDK
+  setup_pod_headers(
+    firebase_admob
+    POD_NAMES
+      Google-Mobile-Ads-SDK
   )
-  string(CONCAT google_mobile_ads_framework_path
-    "${pods_dir}/Pods/Google-Mobile-Ads-SDK/"
-    "Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.framework")
+
   # AdMob expects the header files to be in a subfolder, so set up a symlink to
   # accomplish that.
-  symlink_framework_headers(firebase_admob ${pod_target_name}
-    ${google_mobile_ads_framework_path} GoogleMobileAds
-  )
-
-  # Add a dependency to downloading the headers onto admob.
-  add_dependencies(firebase_admob ${pod_target_name})
+  symlink_pod_headers(firebase_admob Google-Mobile-Ads-SDK GoogleMobileAds)
 endif()

admob/admob_resources/build.gradle

@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.2.0'
-  implementation 'com.google.firebase:firebase-ads:18.2.0'
+  implementation 'com.google.firebase:firebase-analytics:17.2.1'
+  implementation 'com.google.firebase:firebase-ads:18.3.0'
 }
 
 afterEvaluate {

admob/src/android/banner_view_internal_android.cc

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "admob/src/android/banner_view_internal_android.h"
+
 #include <assert.h>
 #include <jni.h>
 
@@ -23,13 +25,13 @@
 #include "admob/admob_resources.h"
 #include "admob/src/android/ad_request_converter.h"
 #include "admob/src/android/admob_android.h"
-#include "admob/src/android/banner_view_internal_android.h"
 #include "admob/src/common/admob_common.h"
 #include "admob/src/include/firebase/admob.h"
 #include "admob/src/include/firebase/admob/banner_view.h"
 #include "admob/src/include/firebase/admob/types.h"
 #include "app/src/assert.h"
 #include "app/src/mutex.h"
+#include "app/src/semaphore.h"
 #include "app/src/util_android.h"
 
 namespace firebase {
@@ -56,24 +58,25 @@ BannerViewInternalAndroid::BannerViewInternalAndroid(BannerView* base)
   env->DeleteLocalRef(helper_ref);
 }
 
+
+void DestroyOnDeleteCallback(const Future<void>& result,
+                          void* sem_data) {
+  if (sem_data != nullptr) {
+    Semaphore* semaphore =  static_cast<Semaphore*>(sem_data);
+    semaphore->Post();
+  }
+}
+
 BannerViewInternalAndroid::~BannerViewInternalAndroid() {
   JNIEnv* env = ::firebase::admob::GetJNI();
 
-  // Destroy the banner view so all pending futures / callbacks complete.
-  {
-    Mutex mutex(Mutex::kModeNonRecursive);
-    mutex.Acquire();
-    Destroy().OnCompletion(
-        [](const Future<void>&, void* mutex) {
-          reinterpret_cast<Mutex*>(mutex)->Release();
-        },
-        &mutex);
-    // Acquire a second Mutex lock to block until the Future for the last call
-    // to Destroy() completes at which point the lambda function in OnCompletion
-    // is called and the Mutex lock is released.
-    mutex.Acquire();
-    mutex.Release();
-  }
+  DestroyInternalData();
+
+  Semaphore semaphore(0);
+  InvokeNullary(kBannerViewFnDestroyOnDelete, banner_view_helper::kDestroy)
+      .OnCompletion(DestroyOnDeleteCallback, &semaphore);
+
+  semaphore.Wait();
   env->DeleteGlobalRef(helper_);
   helper_ = nullptr;
 }
@@ -131,8 +134,7 @@ Future<void> BannerViewInternalAndroid::Resume() {
 }
 
 Future<void> BannerViewInternalAndroid::Destroy() {
-  // The bounding box is zeroed on destroy.
-  bounding_box_ = {};
+  DestroyInternalData();
   return InvokeNullary(kBannerViewFnDestroy, banner_view_helper::kDestroy);
 }
 
@@ -214,6 +216,11 @@ Future<void> BannerViewInternalAndroid::InvokeNullary(
   return GetLastResult(fn);
 }
 
+void BannerViewInternalAndroid::DestroyInternalData() {
+  // The bounding box is zeroed on destroy.
+  bounding_box_ = {};
+}
+
 }  // namespace internal
 }  // namespace admob
 }  // namespace firebase

admob/src/android/banner_view_internal_android.h

@@ -78,6 +78,9 @@ class BannerViewInternalAndroid : public BannerViewInternal {
   // the future callback pointer.
   Future<void> InvokeNullary(BannerViewFn fn,
                              banner_view_helper::Method method);
+
+  // Cleans up any C++ side data before invoking the Android SDK to do the same.
+  void DestroyInternalData();
 };
 
 }  // namespace internal

admob/src/common/banner_view_internal.h

@@ -35,6 +35,7 @@ enum BannerViewFn {
   kBannerViewFnPause,
   kBannerViewFnResume,
   kBannerViewFnDestroy,
+  kBannerViewFnDestroyOnDelete,
   kBannerViewFnMoveTo,
   kBannerViewFnCount
 };

analytics/CMakeLists.txt

@@ -14,16 +14,6 @@
 
 # CMake file for the firebase_analytics library
 
-cmake_minimum_required (VERSION 3.1)
-set (CMAKE_CXX_STANDARD 11)
-
-include(download_pod_headers)
-include(firebase_cpp_gradle)
-
-project(firebase_analytics NONE)
-enable_language(C)
-enable_language(CXX)
-
 # Analytics generates header files for default events, parameters, and
 # properties based on the iOS SDK, that are used across all platforms.
 set(analytics_generated_headers_dir
@@ -131,27 +121,12 @@ elseif(IOS)
     APPEND_STRING PROPERTY
     COMPILE_FLAGS "-fobjc-arc")
 
-  # Setup the target for getting the Firebase iOS SDK headers through Cocoapods.
-  set(pod_target_name "download_analytics_pod_headers")
-  set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
-  set(pod_list "")
-  list(APPEND pod_list "'Firebase/Core', '6.10.0'")
-  list(APPEND pod_list "'Firebase/Analytics', '6.10.0'")
-
-  setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
-
-  # Add the Cocoapod headers to the include directories
-  set(base_header_dir "${pods_dir}/Pods/Headers/Public")
-  set(analytics_framework_path
-    "${pods_dir}/Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework")
-  target_include_directories(firebase_analytics
-    PRIVATE
-      ${base_header_dir}/FirebaseCore
-      ${analytics_framework_path}/Headers
+  setup_pod_headers(
+    firebase_analytics
+    POD_NAMES
+      FirebaseCore
+      FirebaseAnalytics
   )
-
-  # Add a dependency to downloading the headers onto analytics.
-  add_dependencies(firebase_analytics ${pod_target_name})
 endif()
 
 if(FIREBASE_CPP_BUILD_TESTS)

app/CMakeLists.txt

@@ -14,18 +14,6 @@
 
 # CMake file for the firebase_app library
 
-cmake_minimum_required (VERSION 3.1)
-set (CMAKE_CXX_STANDARD 11)
-
-include(FindPkgConfig)
-include(binary_to_array)
-include(download_pod_headers)
-include(firebase_cpp_gradle)
-
-project(firebase_app NONE)
-enable_language(C)
-enable_language(CXX)
-
 # Define how to generate google_services_resource_(source/header)
 binary_to_array("google_services_resource"
     "${CMAKE_CURRENT_LIST_DIR}/google_services.fbs"
@@ -356,27 +344,15 @@ elseif(IOS)
     APPEND_STRING PROPERTY
     COMPILE_FLAGS "-fobjc-arc")
 
-  # Setup the target for getting the Firebase iOS SDK headers through Cocoapods.
-  set(pod_target_name "download_app_pod_headers")
-  set(pods_dir "${PROJECT_BINARY_DIR}/Pods")
-  set(pod_list "")
-  list(APPEND pod_list "'Firebase/Core', '6.10.0'")
-  list(APPEND pod_list "'Firebase/DynamicLinks', '6.10.0'")
-
-  setup_pod_headers_target("${pod_target_name}" "${pods_dir}" "${pod_list}")
-
-  # Add the Cocoapod headers to the include directories
-  set(base_header_dir "${pods_dir}/Pods/Headers/Public")
-  target_include_directories(firebase_app
-    PRIVATE
-      ${base_header_dir}
-      ${base_header_dir}/FirebaseCore
-      ${base_header_dir}/FirebaseDynamicLinks
-      ${base_header_dir}/FirebaseInstanceID
+  # Add empty include path to get root include folder '.'
+  setup_pod_headers(
+    firebase_app
+    POD_NAMES
+      .
+      FirebaseCore
+      FirebaseDynamicLinks
+      FirebaseInstanceID
   )
-
-  # Add a dependency to downloading the headers onto app.
-  add_dependencies(firebase_app ${pod_target_name})
 endif()
 
 if (NOT ANDROID AND NOT IOS)

app/app_resources/build.gradle

@@ -46,7 +46,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.2.0'
+  implementation 'com.google.firebase:firebase-analytics:17.2.1'
 }
 
 afterEvaluate {