Skip to content

merge fad/next into fad/in-app-feedback #4107

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

Conversation

kaibolay
Copy link
Contributor

alternative to #4106 which should produce same file contents

lfkellogg and others added 6 commits September 14, 2022 13:28
* Updated various versions (dependencies and SDK to fix Android resource linking failure (AAPT: error: resource android:attr/lStar not found.)

* Update compileSdk/targetSdkVersion from 31 to 33
* Deflake firebase_common HeartBeat tests. (#4083)

The tests relied on `TestOnCompleteListener` that was not safe to call
more than once since it was based on a count down latch. So reusing it
multiple times would cause await() to return immediately.

This change makes it so that a new latch is created for every await()
call, making all await() calls work.

Fixes: http://b/245956774

* Add Javadoc support to the DackkaPlugin (#4082)

* Add util method for copying directories

* Add javadoc support to our dackka plugin

* Remove the extension check on fromDirectory

* Add a note about cache compliance and the javadoc task

* Add reference to kotlin stdlib package list (#4093)

Co-authored-by: Vladimir Kryachko <[email protected]>
Co-authored-by: Daymon <[email protected]>
* Deflake firebase_common HeartBeat tests. (#4083)

The tests relied on `TestOnCompleteListener` that was not safe to call
more than once since it was based on a count down latch. So reusing it
multiple times would cause await() to return immediately.

This change makes it so that a new latch is created for every await()
call, making all await() calls work.

Fixes: http://b/245956774

* Add Javadoc support to the DackkaPlugin (#4082)

* Add util method for copying directories

* Add javadoc support to our dackka plugin

* Remove the extension check on fromDirectory

* Add a note about cache compliance and the javadoc task

* Add reference to kotlin stdlib package list (#4093)

Co-authored-by: Vladimir Kryachko <[email protected]>
Co-authored-by: Daymon <[email protected]>
@google-oss-bot
Copy link
Contributor

Coverage Report 1

Affected Products

No changes between base commit (c841968) and merge commit (c3a0571).

Test Logs

  1. https://storage.googleapis.com/firebase-sdk-metric-reports/UU1stswth6.html

@kaibolay kaibolay merged commit 779acd1 into fad/in-app-feedback Sep 15, 2022
@kaibolay kaibolay deleted the kb/actual-merge-fad-next-into-in-app-feedback branch September 15, 2022 19:01
@firebase firebase locked and limited conversation to collaborators Oct 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants