Skip to content

Merge main into GMA feature branch #816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jan 21, 2022
Merged

Conversation

DellaBitta
Copy link
Contributor

@DellaBitta DellaBitta commented Jan 20, 2022

Description

Update the feature branch with the latest sources from main.
No merge conflicts occurred / needed to be resolved.


Testing

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


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.

jonsimantov and others added 18 commits December 4, 2021 05:04
* 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.
[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

* test

* test

* test

* test

* remove helper print

* format code

Co-authored-by: Cynthia Jiang <[email protected]>
CI scripts invoke gradle in a way to circumvent Azure-to-Maven connection pool timeout issues.
@@ -235,7 +239,8 @@ inline FutureBase& FutureBase::operator=(const FutureBase& rhs) {

#if defined(FIREBASE_USE_MOVE_OPERATORS)
inline FutureBase::FutureBase(FutureBase&& rhs) noexcept
: api_(NULL) // NOLINT
: mutex_(Mutex::Mode::kModeNonRecursive),
api_(NULL) // NOLINT
{

Choose a reason for hiding this comment

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

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

@DellaBitta DellaBitta merged commit fc18d67 into feature/admob_2021 Jan 21, 2022
@DellaBitta DellaBitta deleted the merge_admob_2021 branch January 21, 2022 16:36
@github-actions github-actions bot added the tests: in-progress This PR's integration tests are in progress. label Jan 21, 2022
@github-actions
Copy link

⏳  Integration test in progress...

Requested by @DellaBitta on commit fc18d67
Last updated: Fri Jan 21 08:36 PST 2022
View integration test log & download artifacts

@firebase firebase locked and limited conversation to collaborators Feb 21, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
tests: in-progress This PR's integration tests are in progress.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants