Skip to content

Commit dbe14b6

Browse files
a-mauricea-maurice
committed
Merge remote-tracking branch 'origin/master' into ghm
2 parents cd4ce2f + 667478f commit dbe14b6

File tree

108 files changed

+2831
-752
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+2831
-752
lines changed

‎Android/firebase_dependencies.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ import org.gradle.util.ConfigureUtil;
1616

1717
// A map of library to the dependencies that need to be added for it.
1818
def firebaseDependenciesMap = [
19-
'app' : ['com.google.firebase:firebase-analytics:17.4.1'],
20-
'admob' : ['com.google.firebase:firebase-ads:19.1.0',
21-
'com.google.android.gms:play-services-measurement-sdk-api:17.4.1'],
22-
'analytics' : ['com.google.firebase:firebase-analytics:17.4.1'],
23-
'auth' : ['com.google.firebase:firebase-auth:19.3.1'],
24-
'database' : ['com.google.firebase:firebase-database:19.3.0'],
19+
'app' : ['com.google.firebase:firebase-analytics:17.4.4'],
20+
'admob' : ['com.google.firebase:firebase-ads:19.2.0',
21+
'com.google.android.gms:play-services-measurement-sdk-api:17.4.4'],
22+
'analytics' : ['com.google.firebase:firebase-analytics:17.4.4'],
23+
'auth' : ['com.google.firebase:firebase-auth:19.3.2'],
24+
'database' : ['com.google.firebase:firebase-database:19.3.1'],
2525
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.0'],
26-
'firestore' : ['com.google.firebase:firebase-firestore:21.4.3'],
26+
'firestore' : ['com.google.firebase:firebase-firestore:21.5.0'],
2727
'functions' : ['com.google.firebase:firebase-functions:19.0.2'],
28-
'instance_id' : ['com.google.firebase:firebase-iid:20.1.7'],
28+
'instance_id' : ['com.google.firebase:firebase-iid:20.2.3'],
2929
'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
3030
// Messaging has an additional local dependency to include.
31-
'messaging' : ['com.google.firebase:firebase-messaging:20.1.7',
31+
'messaging' : ['com.google.firebase:firebase-messaging:20.2.3',
3232
'firebase_cpp_sdk.messaging:messaging_java'],
3333
'performance' : ['com.google.firebase:firebase-perf:19.0.7'],
34-
'remote_config' : ['com.google.firebase:firebase-config:19.1.4'],
34+
'remote_config' : ['com.google.firebase:firebase-config:19.2.0'],
3535
'storage' : ['com.google.firebase:firebase-storage:19.1.1']
3636
]
3737

‎admob/admob_resources/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation 'com.google.firebase:firebase-analytics:17.4.1'
49-
implementation 'com.google.firebase:firebase-ads:19.1.0'
48+
implementation 'com.google.firebase:firebase-analytics:17.4.4'
49+
implementation 'com.google.firebase:firebase-ads:19.2.0'
5050
}
5151

5252
afterEvaluate {

‎analytics/generate_constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
(r'(?s)(@code)([^{].*using namespace firebase::analytics;'
9292
r'.*Parameter [^{]+[^}]+}.*@endcode)',
9393
'\n'
94+
'///\n'
9495
'/// @if cpp_examples\n'
9596
'/// \\1{.cpp}'
9697
'\\2\n\n'

‎analytics/ios_headers/FIREventNames.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,15 @@ static NSString *const kFIREventPurchaseRefund NS_SWIFT_NAME(AnalyticsEventPurch
263263
static NSString *const kFIREventRemoveFromCart NS_SWIFT_NAME(AnalyticsEventRemoveFromCart) =
264264
@"remove_from_cart";
265265

266+
/// Screen View event. This event signifies a screen view. Use this when a screen transition occurs.
267+
/// This event can be logged irrespective of whether automatic screen tracking is enabled. Params:
268+
///
269+
/// <ul>
270+
/// <li>@c kFIRParameterScreenClass (NSString) (optional)</li>
271+
/// <li>@c kFIRParameterScreenName (NSString) (optional)</li>
272+
/// </ul>
273+
static NSString *const kFIREventScreenView NS_SWIFT_NAME(AnalyticsEventScreenView) = @"screen_view";
274+
266275
/// Search event. Apps that support search features can use this event to contextualize search
267276
/// operations by supplying the appropriate, corresponding parameters. This event can help you
268277
/// identify the most popular content in your app. Params:

‎analytics/ios_headers/FIRParameterNames.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,26 @@ static NSString *const kFIRParameterQuantity NS_SWIFT_NAME(AnalyticsParameterQua
385385
/// </pre>
386386
static NSString *const kFIRParameterScore NS_SWIFT_NAME(AnalyticsParameterScore) = @"score";
387387

388+
/// Current screen class, such as the class name of the UIViewController, logged with screen_view
389+
/// event and added to every event (NSString). <pre>
390+
/// NSDictionary *params = @{
391+
/// kFIRParameterScreenClass : @"LoginViewController",
392+
/// // ...
393+
/// };
394+
/// </pre>
395+
static NSString *const kFIRParameterScreenClass NS_SWIFT_NAME(AnalyticsParameterScreenClass) =
396+
@"screen_class";
397+
398+
/// Current screen name, such as the name of the UIViewController, logged with screen_view event and
399+
/// added to every event (NSString). <pre>
400+
/// NSDictionary *params = @{
401+
/// kFIRParameterScreenName : @"LoginView",
402+
/// // ...
403+
/// };
404+
/// </pre>
405+
static NSString *const kFIRParameterScreenName NS_SWIFT_NAME(AnalyticsParameterScreenName) =
406+
@"screen_name";
407+
388408
/// The search string/keywords used (NSString).
389409
/// <pre>
390410
/// NSDictionary *params = @{

‎app/app_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ android {
4646
}
4747

4848
dependencies {
49-
implementation 'com.google.firebase:firebase-analytics:17.4.1'
49+
implementation 'com.google.firebase:firebase-analytics:17.4.4'
5050
}
5151

5252
afterEvaluate {

‎app/google_api_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation 'com.google.firebase:firebase-analytics:17.4.1'
52+
implementation 'com.google.firebase:firebase-analytics:17.4.4'
5353
implementation project(':app:app_resources')
5454
}
5555

‎app/invites_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation 'com.google.firebase:firebase-analytics:17.4.1'
48+
implementation 'com.google.firebase:firebase-analytics:17.4.4'
4949
implementation 'com.google.firebase:firebase-dynamic-links:19.1.0'
5050
implementation project(':app:app_resources')
5151
}

‎app/rest/tests/zlibwrapper_unittest.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "gmock/gmock.h"
2828
#include "absl/base/macros.h"
2929
#include "absl/strings/escaping.h"
30+
#include "absl/strings/string_view.h"
3031
#include "util/random/acmrandom.h"
3132

3233
// 1048576 == 2^20 == 1 MB
@@ -105,7 +106,7 @@ REGISTER_MODULE_INITIALIZER(zlibwrapper_unittest, {
105106
<< " Reason: " << limiter.reason();
106107
});
107108

108-
bool ReadFileToString(const std::string& filename, std::string* output,
109+
bool ReadFileToString(absl::string_view filename, std::string* output,
109110
int64 max_size) {
110111
std::ifstream f;
111112
f.open(filename);
@@ -696,7 +697,7 @@ class ZLibWrapperTest : public ::testing::TestWithParam<std::string> {
696697
return dict;
697698
}
698699

699-
std::string ReadFileToTest(const std::string& filename) {
700+
std::string ReadFileToTest(absl::string_view filename) {
700701
std::string uncompbuf;
701702
LOG(INFO) << "Testing file: " << filename;
702703
CHECK(ReadFileToString(filename, &uncompbuf, MAX_BUF_SIZE));
@@ -891,7 +892,7 @@ TEST_P(ZLibWrapperTest, ChunkedCompression) {
891892
TestGzip(&zlib, uncompbuf);
892893
}
893894

894-
// Simple helper to force specialization of strings::Split.
895+
// Simple helper to force specialization of absl::StrSplit.
895896
std::vector<std::string> GetFilesToProcess() {
896897
std::string files_to_process =
897898
FLAGS_files_to_process.empty()

‎app/src/assert.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
// Assert condition is true, if it's false log an assert with the specified
4646
// expression as a string.
4747
#define FIREBASE_ASSERT_WITH_EXPRESSION(condition, expression) \
48-
{ \
48+
do { \
4949
if (!(condition)) { \
50-
FIREBASE_NAMESPACE::LogAssert( \
50+
FIREBASE_NAMESPACE::LogAssert( \
5151
FIREBASE_ASSERT_MESSAGE_PREFIX FIREBASE_EXPAND_STRINGIFY( \
5252
expression)); \
5353
} \
54-
}
54+
} while (false)
5555

5656
// Assert condition is true, if it's false log an assert with the specified
5757
// expression as a string. Compiled out of release builds.
@@ -60,7 +60,7 @@
6060
FIREBASE_ASSERT_WITH_EXPRESSION(condition, expression)
6161
#else
6262
#define FIREBASE_DEV_ASSERT_WITH_EXPRESSION(condition, expression) \
63-
{ (void)(condition); }
63+
(void)(condition)
6464
#endif // !defined(NDEBUG)
6565

6666
// Custom assert() implementation that is not compiled out in release builds.
@@ -111,14 +111,14 @@
111111
// Assert condition is true otherwise display the specified expression,
112112
// message and abort.
113113
#define FIREBASE_ASSERT_MESSAGE_WITH_EXPRESSION(condition, expression, ...) \
114-
{ \
114+
do { \
115115
if (!(condition)) { \
116-
FIREBASE_NAMESPACE::LogError( \
116+
FIREBASE_NAMESPACE::LogError( \
117117
FIREBASE_ASSERT_MESSAGE_PREFIX FIREBASE_EXPAND_STRINGIFY( \
118118
expression)); \
119-
FIREBASE_NAMESPACE::LogAssert(__VA_ARGS__); \
119+
FIREBASE_NAMESPACE::LogAssert(__VA_ARGS__); \
120120
} \
121-
}
121+
} while (false)
122122

123123
// Assert condition is true otherwise display the specified expression,
124124
// message and abort. Compiled out of release builds.

‎app/src/include/firebase/internal/type_traits.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ struct is_lvalue_reference<T&> {
8282
#define FIREBASE_TYPE_TRAITS_NS std
8383
#endif
8484

85+
template <typename T>
86+
using decay = FIREBASE_TYPE_TRAITS_NS::decay<T>;
87+
88+
template <typename T>
89+
using decay_t = typename decay<T>::type;
90+
8591
template <bool value, typename T = void>
8692
using enable_if = FIREBASE_TYPE_TRAITS_NS::enable_if<value, T>;
8793

@@ -97,6 +103,9 @@ using is_same = FIREBASE_TYPE_TRAITS_NS::is_same<T, U>;
97103
template <typename T, T value>
98104
using integral_constant = FIREBASE_TYPE_TRAITS_NS::integral_constant<T, value>;
99105

106+
using true_type = FIREBASE_TYPE_TRAITS_NS::true_type;
107+
using false_type = FIREBASE_TYPE_TRAITS_NS::false_type;
108+
100109
#undef FIREBASE_TYPE_TRAITS_NS
101110

102111
// `is_char<T>::value` is true iff `T` is a character type (including `wchar_t`

‎app/tests/base64_openssh_test.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "app/src/log.h"
1919
#include "gtest/gtest.h"
2020
#include "gmock/gmock.h"
21+
#include "absl/strings/string_view.h"
2122
#include "openssl/base64.h"
2223

2324
namespace firebase {
@@ -31,7 +32,7 @@ size_t OpenSSHEncodedLength(size_t input_size) {
3132
return length;
3233
}
3334

34-
bool OpenSSHEncode(const std::string& input, std::string* output) {
35+
bool OpenSSHEncode(absl::string_view input, std::string* output) {
3536
size_t base64_length = OpenSSHEncodedLength(input.size());
3637
output->resize(base64_length);
3738
if (EVP_EncodeBlock(reinterpret_cast<uint8_t*>(&(*output)[0]),
@@ -52,7 +53,7 @@ size_t OpenSSHDecodedLength(size_t input_size) {
5253
return length;
5354
}
5455

55-
bool OpenSSHDecode(const std::string& input, std::string* output) {
56+
bool OpenSSHDecode(absl::string_view input, std::string* output) {
5657
size_t decoded_length = OpenSSHDecodedLength(input.size());
5758
output->resize(decoded_length);
5859
if (EVP_DecodeBase64(reinterpret_cast<uint8_t*>(&(*output)[0]),

‎auth/auth_resources/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation 'com.google.firebase:firebase-analytics:17.4.1'
49-
implementation 'com.google.firebase:firebase-auth:19.3.1'
48+
implementation 'com.google.firebase:firebase-analytics:17.4.4'
49+
implementation 'com.google.firebase:firebase-auth:19.3.2'
5050
implementation project(':app:app_resources')
5151
}
5252

‎cpp_sdk_version.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"released": "6.15.0",
3-
"stable": "6.15.0",
4-
"head": "6.15.0"
2+
"released": "6.15.1",
3+
"stable": "6.15.1",
4+
"head": "6.15.1"
55
}

‎database/database_resources/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation 'com.google.firebase:firebase-analytics:17.4.1'
49-
implementation 'com.google.firebase:firebase-database:19.3.0'
48+
implementation 'com.google.firebase:firebase-analytics:17.4.4'
49+
implementation 'com.google.firebase:firebase-database:19.3.1'
5050
//implementation project(':app:app_resources')
5151
}
5252

0 commit comments

Comments
 (0)