Skip to content

Firestore: Fix args to AggregateQuerySnapshot constructor #1277

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

Conversation

dconeybe
Copy link
Contributor

@dconeybe dconeybe commented Apr 19, 2023

The AggregateQuerySnapshot in the Android SDK changed and this PR updates the call to that constructor.

https://github.com/firebase/firebase-android-sdk/blob/31176ce427e25d6db2e99a3459e1cd3c304df037/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateQuerySnapshot.java#L40

This PR uses #1276 as the base branch, as that PR is the one that upgrades the Android dependencies to the problematic version.

@dconeybe dconeybe added api: firestore skip-release-notes Skip release notes check labels Apr 19, 2023
@dconeybe dconeybe self-assigned this Apr 19, 2023
@dconeybe dconeybe added the tests-requested: quick Trigger a quick set of integration tests. label Apr 19, 2023
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. and removed tests-requested: quick Trigger a quick set of integration tests. labels Apr 19, 2023
@github-actions
Copy link

github-actions bot commented Apr 19, 2023

Integration test with FLAKINESS (succeeded after retry)

Requested by @jonsimantov on commit 9662df3
Last updated: Thu Apr 20 12:57 PDT 2023
View integration test log & download artifacts

Failures Configs
firestore [TEST] [FLAKINESS] [Android] [2/3 os: ubuntu windows] [1/2 android_device: android_target]
(1 failed tests)  CRASH/TIMEOUT

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

@dconeybe dconeybe added the tests-requested: quick Trigger a quick set of integration tests. label Apr 19, 2023
@github-actions github-actions bot added tests: failed This PR's integration tests failed. and removed tests-requested: quick Trigger a quick set of integration tests. labels Apr 19, 2023
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Apr 19, 2023
…com.android.tools/proguard/coroutines.pro'" error
@dconeybe dconeybe added tests-requested: quick Trigger a quick set of integration tests. and removed tests: failed This PR's integration tests failed. labels Apr 19, 2023
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. tests: failed This PR's integration tests failed. and removed tests-requested: quick Trigger a quick set of integration tests. labels Apr 19, 2023
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Apr 19, 2023
dconeybe and others added 2 commits April 19, 2023 20:26
…ETA-INF/com.android.tools/proguard/coroutines.pro'" error"

This reverts commit fc0faea.
Cherry-picked from #1278 to fix the "More than one file was found with OS independent path 'META-INF/com.android.tools/proguard/coroutines.pro'" error
@dconeybe dconeybe added tests-requested: quick Trigger a quick set of integration tests. and removed tests: failed This PR's integration tests failed. labels Apr 20, 2023
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. tests: failed This PR's integration tests failed. and removed tests-requested: quick Trigger a quick set of integration tests. labels Apr 20, 2023
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Apr 20, 2023
@dconeybe dconeybe removed the tests: failed This PR's integration tests failed. label Apr 20, 2023
@dconeybe dconeybe added the tests-requested: quick Trigger a quick set of integration tests. label Apr 20, 2023
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. tests: failed This PR's integration tests failed. and removed tests-requested: quick Trigger a quick set of integration tests. labels Apr 20, 2023
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Apr 20, 2023
…neybe/AggregateQuerySnapshotAndroidConstructorSignatureFix
@jonsimantov jonsimantov merged commit 9662df3 into workflow/auto-update-deps-154-20230419-144035 Apr 20, 2023
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. and removed tests: failed This PR's integration tests failed. labels Apr 20, 2023
@dconeybe dconeybe deleted the dconeybe/AggregateQuerySnapshotAndroidConstructorSignatureFix branch April 20, 2023 18:43
@github-actions github-actions bot added the tests: succeeded This PR's integration tests succeeded. label Apr 20, 2023
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Apr 20, 2023
jonsimantov added a commit that referenced this pull request Apr 21, 2023
* Update Android dependencies - Wed Apr 19 2023

[Triggered](https://github.com/firebase/firebase-android-sdk/actions/runs/4744622642) by [firebase-android-sdk Apr 19 release](firebase/firebase-android-sdk@0451fa0).

  ### Android

- com.google.android.gms.play_services_ads → 22.0.0
- com.google.firebase.firebase_bom → 31.5.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/4744629540).

* Firestore: Fix args to AggregateQuerySnapshot constructor (#1277)

* Fix call to AggregateQuerySnapshot constructor

* Fix conflict for coroutines.pro file in google library.

Cherry-picked from #1278 to fix the "More than one file was found with OS independent path 'META-INF/com.android.tools/proguard/coroutines.pro'" error

---------

Co-authored-by: Jon Simantov <jsimantov@google.com>

* Update release notes with new versions.

---------

Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
Co-authored-by: Jon Simantov <jsimantov@google.com>
Co-authored-by: Denver Coneybeare <dconeybe@google.com>
AlmostMatt pushed a commit that referenced this pull request Apr 21, 2023
* Update Android dependencies - Wed Apr 19 2023

[Triggered](https://github.com/firebase/firebase-android-sdk/actions/runs/4744622642) by [firebase-android-sdk Apr 19 release](firebase/firebase-android-sdk@0451fa0).

  ### Android

- com.google.android.gms.play_services_ads → 22.0.0
- com.google.firebase.firebase_bom → 31.5.0

> Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/4744629540).

* Firestore: Fix args to AggregateQuerySnapshot constructor (#1277)

* Fix call to AggregateQuerySnapshot constructor

* Fix conflict for coroutines.pro file in google library.

Cherry-picked from #1278 to fix the "More than one file was found with OS independent path 'META-INF/com.android.tools/proguard/coroutines.pro'" error

---------

Co-authored-by: Jon Simantov <jsimantov@google.com>

* Update release notes with new versions.

---------

Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
Co-authored-by: Jon Simantov <jsimantov@google.com>
Co-authored-by: Denver Coneybeare <dconeybe@google.com>
@firebase firebase locked and limited conversation to collaborators Jun 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
api: firestore skip-release-notes Skip release notes check tests: succeeded This PR's integration tests succeeded.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants