Skip to content
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

Pr/2528 #2786

Merged
merged 14 commits into from
Jun 24, 2021
Merged

Pr/2528 #2786

merged 14 commits into from
Jun 24, 2021

Conversation

qwwdfsad
Copy link
Member

This is a redacted mirror of #2528.

I've reviewed and accepted it, but it would be nice to have a second pair of eyes here in case I missed something during the course of multiple review iterations

@qwwdfsad qwwdfsad requested a review from dkhalanskyjb June 23, 2021 11:15
integration/kotlinx-coroutines-play-services/README.md Outdated Show resolved Hide resolved
integration/kotlinx-coroutines-play-services/src/Tasks.kt Outdated Show resolved Hide resolved
deferred.cancel()
} else {
@Suppress("UNCHECKED_CAST")
deferred.complete(this.result as T)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is this. needed?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not really needed, seems to be a leftover

integration/kotlinx-coroutines-play-services/src/Tasks.kt Outdated Show resolved Hide resolved
integration/kotlinx-coroutines-play-services/src/Tasks.kt Outdated Show resolved Hide resolved
qwwdfsad and others added 5 commits June 24, 2021 12:00
Co-authored-by: dkhalanskyjb <52952525+dkhalanskyjb@users.noreply.github.com>
Co-authored-by: dkhalanskyjb <52952525+dkhalanskyjb@users.noreply.github.com>
Co-authored-by: dkhalanskyjb <52952525+dkhalanskyjb@users.noreply.github.com>
Co-authored-by: dkhalanskyjb <52952525+dkhalanskyjb@users.noreply.github.com>
@qwwdfsad qwwdfsad requested a review from dkhalanskyjb June 24, 2021 09:16
@qwwdfsad qwwdfsad merged commit e81ce21 into develop Jun 24, 2021
@qwwdfsad qwwdfsad deleted the pr/2528 branch June 24, 2021 09:48
pablobaxter pushed a commit to pablobaxter/kotlinx.coroutines that referenced this pull request Sep 14, 2022
…Kotlin#2786)

* Support bi-directional cancellation for Task.asDeferred and Task.await via passed in CancellationTokenSource

Fixes Kotlin#2527

Co-authored-by: Alex Vanyo <vanyoalex@gmail.com>
Co-authored-by: dkhalanskyjb <52952525+dkhalanskyjb@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants