Skip to content

Commit fc18d67

Browse files
DellaBittajonsimantovsunmou99a-mauricedconeybe
authored
Merge main into GMA feature branch (#816)
* Add a delay to the Analytics test app. (#788) * Add a delay when the Analytics test finishes. * In the test report, if test failed on all devices. Mark [All x test devices] (#784) * Disable -Wnullability-completeness on iOS and macOS. (#782) * Disable -Wnullability-completeness on iOS and macOS. * Remove NDK if the cache hit failed. * Update public documentation for C++ FCM SDK. (#789) As of Firebase C++ SDK 7.1.0, we started using JobIntentService for scheduling jobs. This change requires a few additional modifications to AndroidManifest.xml and a new way of starting a background service. These changes were done to the old repository, and need to be brought to GitHub. * Split mutex.h into .h and .cc files (#751) * future.h: Fix minor typo in the docs for FutureBase (#794) * Move mutex.h header to public internal (#792) * Delete app/src/mutex.h and adjust includes to app/src/include/firebase/internal/mutex.h (#795) * future.h: replace std::mutex with firebase::Mutex (#798) * Change setup-gcloud to use @v0 instead of @master as per their readme. (#802) * fix Log NoneType Error (#807) * Update Android dependencies - Thu Jan 06 2022 (#809) [Triggered](https://github.com/firebase/firebase-android-sdk/actions/runs/1665092765) by [firebase-android-sdk Jan 06 release](firebase/firebase-android-sdk@22ee484). ### Android - com.google.android.gms.play_services_base → 18.0.1 - com.google.firebase.firebase_analytics → 20.0.2 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/1665095030). Co-authored-by: firebase-workflow-trigger-bot <[email protected]> * add -DNOMINMAX to both WIN32 and WIN64 (#810) * add -DNOMINMAX to both WIN32 and WIN64 * test * test * test * test * remove helper print * format code Co-authored-by: Cynthia Jiang <[email protected]> * In the Test Summary Report, add "x/y" which means "x" out of "y" configs has errors. (#812) * mutex header include path * maven connectivity parameters (#818) CI scripts invoke gradle in a way to circumvent Azure-to-Maven connection pool timeout issues. Co-authored-by: Jon Simantov <[email protected]> Co-authored-by: Mou Sun <[email protected]> Co-authored-by: a-maurice <[email protected]> Co-authored-by: Denver Coneybeare <[email protected]> Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com> Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: Cynthia J <[email protected]> Co-authored-by: Cynthia Jiang <[email protected]>
2 parents d6465a9 + 7313bb9 commit fc18d67

File tree

143 files changed

+508
-370
lines changed

Some content is hidden

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

143 files changed

+508
-370
lines changed

‎.github/workflows/android.yml

+11
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,17 @@ jobs:
9191
path: /tmp/android-ndk-r16b
9292
key: android-ndk-${{ matrix.os }}-r16b
9393

94+
- name: Check cached NDK
95+
shell: bash
96+
if: steps.cache_ndk.outputs.cache-hit != 'true'
97+
run: |
98+
# If the NDK failed to download from the cache, but there is a
99+
# /tmp/android-ndk-r16b directory, it's incomplete, so remove it.
100+
if [[ -d "/tmp/android-ndk-r16b" ]]; then
101+
echo "Removing incomplete download of NDK"
102+
rm -rf /tmp/android-ndk-r16b
103+
fi
104+
94105
- name: Update homebrew (avoid bintray errors)
95106
uses: nick-invision/retry@v2
96107
if: startsWith(matrix.os, 'macos')

‎.github/workflows/integration_tests.yml

-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ env:
4141
triggerLabelPrefix: "tests-requested: "
4242
triggerLabelFull: "tests-requested: full"
4343
triggerLabelQuick: "tests-requested: quick"
44-
statusLabelInProgress: "tests: in-progress"
45-
statusLabelFailed: "tests: failed"
46-
statusLabelSucceeded: "tests: succeeded"
47-
statusCommentIdentifier: "integration-test-status-comment"
4844
pythonVersion: '3.7'
4945
artifactRetentionDays: 2
5046
GITHUB_TOKEN: ${{ github.token }}

‎Android/firebase_dependencies.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ 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:20.0.0'],
19+
'app' : ['com.google.firebase:firebase-analytics:20.0.2'],
2020
'admob' : ['com.google.firebase:firebase-ads:19.8.0',
21-
'com.google.firebase:firebase-analytics:20.0.0',
22-
'com.google.android.gms:play-services-base:17.6.0'],
23-
'analytics' : ['com.google.firebase:firebase-analytics:20.0.0',
24-
'com.google.android.gms:play-services-base:17.6.0'],
21+
'com.google.firebase:firebase-analytics:20.0.2',
22+
'com.google.android.gms:play-services-base:18.0.1'],
23+
'analytics' : ['com.google.firebase:firebase-analytics:20.0.2',
24+
'com.google.android.gms:play-services-base:18.0.1'],
2525
'auth' : ['com.google.firebase:firebase-auth:21.0.1'],
2626
'database' : ['com.google.firebase:firebase-database:20.0.3'],
2727
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:21.0.0'],
@@ -31,17 +31,17 @@ def firebaseDependenciesMap = [
3131
'com.google.firebase:firebase-analytics:20.0.0',
3232
'com.google.android.gms:play-services-base:17.6.0'],
3333
'installations' : ['com.google.firebase:firebase-installations:17.0.0',
34-
'com.google.android.gms:play-services-base:17.6.0'],
34+
'com.google.android.gms:play-services-base:18.0.1'],
3535
'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
3636
// Messaging has an additional local dependency to include.
3737
'messaging' : ['com.google.firebase:firebase-messaging:23.0.0',
3838
'firebase_cpp_sdk.messaging:messaging_java',
3939
'androidx.core:core:1.6.0-alpha03',
4040
'com.google.flatbuffers:flatbuffers-java:1.12.0',
41-
'com.google.android.gms:play-services-base:17.6.0'],
41+
'com.google.android.gms:play-services-base:18.0.1'],
4242
'performance' : ['com.google.firebase:firebase-perf:20.0.4'],
4343
'remote_config' : ['com.google.firebase:firebase-config:21.0.1',
44-
'com.google.android.gms:play-services-base:17.6.0'],
44+
'com.google.android.gms:play-services-base:18.0.1'],
4545
'storage' : ['com.google.firebase:firebase-storage:20.0.0'],
4646
'testlab' : []
4747
]

‎CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,13 @@ if(DESKTOP AND APPLE)
150150
endif()
151151
endif()
152152

153+
if(APPLE)
154+
# For iOS and macOS, disable nullability completeness warning, as it makes the
155+
# build output for our Objective-C++ files much too verbose.
156+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-nullability-completeness")
157+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-nullability-completeness")
158+
endif()
159+
153160
if(DESKTOP AND NOT MSVC AND NOT APPLE)
154161
# Linux-specific option.
155162
if (FIREBASE_LINUX_USE_CXX11_ABI)

‎admob/admob_resources/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation 'com.google.firebase:firebase-analytics:20.0.0'
48+
implementation 'com.google.firebase:firebase-analytics:20.0.2'
4949
implementation 'com.google.firebase:firebase-ads:19.8.0'
5050
}
5151

‎admob/src/android/banner_view_internal_android.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "admob/src/include/firebase/admob/banner_view.h"
3131
#include "admob/src/include/firebase/admob/types.h"
3232
#include "app/src/assert.h"
33-
#include "app/src/mutex.h"
33+
#include "app/src/include/firebase/internal/mutex.h"
3434
#include "app/src/semaphore.h"
3535
#include "app/src/util_android.h"
3636

‎admob/src/android/native_express_ad_view_internal_android.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "admob/src/include/firebase/admob/native_express_ad_view.h"
3131
#include "admob/src/include/firebase/admob/types.h"
3232
#include "app/src/assert.h"
33-
#include "app/src/mutex.h"
33+
#include "app/src/include/firebase/internal/mutex.h"
3434
#include "app/src/util_android.h"
3535

3636
namespace firebase {

‎admob/src/common/banner_view_internal.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/banner_view.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

‎admob/src/common/banner_view_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/banner_view.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

‎admob/src/common/interstitial_ad_internal.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/interstitial_ad.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

‎admob/src/common/interstitial_ad_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/interstitial_ad.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

‎admob/src/common/native_express_ad_view_internal.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/native_express_ad_view.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

‎admob/src/common/native_express_ad_view_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/native_express_ad_view.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

‎admob/src/common/rewarded_video.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/rewarded_video_internal.h"
2121
#include "app/src/assert.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

‎admob/src/common/rewarded_video_internal.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/rewarded_video.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

‎admob/src/common/rewarded_video_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/rewarded_video.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

‎analytics/integration_test/src/integration_test.cc

+9
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
namespace firebase_testapp_automated {
4545

46+
using app_framework::ProcessEvents;
4647
using firebase_test_framework::FirebaseTest;
4748

4849
class FirebaseAnalyticsTest : public FirebaseTest {
@@ -70,6 +71,14 @@ void FirebaseAnalyticsTest::TearDownTestSuite() {
7071
firebase::analytics::Terminate();
7172
delete shared_app_;
7273
shared_app_ = nullptr;
74+
75+
// The Analytics integration test is too fast for FTL, so pause a few seconds
76+
// here.
77+
ProcessEvents(1000);
78+
ProcessEvents(1000);
79+
ProcessEvents(1000);
80+
ProcessEvents(1000);
81+
ProcessEvents(1000);
7382
}
7483

7584
TEST_F(FirebaseAnalyticsTest, TestSetCollectionEnabled) {

‎analytics/src/analytics_ios.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
#include "analytics/src/analytics_common.h"
2424
#include "app/src/assert.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2526
#include "app/src/include/firebase/version.h"
2627
#include "app/src/log.h"
27-
#include "app/src/mutex.h"
2828
#include "app/src/thread.h"
2929
#include "app/src/time.h"
3030
#include "app/src/util.h"

‎app/CMakeLists.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,12 @@ set(common_SRCS
136136
src/variant.cc
137137
src/base64.cc)
138138

139+
if (MSVC)
140+
set(mutex_SRCS src/mutex_windows.cc)
141+
else()
142+
set(mutex_SRCS src/mutex_pthread.cc)
143+
endif()
144+
139145
set(invites_SRCS
140146
src/invites/cached_receiver.cc
141147
src/invites/invites_receiver_internal.cc)
@@ -221,6 +227,7 @@ set(internal_HDRS
221227
src/include/firebase/future.h
222228
src/include/firebase/internal/common.h
223229
src/include/firebase/internal/future_impl.h
230+
src/include/firebase/internal/mutex.h
224231
src/include/firebase/internal/type_traits.h
225232
src/include/firebase/log.h
226233
src/include/firebase/util.h
@@ -241,7 +248,6 @@ set(utility_common_HDRS
241248
src/log.h
242249
src/heartbeat_date_storage_desktop.h
243250
src/heartbeat_info_desktop.h
244-
src/mutex.h
245251
src/optional.h
246252
src/path.h
247253
src/pthread_condvar.h
@@ -313,6 +319,7 @@ add_library(firebase_app STATIC
313319
${log_HDRS}
314320
${common_SRCS}
315321
${invites_SRCS}
322+
${mutex_SRCS}
316323
${app_platform_SRCS}
317324
${internal_HDRS}
318325
${utility_HDRS}

‎app/app_resources/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050
}
5151

5252
dependencies {
53-
implementation 'com.google.firebase:firebase-analytics:20.0.0'
53+
implementation 'com.google.firebase:firebase-analytics:20.0.2'
5454
}
5555

5656
afterEvaluate {

‎app/google_api_resources/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ android {
5353
}
5454

5555
dependencies {
56-
implementation 'com.google.firebase:firebase-analytics:20.0.0'
57-
implementation 'com.google.android.gms:play-services-base:17.6.0'
56+
implementation 'com.google.firebase:firebase-analytics:20.0.2'
57+
implementation 'com.google.android.gms:play-services-base:18.0.1'
5858
implementation project(':app:app_resources')
5959
}
6060

‎app/invites_resources/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation 'com.google.firebase:firebase-analytics:20.0.0'
52+
implementation 'com.google.firebase:firebase-analytics:20.0.2'
5353
implementation 'com.google.firebase:firebase-dynamic-links:21.0.0'
5454
implementation project(':app:app_resources')
5555
}

‎app/rest/controller_curl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
#include "app/rest/transport_curl.h"
2222
#include "app/src/include/firebase/internal/common.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2324
#include "app/src/log.h"
24-
#include "app/src/mutex.h"
2525

2626
namespace firebase {
2727
namespace rest {

‎app/rest/controller_curl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "app/rest/controller_interface.h"
2323
#include "app/rest/response.h"
2424
#include "app/src/include/firebase/internal/common.h"
25-
#include "app/src/mutex.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2626

2727
namespace firebase {
2828
namespace rest {

‎app/rest/transport_curl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "app/rest/controller_curl.h"
2424
#include "app/rest/util.h"
2525
#include "app/src/assert.h"
26+
#include "app/src/include/firebase/internal/mutex.h"
2627
#include "app/src/include/firebase/internal/platform.h"
27-
#include "app/src/mutex.h"
2828
#include "app/src/semaphore.h"
2929
#include "app/src/thread.h"
3030
#include "app/src/util.h"

‎app/rest/transport_curl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <vector>
2323

2424
#include "app/rest/transport_interface.h"
25-
#include "app/src/mutex.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2626
#include "app/src/semaphore.h"
2727
#include "flatbuffers/stl_emulation.h"
2828

‎app/rest/util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include <string>
2121

22+
#include "app/src/include/firebase/internal/mutex.h"
2223
#include "app/src/include/firebase/variant.h"
23-
#include "app/src/mutex.h"
2424
#include "flatbuffers/idl.h"
2525

2626
namespace firebase {

‎app/src/app_common.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include "app/src/cleanup_notifier.h"
3131
#include "app/src/include/firebase/app.h"
3232
#include "app/src/include/firebase/internal/common.h"
33+
#include "app/src/include/firebase/internal/mutex.h"
3334
#include "app/src/include/firebase/internal/platform.h"
3435
#include "app/src/include/firebase/version.h"
35-
#include "app/src/mutex.h"
3636
#include "app/src/util.h"
3737

3838
// strtok_r is strtok_s on Windows.

‎app/src/app_ios.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include "app/src/app_common.h"
2323
#include "app/src/app_ios.h"
2424
#include "app/src/assert.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2526
#include "app/src/include/firebase/version.h"
2627
#include "app/src/log.h"
27-
#include "app/src/mutex.h"
2828
#include "app/src/util.h"
2929
#include "app/src/util_ios.h"
3030

‎app/src/callback.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include <list>
2020

2121
#include "app/memory/shared_ptr.h"
22+
#include "app/src/include/firebase/internal/mutex.h"
2223
#include "app/src/log.h"
23-
#include "app/src/mutex.h"
2424
#include "app/src/semaphore.h"
2525
#include "app/src/thread.h"
2626

‎app/src/cleanup_notifier.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <map>
2121
#include <vector>
2222

23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626

‎app/src/function_registry.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include <map>
2121

22-
#include "app/src/mutex.h"
22+
#include "app/src/include/firebase/internal/mutex.h"
2323

2424
namespace firebase {
2525
class App;

0 commit comments

Comments
 (0)