Upgrade to Kotlin 1.3 #185
Merged
Conversation
This file contains 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
zach-klippenstein
force-pushed
the
zachklipp/kotlin13
branch
from
e133304 to
d4c3caf
Compare
kirillzh
reviewed
Mar 17, 2019
| @@ -77,6 +77,8 @@ class WorkflowOperatorsTest { | |||
| states.cancel() | |||
|
|
|||
| assertThat(subscribeCount).isEqualTo(1) | |||
| assertThat(disposeCount).isEqualTo(1) | |||
| // For some reason the observable is actually disposed twice. Seems like a coroutines bug, but | |||
| // Disposable.dispose() is an idempotent operation so it should be fine. | |||
There was a problem hiding this comment.
Interesting... I assume that's regression, worth filing Kotlin bug?
There was a problem hiding this comment.
I believe so. I'll try to isolate and file this week.
rjrjr
approved these changes
Mar 18, 2019
| @@ -77,6 +78,11 @@ class EventSelectBuilder<E : Any, R : Any> internal constructor( | |||
| */ | |||
| @PublishedApi | |||
| internal val scope = CoroutineScope(Unconfined + selectionJob) | |||
| .apply { | |||
| coroutineContext[Job]!!.invokeOnCompletion { cause -> | |||
| cause?.printStackTrace() | |||
There was a problem hiding this comment.
Oops, didn't mean to leave this in.
| @@ -113,6 +115,7 @@ fun <S : Any, E : Any, O1 : Any, O2 : Any> Workflow<S, E, O1>.mapResult( | |||
| // Propagate cancellation upstream. | |||
| transformedResult.invokeOnCompletion { cause -> | |||
| if (cause != null) { | |||
| @Suppress("DEPRECATION") | |||
There was a problem hiding this comment.
Worth noting why we can't use the un-deprecated path, if there is one.
There was a problem hiding this comment.
Filed #188 and added TODOs.
| @@ -165,6 +167,7 @@ class ChannelSubscriptionsIntegrationTest { | |||
| workflow.testFromStart(true) { host -> | |||
| assertFalse(host.hasOutput) | |||
|
|
|||
| @Suppress("DEPRECATION") | |||
There was a problem hiding this comment.
Another spot for a note about why we have to use deprecated.
Some error handling behavior changed which required changes to how the library handles exceptions and cancellation, as well as a few unit test changes. Closes #35.
zach-klippenstein
force-pushed
the
zachklipp/kotlin13
branch
from
d4c3caf to
20ae6c0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This branch has 2 commits:
This PR targets the
kotlin-13branch, which is still a bit old. I want to land on that branch first, before merging master, so that I can upgrade the rewritten workflows code separately.Closes #35.