Revert "[stdlib][common][coroutines][experimental] support of extracted old experimental coroutines code"
This reverts commit 0ffcfa4ef1.
This commit is contained in:
@@ -132,7 +132,6 @@ configurations {
|
||||
kotlin_native_utils_jar
|
||||
trove4j_jar
|
||||
kotlinCommonSources
|
||||
kotlin_coroutines_experimental_compat_jar
|
||||
|
||||
cli_bcRuntime {
|
||||
extendsFrom compilerRuntime
|
||||
@@ -151,9 +150,8 @@ dependencies {
|
||||
kotlin_reflect_jar "$kotlinReflectModule@jar"
|
||||
kotlin_script_runtime_jar "$kotlinScriptRuntimeModule@jar"
|
||||
kotlin_native_utils_jar "$kotlinNativeUtilsModule@jar"
|
||||
kotlin_coroutines_experimental_compat_jar "$kotlinCoroutinesExperimentalCompatModule@jar"
|
||||
[kotlinCommonStdlibModule, kotlinCoroutinesExperimentalCompatModule,
|
||||
kotlinTestCommonModule, kotlinTestAnnotationsCommonModule].each {
|
||||
|
||||
[kotlinCommonStdlibModule, kotlinTestCommonModule, kotlinTestAnnotationsCommonModule].each {
|
||||
kotlinCommonSources(it) { transitive = false }
|
||||
}
|
||||
|
||||
|
||||
@@ -72,12 +72,6 @@ open class CopyCommonSources : DefaultTask() {
|
||||
it.include("generated/**/*.kt")
|
||||
it.include("kotlin/**/*.kt")
|
||||
it.include("kotlin.test/*.kt")
|
||||
it.exclude("kotlin/**/experimental/jvm/**/*.kt")
|
||||
it.exclude("kotlin/**/coroutines/experimental/**/*Jvm.kt")
|
||||
it.exclude("kotlin/**/coroutines/experimental/intrinsics/*.kt")
|
||||
it.exclude("kotlin/**/coroutines/experimental/SafeContinuation.kt")
|
||||
it.exclude("kotlin/**/coroutines/experimental/CoroutinesLibrary.kt")
|
||||
it.exclude("kotlin/**/coroutines/experimental/SequenceBuilder.kt")
|
||||
it.into(destinationDir)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,7 +83,6 @@ ext {
|
||||
kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}"
|
||||
kotlinNativeUtilsModule="org.jetbrains.kotlin:kotlin-native-utils:${kotlinVersion}"
|
||||
kotlinUtilKliMetadatabModule="org.jetbrains.kotlin:kotlin-util-klib-metadata:${kotlinVersion}"
|
||||
kotlinCoroutinesExperimentalCompatModule="org.jetbrains.kotlin:kotlin-coroutines-experimental-compat:${kotlinVersion}:sources"
|
||||
|
||||
konanVersionFull = CompilerVersionGeneratedKt.getCurrentCompilerVersion()
|
||||
gradlePluginVersion = konanVersionFull
|
||||
|
||||
@@ -71,7 +71,7 @@ public actual inline fun <R, T> (suspend R.() -> T).startCoroutineUninterceptedO
|
||||
* the execution was suspended and will not return any result immediately.
|
||||
*/
|
||||
@SinceKotlin("1.1")
|
||||
public val COROUTINE_SUSPENDED: Any get() = CoroutineSingletons.COROUTINE_SUSPENDED
|
||||
public actual val COROUTINE_SUSPENDED: Any get() = CoroutineSingletons.COROUTINE_SUSPENDED
|
||||
|
||||
// Using enum here ensures two important properties:
|
||||
// 1. It makes SafeContinuation serializable with all kinds of serialization frameworks (since all of them natively support enums)
|
||||
|
||||
Reference in New Issue
Block a user