azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[stdlib][common][coroutines][experimental] support of extracted old experimental coroutines code"

Browse Source 
This reverts commit 0ffcfa4ef1.
This commit is contained in:
Vasily Levchenko
2020-02-06 17:09:40 +01:00
parent db037602b4
commit a3fdca0ea3
4 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+2 -4
View File
@@ -132,7 +132,6 @@ configurations {
kotlin_native_utils_jar kotlin_native_utils_jar
trove4j_jar trove4j_jar
kotlinCommonSources kotlinCommonSources
kotlin_coroutines_experimental_compat_jar
cli_bcRuntime { cli_bcRuntime {
extendsFrom compilerRuntime extendsFrom compilerRuntime
@@ -151,9 +150,8 @@ dependencies {
kotlin_reflect_jar "$kotlinReflectModule@jar" kotlin_reflect_jar "$kotlinReflectModule@jar"
kotlin_script_runtime_jar "$kotlinScriptRuntimeModule@jar" kotlin_script_runtime_jar "$kotlinScriptRuntimeModule@jar"
kotlin_native_utils_jar "$kotlinNativeUtilsModule@jar" kotlin_native_utils_jar "$kotlinNativeUtilsModule@jar"
kotlin_coroutines_experimental_compat_jar "$kotlinCoroutinesExperimentalCompatModule@jar"
[kotlinCommonStdlibModule, kotlinCoroutinesExperimentalCompatModule, [kotlinCommonStdlibModule, kotlinTestCommonModule, kotlinTestAnnotationsCommonModule].each {
kotlinTestCommonModule, kotlinTestAnnotationsCommonModule].each {
kotlinCommonSources(it) { transitive = false } kotlinCommonSources(it) { transitive = false }
} }
build-tools/src/main/kotlin/org/jetbrains/kotlin/CopyCommonSources.kt
-6
View File
@@ -72,12 +72,6 @@ open class CopyCommonSources : DefaultTask() {
it.include("generated/**/*.kt") it.include("generated/**/*.kt")
it.include("kotlin/**/*.kt") it.include("kotlin/**/*.kt")
it.include("kotlin.test/*.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) it.into(destinationDir)
} }
} }
build.gradle
-1
View File
@@ -83,7 +83,6 @@ ext {
kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}" kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}"
kotlinNativeUtilsModule="org.jetbrains.kotlin:kotlin-native-utils:${kotlinVersion}" kotlinNativeUtilsModule="org.jetbrains.kotlin:kotlin-native-utils:${kotlinVersion}"
kotlinUtilKliMetadatabModule="org.jetbrains.kotlin:kotlin-util-klib-metadata:${kotlinVersion}" kotlinUtilKliMetadatabModule="org.jetbrains.kotlin:kotlin-util-klib-metadata:${kotlinVersion}"
kotlinCoroutinesExperimentalCompatModule="org.jetbrains.kotlin:kotlin-coroutines-experimental-compat:${kotlinVersion}:sources"
konanVersionFull = CompilerVersionGeneratedKt.getCurrentCompilerVersion() konanVersionFull = CompilerVersionGeneratedKt.getCurrentCompilerVersion()
gradlePluginVersion = konanVersionFull gradlePluginVersion = konanVersionFull
runtime/src/main/kotlin/kotlin/coroutines/experimental/Intrinsics.kt
+1 -1
View File
@@ -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. * the execution was suspended and will not return any result immediately.
*/ */
@SinceKotlin("1.1") @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: // 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) // 1. It makes SafeContinuation serializable with all kinds of serialization frameworks (since all of them natively support enums)