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.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'],
+  'app' : ['com.google.firebase:firebase-analytics:17.4.4'],
+  'admob' : ['com.google.firebase:firebase-ads:19.2.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:17.4.4'],
+  'analytics' : ['com.google.firebase:firebase-analytics:17.4.4'],
+  'auth' : ['com.google.firebase:firebase-auth:19.3.2'],
+  'database' : ['com.google.firebase:firebase-database:19.3.1'],
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.0'],
-  'firestore' : ['com.google.firebase:firebase-firestore:21.4.3'],
+  'firestore' : ['com.google.firebase:firebase-firestore:21.5.0'],
   'functions' : ['com.google.firebase:firebase-functions:19.0.2'],
-  'instance_id' : ['com.google.firebase:firebase-iid:20.1.7'],
+  'instance_id' : ['com.google.firebase:firebase-iid:20.2.3'],
   '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.7',
+  'messaging' : ['com.google.firebase:firebase-messaging:20.2.3',
                  'firebase_cpp_sdk.messaging:messaging_java'],
   'performance' : ['com.google.firebase:firebase-perf:19.0.7'],
-  'remote_config' : ['com.google.firebase:firebase-config:19.1.4'],
+  'remote_config' : ['com.google.firebase:firebase-config:19.2.0'],
   'storage' : ['com.google.firebase:firebase-storage:19.1.1']
 ]
 

admob/admob_resources/build.gradle

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

analytics/generate_constants.py

@@ -91,6 +91,7 @@
     (r'(?s)(@code)([^{].*using namespace firebase::analytics;'
      r'.*Parameter [^{]+[^}]+}.*@endcode)',
      '\n'
+     '///\n'
      '/// @if cpp_examples\n'
      '/// \\1{.cpp}'
      '\\2\n\n'

analytics/ios_headers/FIREventNames.h

@@ -263,6 +263,15 @@ static NSString *const kFIREventPurchaseRefund NS_SWIFT_NAME(AnalyticsEventPurch
 static NSString *const kFIREventRemoveFromCart NS_SWIFT_NAME(AnalyticsEventRemoveFromCart) =
     @"remove_from_cart";
 
+/// Screen View event. This event signifies a screen view. Use this when a screen transition occurs.
+/// This event can be logged irrespective of whether automatic screen tracking is enabled. Params:
+///
+/// <ul>
+///     <li>@c kFIRParameterScreenClass (NSString) (optional)</li>
+///     <li>@c kFIRParameterScreenName (NSString) (optional)</li>
+/// </ul>
+static NSString *const kFIREventScreenView NS_SWIFT_NAME(AnalyticsEventScreenView) = @"screen_view";
+
 /// Search event. Apps that support search features can use this event to contextualize search
 /// operations by supplying the appropriate, corresponding parameters. This event can help you
 /// identify the most popular content in your app. Params:

analytics/ios_headers/FIRParameterNames.h

@@ -385,6 +385,26 @@ static NSString *const kFIRParameterQuantity NS_SWIFT_NAME(AnalyticsParameterQua
 /// </pre>
 static NSString *const kFIRParameterScore NS_SWIFT_NAME(AnalyticsParameterScore) = @"score";
 
+/// Current screen class, such as the class name of the UIViewController, logged with screen_view
+/// event and added to every event (NSString). <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterScreenClass : @"LoginViewController",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRParameterScreenClass NS_SWIFT_NAME(AnalyticsParameterScreenClass) =
+    @"screen_class";
+
+/// Current screen name, such as the name of the UIViewController, logged with screen_view event and
+/// added to every event (NSString). <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterScreenName : @"LoginView",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRParameterScreenName NS_SWIFT_NAME(AnalyticsParameterScreenName) =
+    @"screen_name";
+
 /// The search string/keywords used (NSString).
 /// <pre>
 ///     NSDictionary *params = @{

app/app_resources/build.gradle

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

app/google_api_resources/build.gradle

@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.4.1'
+  implementation 'com.google.firebase:firebase-analytics:17.4.4'
   implementation project(':app:app_resources')
 }
 

app/invites_resources/build.gradle

@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.4.1'
+  implementation 'com.google.firebase:firebase-analytics:17.4.4'
   implementation 'com.google.firebase:firebase-dynamic-links:19.1.0'
   implementation project(':app:app_resources')
 }

app/rest/tests/zlibwrapper_unittest.cc

@@ -27,6 +27,7 @@
 #include "gmock/gmock.h"
 #include "absl/base/macros.h"
 #include "absl/strings/escaping.h"
+#include "absl/strings/string_view.h"
 #include "util/random/acmrandom.h"
 
 // 1048576 == 2^20 == 1 MB
@@ -105,7 +106,7 @@ REGISTER_MODULE_INITIALIZER(zlibwrapper_unittest, {
       << "  Reason: " << limiter.reason();
 });
 
-bool ReadFileToString(const std::string& filename, std::string* output,
+bool ReadFileToString(absl::string_view filename, std::string* output,
                       int64 max_size) {
   std::ifstream f;
   f.open(filename);
@@ -696,7 +697,7 @@ class ZLibWrapperTest : public ::testing::TestWithParam<std::string> {
     return dict;
   }
 
-  std::string ReadFileToTest(const std::string& filename) {
+  std::string ReadFileToTest(absl::string_view filename) {
     std::string uncompbuf;
     LOG(INFO) << "Testing file: " << filename;
     CHECK(ReadFileToString(filename, &uncompbuf, MAX_BUF_SIZE));
@@ -891,7 +892,7 @@ TEST_P(ZLibWrapperTest, ChunkedCompression) {
   TestGzip(&zlib, uncompbuf);
 }
 
-// Simple helper to force specialization of strings::Split.
+// Simple helper to force specialization of absl::StrSplit.
 std::vector<std::string> GetFilesToProcess() {
   std::string files_to_process =
       FLAGS_files_to_process.empty()

app/src/assert.h

@@ -45,13 +45,13 @@
 // Assert condition is true, if it's false log an assert with the specified
 // expression as a string.
 #define FIREBASE_ASSERT_WITH_EXPRESSION(condition, expression)      \
-  {                                                                 \
+  do {                                                              \
     if (!(condition)) {                                             \
-      FIREBASE_NAMESPACE::LogAssert(                                  \
+      FIREBASE_NAMESPACE::LogAssert(                                \
           FIREBASE_ASSERT_MESSAGE_PREFIX FIREBASE_EXPAND_STRINGIFY( \
               expression));                                         \
     }                                                               \
-  }
+  } while (false)
 
 // Assert condition is true, if it's false log an assert with the specified
 // expression as a string. Compiled out of release builds.
@@ -60,7 +60,7 @@
   FIREBASE_ASSERT_WITH_EXPRESSION(condition, expression)
 #else
 #define FIREBASE_DEV_ASSERT_WITH_EXPRESSION(condition, expression) \
-  { (void)(condition); }
+  (void)(condition)
 #endif  // !defined(NDEBUG)
 
 // Custom assert() implementation that is not compiled out in release builds.
@@ -111,14 +111,14 @@
 // Assert condition is true otherwise display the specified expression,
 // message and abort.
 #define FIREBASE_ASSERT_MESSAGE_WITH_EXPRESSION(condition, expression, ...) \
-  {                                                                         \
+  do {                                                                      \
     if (!(condition)) {                                                     \
-      FIREBASE_NAMESPACE::LogError(                                           \
+      FIREBASE_NAMESPACE::LogError(                                         \
           FIREBASE_ASSERT_MESSAGE_PREFIX FIREBASE_EXPAND_STRINGIFY(         \
               expression));                                                 \
-      FIREBASE_NAMESPACE::LogAssert(__VA_ARGS__);                             \
+      FIREBASE_NAMESPACE::LogAssert(__VA_ARGS__);                           \
     }                                                                       \
-  }
+  } while (false)
 
 // Assert condition is true otherwise display the specified expression,
 // message and abort. Compiled out of release builds.