From a64a76d5fc688d8d4a65d1634ede0a26df0727dd Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 2 Nov 2018 19:45:56 +0300 Subject: [PATCH] Remove experimental coroutines opt-in from build scripts It has no effect in Kotlin 1.3 Only enable coroutines if '-ReleaseCoroutines' is used --- compiler/frontend.script/build.gradle.kts | 5 ----- .../examples/scripting/jvm-maven-deps/host/build.gradle.kts | 5 ----- .../scripting/jvm-simple-script/host/build.gradle.kts | 5 ----- libraries/scripting/common/build.gradle.kts | 3 --- libraries/scripting/jvm-host/build.gradle.kts | 4 ---- libraries/scripting/jvm/build.gradle.kts | 3 --- libraries/stdlib/common/build.gradle | 3 +-- libraries/stdlib/jdk7/build.gradle | 2 -- libraries/stdlib/jdk8/build.gradle | 2 -- libraries/stdlib/jre7/build.gradle | 2 -- libraries/stdlib/jre8/build.gradle | 2 -- libraries/stdlib/js/build.gradle | 3 +-- libraries/stdlib/jvm/build.gradle | 3 +-- libraries/stdlib/samples/build.gradle | 2 -- .../resources/testProject/coroutinesProjectDSL/build.gradle | 6 ------ libraries/tools/script-runtime/build.gradle | 1 - 16 files changed, 3 insertions(+), 48 deletions(-) diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts index a3a44258783..c260a899932 100644 --- a/compiler/frontend.script/build.gradle.kts +++ b/compiler/frontend.script/build.gradle.kts @@ -1,4 +1,3 @@ -import org.jetbrains.kotlin.gradle.dsl.Coroutines plugins { kotlin("jvm") @@ -21,7 +20,3 @@ sourceSets { "main" { projectDefault() } "test" {} } - -kotlin { - experimental.coroutines = Coroutines.ENABLE -} \ No newline at end of file diff --git a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts index d00829803e3..08049c0a29d 100644 --- a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts @@ -1,4 +1,3 @@ -import org.jetbrains.kotlin.gradle.dsl.Coroutines plugins { kotlin("jvm") @@ -20,7 +19,3 @@ sourceSets { "main" { projectDefault() } "test" { projectDefault() } } - -kotlin { - experimental.coroutines = Coroutines.ENABLE -} diff --git a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts index 312a8db593b..b81a790fedd 100644 --- a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts @@ -1,4 +1,3 @@ -import org.jetbrains.kotlin.gradle.dsl.Coroutines plugins { kotlin("jvm") @@ -17,7 +16,3 @@ sourceSets { "main" { projectDefault() } "test" { projectDefault() } } - -kotlin { - experimental.coroutines = Coroutines.ENABLE -} diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts index 6c275ceabfb..f5264632ad5 100644 --- a/libraries/scripting/common/build.gradle.kts +++ b/libraries/scripting/common/build.gradle.kts @@ -1,4 +1,3 @@ -import org.jetbrains.kotlin.gradle.dsl.Coroutines plugins { kotlin("jvm") @@ -19,8 +18,6 @@ sourceSets { "test" {} } -kotlin.experimental.coroutines = Coroutines.ENABLE - val jar = runtimeJar() val sourcesJar = sourcesJar() val javadocJar = javadocJar() diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts index 749a155013a..851de4badec 100644 --- a/libraries/scripting/jvm-host/build.gradle.kts +++ b/libraries/scripting/jvm-host/build.gradle.kts @@ -1,6 +1,4 @@ -import org.jetbrains.kotlin.gradle.dsl.Coroutines - plugins { kotlin("jvm") id("jps-compatible") @@ -25,8 +23,6 @@ sourceSets { "test" { projectDefault() } } -kotlin.experimental.coroutines = Coroutines.ENABLE - standardPublicJars() publish() diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts index 76b640c98a6..92c3baececa 100644 --- a/libraries/scripting/jvm/build.gradle.kts +++ b/libraries/scripting/jvm/build.gradle.kts @@ -1,4 +1,3 @@ -import org.jetbrains.kotlin.gradle.dsl.Coroutines plugins { kotlin("jvm") @@ -18,8 +17,6 @@ sourceSets { "test" {} } -kotlin.experimental.coroutines = Coroutines.ENABLE - val jar = runtimeJar() val sourcesJar = sourcesJar() val javadocJar = javadocJar() diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle index 442bf87910b..6750332ed96 100644 --- a/libraries/stdlib/common/build.gradle +++ b/libraries/stdlib/common/build.gradle @@ -72,6 +72,7 @@ compileCoroutinesKotlinCommon { "-module-name", project.name+"-coroutines", "-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xuse-experimental=kotlin.Experimental", + "-Xcoroutines=enable", "-XXLanguage:-ReleaseCoroutines", "-Xallow-kotlin-package", "-Xallow-result-return-type" @@ -87,8 +88,6 @@ compileTestKotlinCommon { } } -kotlin.experimental.coroutines 'enable' - jar { manifestAttributes(manifest, project, 'Main') from sourceSets.coroutines.output diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 2ee4d3caeba..d5a11a1b130 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -86,8 +86,6 @@ compileTestKotlin { compileJava9Sources(project, 'kotlin.stdlib.jdk7') -kotlin.experimental.coroutines 'enable' - test { executable = "$JDK_17/bin/java" } diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index 869571c2d41..0b8eca7fde8 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/libraries/stdlib/jdk8/build.gradle @@ -89,8 +89,6 @@ compileTestKotlin { compileJava9Sources(project, 'kotlin.stdlib.jdk8') -kotlin.experimental.coroutines 'enable' - test { executable = "$JDK_18/bin/java" } diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle index 92389a61fe7..e77f3c388af 100644 --- a/libraries/stdlib/jre7/build.gradle +++ b/libraries/stdlib/jre7/build.gradle @@ -71,8 +71,6 @@ compileTestKotlin { kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-XXLanguage:+ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"] } -kotlin.experimental.coroutines 'enable' - test { executable = "$JDK_17/bin/java" } diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle index e6a9b0afec3..efb88fc1c5f 100644 --- a/libraries/stdlib/jre8/build.gradle +++ b/libraries/stdlib/jre8/build.gradle @@ -74,8 +74,6 @@ compileTestKotlin { kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable", "-Xmulti-platform", "-XXLanguage:+ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"] } -kotlin.experimental.coroutines 'enable' - test { executable = "$JDK_18/bin/java" } diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle index ac3590ffd86..aaad12d5ac1 100644 --- a/libraries/stdlib/js/build.gradle +++ b/libraries/stdlib/js/build.gradle @@ -122,8 +122,6 @@ task prepareBuiltinsSources(type: Copy) { into builtinsSrcDir } -kotlin.experimental.coroutines "enable" - tasks.withType(org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile) { kotlinOptions { main = "noCall" @@ -185,6 +183,7 @@ compileCoroutinesKotlin2Js { freeCompilerArgs += [ "-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xuse-experimental=kotlin.Experimental", + "-Xcoroutines=enable", "-XXLanguage:-ReleaseCoroutines" ] } diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index e19e347fcdd..da5a90083ef 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -212,6 +212,7 @@ compileCoroutinesKotlin { "-Xmultifile-parts-inherit", "-Xuse-experimental=kotlin.contracts.ExperimentalContracts", "-Xuse-experimental=kotlin.Experimental", + "-Xcoroutines=enable", "-XXLanguage:-ReleaseCoroutines", "-module-name", "kotlin-stdlib-coroutines" ] @@ -264,5 +265,3 @@ test { systemProperty("kotlin.stdlib.test.long.sequences", "true") } } - -kotlin.experimental.coroutines 'enable' diff --git a/libraries/stdlib/samples/build.gradle b/libraries/stdlib/samples/build.gradle index cda84fef017..6ef0af96b90 100644 --- a/libraries/stdlib/samples/build.gradle +++ b/libraries/stdlib/samples/build.gradle @@ -14,8 +14,6 @@ compileTestKotlin { kotlinOptions.freeCompilerArgs += ["-XXLanguage:+ReleaseCoroutines"] } -kotlin.experimental.coroutines 'enable' - test { executable = "$JDK_18/bin/java" } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/coroutinesProjectDSL/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/coroutinesProjectDSL/build.gradle index 72503d73aeb..30f34663a36 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/coroutinesProjectDSL/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/coroutinesProjectDSL/build.gradle @@ -15,12 +15,6 @@ repositories { mavenCentral() } -kotlin { - experimental { - coroutines 'enable' - } -} - dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } \ No newline at end of file diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle index dd467d3deb0..fb6c944b80f 100644 --- a/libraries/tools/script-runtime/build.gradle +++ b/libraries/tools/script-runtime/build.gradle @@ -49,5 +49,4 @@ compileKotlin { ] } -kotlin.experimental.coroutines 'enable'