From a3fdca0ea30ab26560f3b8495ee1d9913da27675 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Thu, 6 Feb 2020 17:09:40 +0100 Subject: [PATCH] Revert "[stdlib][common][coroutines][experimental] support of extracted old experimental coroutines code" This reverts commit 0ffcfa4ef1ac23d05332554f9e108c912ef0dd6a. --- backend.native/build.gradle | 6 ++---- .../main/kotlin/org/jetbrains/kotlin/CopyCommonSources.kt | 6 ------ build.gradle | 1 - .../kotlin/kotlin/coroutines/experimental/Intrinsics.kt | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/backend.native/build.gradle b/backend.native/build.gradle index ab4d773094f..8481d3d9841 100644 --- a/backend.native/build.gradle +++ b/backend.native/build.gradle @@ -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 } } diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopyCommonSources.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopyCommonSources.kt index 00a874384f2..b6ca78c7926 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopyCommonSources.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopyCommonSources.kt @@ -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) } } diff --git a/build.gradle b/build.gradle index 0dade1c20e4..80569730c33 100644 --- a/build.gradle +++ b/build.gradle @@ -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 diff --git a/runtime/src/main/kotlin/kotlin/coroutines/experimental/Intrinsics.kt b/runtime/src/main/kotlin/kotlin/coroutines/experimental/Intrinsics.kt index 56397b306b3..c270dc53f13 100644 --- a/runtime/src/main/kotlin/kotlin/coroutines/experimental/Intrinsics.kt +++ b/runtime/src/main/kotlin/kotlin/coroutines/experimental/Intrinsics.kt @@ -71,7 +71,7 @@ public actual inline fun (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)