-
Notifications
You must be signed in to change notification settings - Fork 124
Merge updates from main branch into admob_2021 feature branch #743
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
Merge updates from main branch into admob_2021 feature branch #743
Conversation
* operator== and operator!= for DocumentChange. * delegate to underlying impl. * Address comments. * Update readme. * Use ASSERT_EQ in a few more instances. * rename third_change to change3.
…ror in Unity SDK (#616)
…OS absl linker error in Unity SDK (#618)
… and DocumentChange. (#619)
* Add placeholder workflow for updating dependencies.
) This workflow will: - Check out the repo and create a branch - Update the iOS and/or Android dependencies in that branch - Push the branch to GitHub - Create a PR on the branch - Trigger integration tests to run on the PR (via label) For now, to use, go to "Actions", select the "Update Android and iOS dependencies" workflow, and use workflow_dispatch to run the workflow. In most cases, the default inputs should be fine.
Was accidentally including both iOS and Android logs in both sections - this filters out the correct one for each section.
### Android - com.google.firebase.firebase_database → 20.0.2 - com.google.firebase.firebase_functions → 20.0.1 ### iOS - Firebase/Analytics → 8.7.0 - Firebase/Auth → 8.7.0 - Firebase/Core → 8.7.0 - Firebase/Crashlytics → 8.7.0 - Firebase/Database → 8.7.0 - Firebase/DynamicLinks → 8.7.0 - Firebase/Firestore → 8.7.0 - Firebase/Functions → 8.7.0 - Firebase/Installations → 8.7.0 - Firebase/Messaging → 8.7.0 - Firebase/RemoteConfig → 8.7.0 - Firebase/Storage → 8.7.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/1231831992). Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
…ers. (#661) The update-dependencies workflow can be triggered by other projects (e.g. firebase-ios-sdk once firebase/firebase-ios-sdk#8654 goes in). This adds an optional comment that will be included in the created PR, to make it clear what triggered the update.
* Fix the logic to generate .pro file * update readme file * modify the release notes Co-authored-by: Cynthia Jiang <[email protected]>
* Fix the logic to generate .pro file * update readme file * modify the release notes * Change the way to fetch initial token with the new API * Change the way to fetch initial token with the new API * Add change to release notes Co-authored-by: Cynthia Jiang <[email protected]>
This enables cross-compiling for arm64 Mac. This changes the default Xcode version to 12.2, as Xcode 11 doesn't support arm64, and 12.0 fails with vcpkg. It'll still build with 11.7 in the expanded matrix and omit arm64. Unit tests are built, but not run, on arm64. (They can't be run until GitHub has hosted ARM Mac runners, or we add our own.) This PR adds a --arch option to the testapp builder but does not yet build for arm64 in the integration_tests workflow. For packaged builds, we now build LLVM binutils on Mac, in addition to GNU binutils. LLVM binutils are required for the merge_libraries step on Mac, as GNU binutils does not support outputting ARM64 Mach-O files properly. (We still need GNU binutils on Mac for c++filt). Because LLVM binutils can take a long time to build, we cache it.
* Fix bug with logfile if --skip_android is set. * Fix workflow to handle missing logfile.
### iOS - Firebase/Analytics → 8.8.0 - Firebase/Auth → 8.8.0 - Firebase/Core → 8.8.0 - Firebase/Crashlytics → 8.8.0 - Firebase/Database → 8.8.0 - Firebase/DynamicLinks → 8.8.0 - Firebase/Firestore → 8.8.0 - Firebase/Functions → 8.8.0 - Firebase/Installations → 8.8.0 - Firebase/Messaging → 8.8.0 - Firebase/RemoteConfig → 8.8.0 - Firebase/Storage → 8.8.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/1284820656). Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
…ication_data_ if parsing the JSON body fails (#692)
[Triggered](https://github.com/firebase/firebase-android-sdk/actions/runs/1305537609) by [firebase-android-sdk Oct 04 release](firebase/firebase-android-sdk@7a48c9d). ### Android - com.google.firebase.firebase_analytics → 19.0.2 - com.google.firebase.firebase_firestore → 23.0.4 - com.google.firebase.firebase_perf → 20.0.3 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/1305538885). Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
* Change Git tag of googletest to the 1.11.0 release. This is already the version set in download_googletest.py, and is the version that the integration tests have been built/tested with. (Because the integration tests do some internal GoogleTest stuff, it's risky to pin to the main branch.) * Add comment explaining GoogleTest version.
@@ -603,6 +610,7 @@ TEST_F(FirebaseFirestoreBasicTest, TestRunTransaction) { | |||
// TODO: Add test for failing transaction. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing username in TODO; it should look like "// TODO(my_username): Stuff."
@@ -665,6 +673,7 @@ TEST_F(FirebaseFirestoreBasicTest, | |||
} | |||
|
|||
TEST_F(FirebaseFirestoreBasicTest, TestInvalidatingReferencesWhenDeletingApp) { | |||
SKIP_TEST_ON_QUICK_CHECK; | |||
delete shared_app_; | |||
shared_app_ = nullptr; | |||
// TODO: Ensure existing Firestore objects are invalidated. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing username in TODO; it should look like "// TODO(my_username): Stuff."
❌ Integration test FAILEDRequested by @DellaBitta on commit 8bbaf8b
Add flaky tests to go/fpl-cpp-flake-tracker |
Looks like stuff is working now (except the admob flaky crash), PTAL. |
Description
Merge from main into admob_2021 branch.
Doing this periodically should make it easier to merge the new admob_2021 branch into main later.
Note: This PR should probably NOT be squashed when merged into feature/admob_2021 - "Allow merge commits" will temporarily be enabled for the repo to merge this PR.
Testing
Running integration tests.
Type of Change
Place an
x
the applicable box:Notes
Release Notes
section ofrelease_build_files/readme.md
.