From a3d78f769b6466da2eb3bd80e17b21781f4d7b3f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 14 Aug 2018 20:17:06 +0300 Subject: [PATCH] Add Coroutines.DEFAULT to Gradle plugin See CommonCompilerArguments changes --- .../jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt | 7 +++---- .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt index fd5d84268c7..11d1f38e11b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt @@ -63,12 +63,11 @@ open class ExperimentalExtension { enum class Coroutines { ENABLE, WARN, - ERROR; + ERROR, + DEFAULT; companion object { - val DEFAULT = WARN - fun byCompilerArgument(argument: String): Coroutines? = - Coroutines.values().firstOrNull { it.name.equals(argument, ignoreCase = true) } + Coroutines.values().firstOrNull { it.name.equals(argument, ignoreCase = true) } } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index e8774260525..2ffa6e9c1ab 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -269,6 +269,7 @@ abstract class AbstractKotlinCompile() : AbstractKo Coroutines.ENABLE -> CommonCompilerArguments.ENABLE Coroutines.WARN -> CommonCompilerArguments.WARN Coroutines.ERROR -> CommonCompilerArguments.ERROR + Coroutines.DEFAULT -> CommonCompilerArguments.DEFAULT } logger.kotlinDebug { "args.coroutinesState=${args.coroutinesState}" }