Skip to content
This repository has been archived by the owner on Aug 10, 2021. It is now read-only.

Support release coroutines #1909

Merged
merged 3 commits into from
Aug 24, 2018
Merged

Support release coroutines #1909

merged 3 commits into from
Aug 24, 2018

Conversation

SvyatoslavScherbina
Copy link
Collaborator

@SvyatoslavScherbina SvyatoslavScherbina commented Aug 21, 2018

To be merged after update to 1.3-M2-eap-76

@@ -0,0 +1,133 @@
/*
Copy link
Collaborator Author

@SvyatoslavScherbina SvyatoslavScherbina Aug 21, 2018

Choose a reason for hiding this comment

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

Note: this file is copied from Kotlin/JVM and adapted.

@@ -0,0 +1,85 @@
/*
Copy link
Collaborator Author

@SvyatoslavScherbina SvyatoslavScherbina Aug 21, 2018

Choose a reason for hiding this comment

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

Note: this file is copied from Kotlin/JVM and adapted.

@@ -16,21 +16,47 @@

package kotlin.coroutines

// TODO: implement them right.
//@PublishedApi
import kotlin.*
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Note: this file is copied from Kotlin/JVM and adapted.

@@ -17,21 +17,178 @@
package kotlin.coroutines.intrinsics

import kotlin.coroutines.*
// TODO: implement them right.
import kotlin.coroutines.native.internal.*
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Note: this file is copied from Kotlin/JVM and adapted.

@SvyatoslavScherbina SvyatoslavScherbina changed the base branch from compiler-1.3 to 1.3-M2 August 21, 2018 12:52
@olonho
Copy link
Contributor

olonho commented Aug 22, 2018

Maybe rebase on master now?

@SvyatoslavScherbina
Copy link
Collaborator Author

@olonho

Maybe rebase on master now?

What for? This branch requires updating kotlin-compiler to 1.3-M2-eap-76.

@SvyatoslavScherbina SvyatoslavScherbina changed the base branch from 1.3-M2 to master August 23, 2018 13:24
@olonho
Copy link
Contributor

olonho commented Aug 23, 2018

Please rebase and make sure tests pass.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants