Merge main into GMA feature branch#816
Merged
DellaBitta merged 18 commits intofeature/admob_2021from Jan 21, 2022
Merged
Conversation
* Add a delay when the Analytics test finishes.
* Disable -Wnullability-completeness on iOS and macOS. * Remove NDK if the cache hit failed.
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.
…e/internal/mutex.h (#795)
[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 <firebase-workflow-trigger-bot@google.com>
* add -DNOMINMAX to both WIN32 and WIN64 * test * test * test * test * remove helper print * format code Co-authored-by: Cynthia Jiang <cynthiajiang@google.com>
…igs has errors. (#812)
CI scripts invoke gradle in a way to circumvent Azure-to-Maven connection pool timeout issues.
| : api_(NULL) // NOLINT | ||
| : mutex_(Mutex::Mode::kModeNonRecursive), | ||
| api_(NULL) // NOLINT | ||
| { |
There was a problem hiding this comment.
{ should almost always be at the end of the previous line
⏳ Integration test in progress...Requested by @DellaBitta on commit fc18d67 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Update the feature branch with the latest sources from main.
No merge conflicts occurred / needed to be resolved.
Testing
Type of Change
Place an
xthe applicable box: