Fix conflict for coroutines.pro file in google library. #1278
Conversation
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
jonsimantov
added
the
tests-requested: quick
github-actions
bot
added
tests: in-progress
❌ Integration test FAILEDRequested by @jonsimantov on commit 12f442e
Add flaky tests to go/fpl-cpp-flake-tracker |
firebase-workflow-trigger
bot
removed
the
tests: in-progress
github-actions
bot
added
tests: in-progress
firebase-workflow-trigger
bot
removed
the
tests: in-progress
dconeybe
pushed a commit
that referenced
this pull request
Apr 20, 2023
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
jonsimantov
added a commit
that referenced
this pull request
Apr 20, 2023
* Fix call to AggregateQuerySnapshot constructor * format code * Fix "More than one file was found with OS independent path 'META-INF/com.android.tools/proguard/coroutines.pro'" error * Revert "Fix "More than one file was found with OS independent path 'META-INF/com.android.tools/proguard/coroutines.pro'" error" This reverts commit fc0faea. * 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>
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>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
Testing
Type of Change
Place an
xthe applicable box:Notes
Release Notessection ofrelease_build_files/readme.md.