Merge main into the AdMob Feature Branch#771
Merged
DellaBitta merged 13 commits intofeature/admob_2021from Dec 1, 2021
Merged
Conversation
…tureBase::Release() (#747)
* Cancel callbacks for messaging util::Terminate is referenced counted som when there ar more APIs than messaging active the callbacks will not be canceled until later and still cause a NULL ref due to the FutureData being destroyed now. * Cancel callback earlier * Update readme
* Remove calls to LogInfo, LogError, LogDebug during obj-c +load. This could be causing an issue in C++ as global class constructors have not yet been run.
…iles. (#755) * Allow format_code to format .m/.mm files; clang-format already knows how. * Run format_code.py on all objective-c/objective-c++ files. * Add Java file extensions to format_code.py * Format all Java source files. * Remove check for objc header, as they are now supported. * Format objective-c .h files. * Don't let lint comment on line length any more; code formatting will report that.
* Messaging crash during initialization * Update readme
Remove intermediate build files during desktop packaging step. This should reduce the disk space usage, as those files (*.o and *.obj) are not required when merging libraries.
…#764) When installing 32-bit Linux dependencies on GitHub runners, downgrade libpcre2-8-0 to an earlier version to ensure compatibility with the i386 version of the package. This is something that should be fixed in a subsequent Ubuntu release and so is a temporary workaround. This also adds checks to the various prerequisite commands run by build_desktop.py, which was previously just silently ignoring errors (making this much harder to track down). Now it will error out as soon as a command fails.
| #include <stddef.h> | ||
| #include <stdint.h> | ||
|
|
||
| #include <mutex> |
There was a problem hiding this comment.
<mutex> is an unapproved C++11 header.
Contributor
Author
There was a problem hiding this comment.
Should I // NOLINT this?
Contributor
There was a problem hiding this comment.
Just FYI, this file's usage of std::mutex is going to be replaced with firebase::Mutex in the near future. Details are in b/206520921 if interested.
| #if defined(FIREBASE_USE_MOVE_OPERATORS) | ||
| inline FutureBase::FutureBase(FutureBase&& rhs) noexcept | ||
| : api_(NULL) // NOLINT | ||
| { |
There was a problem hiding this comment.
{ should almost always be at the end of the previous line
jonsimantov
approved these changes
Dec 1, 2021
Contributor
jonsimantov
left a comment
There was a problem hiding this comment.
Assuming everything builds + passes, LGTM.
❌ Integration test FAILEDRequested by @DellaBitta on commit 4b914d2
Add flaky tests to go/fpl-cpp-flake-tracker |
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
Changes:
maininto the working feature branch.Testing
Integration Tests CI
Type of Change
Place an
xthe applicable box:Notes
Release Notessection ofrelease_build_files/readme.md.