FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge main into the AdMob Feature Branch by DellaBitta · Pull Request #771 · firebase/firebase-cpp-sdk · GitHub

Merge main into the AdMob Feature Branch - #771

Merged
DellaBitta merged 13 commits into
feature/admob_2021from
admob_merge_main
Dec 1, 2021
Merged

Merge main into the AdMob Feature Branch#771
DellaBitta merged 13 commits into
feature/admob_2021from
admob_merge_main

Conversation

DellaBitta commented Nov 30, 2021
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Provide details of the change, and generalize the change in the PR title above.

Changes:

  • Merged the latest from main into the working feature branch.
  • Changes to AdMob srcs should be limited to formatting only.
  • There weren't any merge conflicts or manually altered code in any of the other files.

Testing

Describe how you've tested these changes. Link any manually triggered Integration tests or CPP binary SDK Packaging Github Action workflows, if applicable.

Integration Tests CI


Type of Change

Place an x the applicable box:

  • Bug fix. Add the issue # below if applicable.
  • New feature. A non-breaking change which adds functionality.
  • Other, such as a build process or documentation change.

Notes

  • Bug fixes and feature changes require an update to the Release Notes section of release_build_files/readme.md.
  • Read the contribution guidelines CONTRIBUTING.md.
  • Changes to the public API require an internal API review. If you'd like to help us make Firebase APIs better, please propose your change in a feature request so that we can discuss it together.

sunmou99 and others added 13 commits November 9, 2021 16:06
* 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.
google-cla Bot added the cla: yes label Nov 30, 2021
#include <stddef.h>
#include <stdint.h>

#include <mutex>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

⚠️ Lint warning: <mutex> is an unapproved C++11 header.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Should I // NOLINT this?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

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
{

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

⚠️ Lint warning: { should almost always be at the end of the previous line

DellaBitta marked this pull request as ready for review December 1, 2021 00:33

jonsimantov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Assuming everything builds + passes, LGTM.

DellaBitta merged commit 4b914d2 into feature/admob_2021 Dec 1, 2021
DellaBitta deleted the admob_merge_main branch December 1, 2021 13:45
github-actions Bot added the tests: in-progress This PR's integration tests are in progress. label Dec 1, 2021

github-actions Bot commented Dec 1, 2021
edited
Loading

Copy link
Copy Markdown

❌  Integration test FAILED

Requested by @DellaBitta on commit 4b914d2
Last updated: Wed Dec 1 08:08 PST 2021
View integration test log & download artifacts

Failures Configs
auth [TEST] [ERROR] [Android] [ubuntu] [android_target]
firestore [TEST] [ERROR] [Android] [macos] [android_target]
[TEST] [ERROR] [Android] [windows] [emulator_target]
messaging [TEST] [ERROR] [Android] [ubuntu, windows] [android_target]

Add flaky tests to go/fpl-cpp-flake-tracker

github-actions Bot added the tests: failed This PR's integration tests failed. label Dec 1, 2021
firebase-workflow-trigger Bot removed the tests: in-progress This PR's integration tests are in progress. label Dec 1, 2021
firebase locked and limited conversation to collaborators Jan 1, 2022
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.

Labels

cla: yes tests: failed This PR's integration tests failed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants


Back | FazBrowse Home | New Git URL