Temporarily turn off ReleaseCoroutines feature

This commit is contained in:
Ilya Gorbunov
2018-06-21 08:50:12 +03:00
parent d4a195c757
commit 76e581fe4f
8 changed files with 17 additions and 10 deletions
+4 -3
View File
@@ -18,7 +18,7 @@ buildscript {
repositories { repositories {
bootstrapKotlinRepo?.let(::maven) bootstrapKotlinRepo?.let(::maven)
maven("https://plugins.gradle.org/m2") maven("https://plugins.gradle.org/m2")
} }
// a workaround for kotlin compiler classpath in kotlin project: sometimes gradle substitutes // a workaround for kotlin compiler classpath in kotlin project: sometimes gradle substitutes
// kotlin-stdlib external dependency with local project :kotlin-stdlib in kotlinCompilerClasspath configuration. // kotlin-stdlib external dependency with local project :kotlin-stdlib in kotlinCompilerClasspath configuration.
@@ -266,14 +266,15 @@ allprojects {
mirrorRepo?.let(::maven) mirrorRepo?.let(::maven)
bootstrapKotlinRepo?.let(::maven) bootstrapKotlinRepo?.let(::maven)
jcenter() jcenter()
} }
configureJvmProject(javaHome!!, jvmTarget!!) configureJvmProject(javaHome!!, jvmTarget!!)
val commonCompilerArgs = listOfNotNull( val commonCompilerArgs = listOfNotNull(
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xread-deserialized-contracts", "-Xread-deserialized-contracts",
"-Xprogressive".takeIf { hasProperty("test.progressive.mode") } "-Xprogressive".takeIf { hasProperty("test.progressive.mode") },
"-XXLanguage:-ReleaseCoroutines"
) )
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> { tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
+1 -1
View File
@@ -70,7 +70,7 @@ compileKotlin {
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform"] kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-XXLanguage:-ReleaseCoroutines"]
} }
compileJava9Sources(project, 'kotlin.stdlib.jdk7') compileJava9Sources(project, 'kotlin.stdlib.jdk7')
+1 -1
View File
@@ -73,7 +73,7 @@ compileKotlin {
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform"] kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-XXLanguage:-ReleaseCoroutines"]
} }
compileJava9Sources(project, 'kotlin.stdlib.jdk8') compileJava9Sources(project, 'kotlin.stdlib.jdk8')
+1 -1
View File
@@ -63,7 +63,7 @@ compileKotlin {
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform"] kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-XXLanguage:-ReleaseCoroutines"]
} }
kotlin.experimental.coroutines 'enable' kotlin.experimental.coroutines 'enable'
+1 -1
View File
@@ -66,7 +66,7 @@ compileKotlin {
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable", "-Xmulti-platform"] kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable", "-Xmulti-platform", "-XXLanguage:-ReleaseCoroutines"]
} }
kotlin.experimental.coroutines 'enable' kotlin.experimental.coroutines 'enable'
+5 -1
View File
@@ -148,7 +148,8 @@ compileKotlin2Js {
sourceMapPrefix = "./" sourceMapPrefix = "./"
freeCompilerArgs += [ freeCompilerArgs += [
"-source-map-base-dirs", [builtinsSrcDir, jsSrcDir, commonSrcDir, commonSrcDir2].collect { file(it).absoluteFile }.join(File.pathSeparator), "-source-map-base-dirs", [builtinsSrcDir, jsSrcDir, commonSrcDir, commonSrcDir2].collect { file(it).absoluteFile }.join(File.pathSeparator),
"-Xuse-experimental=kotlin.Experimental" "-Xuse-experimental=kotlin.Experimental",
"-XXLanguage:-ReleaseCoroutines"
] ]
} }
} }
@@ -178,6 +179,9 @@ compileCoroutinesKotlin2Js {
compileTestKotlin2Js { compileTestKotlin2Js {
kotlinOptions { kotlinOptions {
moduleKind = "umd" moduleKind = "umd"
freeCompilerArgs += [
"-XXLanguage:-ReleaseCoroutines"
]
} }
} }
+2 -1
View File
@@ -182,7 +182,8 @@ compileKotlin {
"-Xmultifile-parts-inherit", "-Xmultifile-parts-inherit",
"-Xnormalize-constructor-calls=enable", "-Xnormalize-constructor-calls=enable",
"-module-name", "kotlin-stdlib", "-module-name", "kotlin-stdlib",
"-Xuse-experimental=kotlin.Experimental" "-Xuse-experimental=kotlin.Experimental",
"-XXLanguage:-ReleaseCoroutines"
] ]
} }
} }
+2 -1
View File
@@ -45,7 +45,8 @@ compileKotlin {
kotlinOptions.freeCompilerArgs = [ kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xnormalize-constructor-calls=enable", "-Xnormalize-constructor-calls=enable",
"-module-name", project.name "-module-name", project.name,
"-XXLanguage:-ReleaseCoroutines"
] ]
} }