Merge 7.0.0 to dev

Android/firebase_dependencies.gradle

@@ -16,26 +16,28 @@ 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.5.0'],
-  'admob' : ['com.google.firebase:firebase-ads:19.3.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:17.5.0',
-             'com.google.android.gms:play-services-base:17.4.0'],
-  'analytics' : ['com.google.firebase:firebase-analytics:17.5.0',
-                 'com.google.android.gms:play-services-base:17.4.0'],
-  'auth' : ['com.google.firebase:firebase-auth:19.3.2'],
-  'database' : ['com.google.firebase:firebase-database:19.4.0'],
-  'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.0'],
-  'firestore' : ['com.google.firebase:firebase-firestore:21.6.0'],
+  'app' : ['com.google.firebase:firebase-analytics:18.0.0'],
+  'admob' : ['com.google.firebase:firebase-ads:19.5.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:18.0.0',
+             'com.google.android.gms:play-services-base:17.5.0'],
+  'analytics' : ['com.google.firebase:firebase-analytics:18.0.0',
+                 'com.google.android.gms:play-services-base:17.5.0'],
+  'auth' : ['com.google.firebase:firebase-auth:20.0.0'],
+  'database' : ['com.google.firebase:firebase-database:19.5.1'],
+  'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.1'],
+  'firestore' : ['com.google.firebase:firebase-firestore:22.0.0'],
   'functions' : ['com.google.firebase:firebase-functions:19.1.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:20.2.4'],
+  'installations' : ['com.google.firebase:firebase-installations:16.3.3',
+                     'com.google.android.gms:play-services-base:17.4.0'],
+  'instance_id' : ['com.google.firebase:firebase-iid:21.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:20.2.4',
+  'messaging' : ['com.google.firebase:firebase-messaging:21.0.0',
                  'firebase_cpp_sdk.messaging:messaging_java',
                  'androidx.core:core:1.0.1'],
-  'performance' : ['com.google.firebase:firebase-perf:19.0.8'],
-  'remote_config' : ['com.google.firebase:firebase-config:19.2.0',
-                     'com.google.android.gms:play-services-base:17.4.0'],
+  'performance' : ['com.google.firebase:firebase-perf:19.0.9'],
+  'remote_config' : ['com.google.firebase:firebase-config:20.0.0',
+                     'com.google.android.gms:play-services-base:17.5.0'],
   'storage' : ['com.google.firebase:firebase-storage:19.2.0']
 ]
 

admob/admob_resources/build.gradle

@@ -45,13 +45,13 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.5.0'
-  implementation 'com.google.firebase:firebase-ads:19.3.0'
+  implementation 'com.google.firebase:firebase-analytics:18.0.0'
+  implementation 'com.google.firebase:firebase-ads:19.5.0'
 }
 
 afterEvaluate {
   generateReleaseBuildConfig.enabled = false
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('admob_resources')
+extractAndDexAarFile('admob_resources')

admob/src/android/admob_android.cc

@@ -143,6 +143,10 @@ InitResult Initialize(JNIEnv* env, jobject activity) {
 }
 
 InitResult Initialize(JNIEnv* env, jobject activity, const char* admob_app_id) {
+  if (g_java_vm == nullptr) {
+    env->GetJavaVM(&g_java_vm);
+  }
+
   // AdMob requires Google Play services if the class
   // "com.google.android.gms.ads.internal.ClientApi" does not exist.
   if (!util::FindClass(env, "com/google/android/gms/ads/internal/ClientApi") &&
@@ -192,7 +196,6 @@ InitResult Initialize(JNIEnv* env, jobject activity, const char* admob_app_id) {
 
   g_initialized = true;
   g_activity = env->NewGlobalRef(activity);
-  env->GetJavaVM(&g_java_vm);
 
   InitializeGoogleMobileAds(env, admob_app_id);
   RegisterTerminateOnDefaultAppDestroy();

admob/tools/ios/testapp/testapp.xcodeproj/project.pbxproj

@@ -410,7 +410,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
@@ -456,7 +456,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -476,7 +476,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImages;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = testapp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.ios.admob.testapp;
 				PRODUCT_NAME = testapp;

analytics/src/analytics_android.cc

@@ -298,12 +298,6 @@ void SetUserId(const char* user_id) {
   if (user_id_value) env->DeleteLocalRef(user_id_value);
 }
 
-// Sets the minimum engagement time required before starting a session.
-void SetMinimumSessionDuration(int64_t milliseconds) {
-  LogWarning(
-      "SetMinimumSessionDuration is deprecated and no longer functional.");
-}
-
 // Sets the duration of inactivity that terminates the current session.
 void SetSessionTimeoutDuration(int64_t milliseconds) {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());

analytics/src/analytics_ios.mm

@@ -236,12 +236,6 @@ void SetUserId(const char* user_id) {
   [FIRAnalytics setUserID:(user_id ? @(user_id) : nil)];
 }
 
-// Sets the minimum engagement time required before starting a session.
-// (No longer functional.)
-void SetMinimumSessionDuration(int64_t milliseconds) {
-  LogWarning("SetMinimumSessionDuration is deprecated and no longer functional.");
-}
-
 // Sets the duration of inactivity that terminates the current session.
 void SetSessionTimeoutDuration(int64_t milliseconds) {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());

analytics/src/analytics_stub.cc

@@ -105,11 +105,6 @@ void SetUserId(const char* /*user_id*/) {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
 }
 
-// Sets the minimum engagement time required before starting a session.
-void SetMinimumSessionDuration(int64_t /*milliseconds*/) {
-  FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
-}
-
 // Sets the duration of inactivity that terminates the current session.
 void SetSessionTimeoutDuration(int64_t /*milliseconds*/) {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());

analytics/src/include/firebase/analytics.h

@@ -489,17 +489,6 @@ void SetUserProperty(const char* name, const char* property);
 /// Setting user_id to NULL or nullptr removes the user ID.
 void SetUserId(const char* user_id);
 
-/// @brief Sets the minimum engagement time required before starting a session.
-///
-/// @note The default value is 10000 (10 seconds).
-///
-/// @param milliseconds The minimum engagement time required to start a new
-/// session.
-///
-/// @deprecated SetMinimumSessionDuration is deprecated and no longer
-/// functional.
-FIREBASE_DEPRECATED void SetMinimumSessionDuration(int64_t milliseconds);
-
 /// @brief Sets the duration of inactivity that terminates the current session.
 ///
 /// @note The default value is 1800000 (30 minutes).

app/CMakeLists.txt

@@ -162,11 +162,15 @@ set(app_android_SRCS
 set(app_ios_SRCS
     src/app_ios.mm
     src/util_ios.mm
+    src/heartbeat_date_storage_desktop.cc
+    src/heartbeat_info_desktop.cc
     src/invites/ios/invites_receiver_internal_ios.mm
     src/invites/ios/invites_ios_startup.mm
     src/uuid_ios_darwin.mm)
 set(app_desktop_SRCS
     src/app_desktop.cc
+    src/heartbeat_date_storage_desktop.cc
+    src/heartbeat_info_desktop.cc
     src/invites/stub/invites_receiver_internal_stub.cc
     src/variant_util.cc)
 if(ANDROID)
@@ -179,11 +183,13 @@ else()
   if(MSVC)
     set(app_desktop_extra_SRCS
         src/secure/user_secure_windows_internal.cc
+        src/filesystem_desktop_windows.cc
         src/locale.cc
         src/uuid.cc)
   elseif(APPLE)
     set(app_desktop_extra_SRCS
         src/secure/user_secure_darwin_internal.mm
+        src/filesystem_apple.mm
         src/locale_apple.mm
         src/uuid_ios_darwin.mm)
   else()
@@ -202,6 +208,7 @@ else()
     endif()
     set(app_desktop_extra_SRCS
         src/secure/user_secure_linux_internal.cc
+        src/filesystem_desktop_linux.cc
         src/locale.cc
         src/uuid.cc)
   endif()
@@ -230,10 +237,13 @@ set(utility_common_HDRS
     src/callback.h
     src/cleanup_notifier.h
     src/embedded_file.h
+    src/filesystem.h
     src/function_registry.h
     src/future_manager.h
     src/intrusive_list.h
     src/log.h
+    src/heartbeat_date_storage_desktop.h
+    src/heartbeat_info_desktop.h
     src/mutex.h
     src/optional.h
     src/path.h

app/app_resources/build.gradle

@@ -46,12 +46,12 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.5.0'
+  implementation 'com.google.firebase:firebase-analytics:18.0.0'
 }
 
 afterEvaluate {
   generateReleaseBuildConfig.enabled = false
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('app_resources')
+extractAndDexAarFile('app_resources')

app/google_api_resources/build.gradle

@@ -49,8 +49,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.5.0'
-  implementation 'com.google.android.gms:play-services-base:17.0.0'
+  implementation 'com.google.firebase:firebase-analytics:18.0.0'
+  implementation 'com.google.android.gms:play-services-base:17.5.0'
   implementation project(':app:app_resources')
 }
 
@@ -59,4 +59,4 @@ afterEvaluate {
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('google_api_resources')
+extractAndDexAarFile('google_api_resources')

app/invites_resources/build.gradle

@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.5.0'
-  implementation 'com.google.firebase:firebase-dynamic-links:19.1.0'
+  implementation 'com.google.firebase:firebase-analytics:18.0.0'
+  implementation 'com.google.firebase:firebase-dynamic-links:19.1.1'
   implementation project(':app:app_resources')
 }
 
@@ -55,4 +55,4 @@ afterEvaluate {
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('invites_resources')
+extractAndDexAarFile('invites_resources')

app/rest/tests/request_file_test.cc

@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
+#include "app/rest/request_file.h"
+
 #include <stdio.h>
 
 #include <cstddef>
 #include <string>
 
-#include "app/rest/request_file.h"
 #include "app/rest/tests/request_test.h"
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
+#include "absl/flags/flag.h"
 
 namespace firebase {
 namespace rest {
@@ -31,7 +33,7 @@ namespace test {
 class RequestFileTest : public ::testing::Test {
  public:
   RequestFileTest()
-      : filename_(FLAGS_test_tmpdir + "/a_file.txt"),
+      : filename_(absl::GetFlag(FLAGS_test_tmpdir) + "/a_file.txt"),
         file_(nullptr),
         file_size_(0) {}
 

app/src/app_common.cc

@@ -143,7 +143,14 @@ const char* kCppRuntimeOrStl = "libcpp";
 
 #elif FIREBASE_PLATFORM_LINUX
 const char* kOperatingSystem = "linux";
+
+#if defined(_GLIBCXX_UTILITY)
 const char* kCppRuntimeOrStl = "gnustl";
+#elif defined(_LIBCPP_STD_VER)
+const char* kCppRuntimeOrStl = "libcpp";
+#else
+#error Unknown Linux STL.
+#endif  // STL
 
 #if __amd64__
 const char* kCpuArchitecture = "x86_64";

app/src/filesystem.h

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FIREBASE_APP_CLIENT_CPP_SRC_FILESYSTEM_H_
+#define FIREBASE_APP_CLIENT_CPP_SRC_FILESYSTEM_H_
+
+#include <string>
+
+#if !defined(FIREBASE_NAMESPACE)
+#define FIREBASE_NAMESPACE firebase
+#endif
+
+namespace FIREBASE_NAMESPACE {
+
+/**
+ * Returns a system-defined best directory in which to create application
+ * data. Values vary wildly across platforms. They include:
+ *
+ *   * iOS: $container/Library/Application Support/$app_name
+ *   * Linux: $HOME/.local/share/$app_name
+ *   * macOS: $container/Library/Application Support/$app_name
+ *   * Other UNIX: $HOME/.$app_name. Note: Android is not implemented yet.
+ *   * tvOS: $container/Library/Caches/$app_name
+ *   * Windows: %USERPROFILE%/AppData/Local
+ *
+ * On iOS, tvOS, and macOS (when running sandboxed), these locations are
+ * relative to the data container for the current application. On macOS when
+ * the application is not sandboxed, the returned value will be relative to
+ * $HOME instead. See "About the iOS File System" in the Apple "File System
+ * Programming Guide" at https://apple.co/2Nn7Bsb.
+ *
+ * Note: the returned path is just where the system thinks the application
+ * data should be stored, but `AppDataDir` does not actually guarantee that this
+ * path exists (unless `should_create` is `true`, in which case it will attempt
+ * to create a directory at the given path).
+ *
+ * @param app_name The name of the application.
+ * @return The path to the application data, or an empty string if an error
+ *     occurred.
+ */
+// TODO(varconst): Android is currently not supported.
+//
+// TODO(b/171738655): use a separate function instead of the `should_create`
+// flag. Use `StatusOr` for returning errors.
+std::string AppDataDir(const char* app_name, bool should_create = true,
+                       std::string* out_error = nullptr);
+
+}  // namespace FIREBASE_NAMESPACE
+
+#endif  // FIREBASE_APP_CLIENT_CPP_SRC_FILESYSTEM_H_