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

Support -Werror CLI argument to treat warnings as errors

Browse Source 
The option is named "warningsAsErrors" in the Gradle plugin

 #KT-10563 Fixed
This commit is contained in:
Alexander Udalov
2017-08-25 17:11:34 +03:00
committed by Ilya Gorbunov
parent 897261a8a6
commit 5cbcbe4a9c
26 changed files with 133 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
+6
View File
@@ -17,4 +17,10 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo
* Default value: null
*/
var languageVersion: kotlin.String?
/**
* Report an error if there are any warnings
* Default value: false
*/
var warningsAsErrors: kotlin.Boolean
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
+7
View File
@@ -24,6 +24,11 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
get() = languageVersionField ?: null
set(value) { languageVersionField = value }
private var warningsAsErrorsField: kotlin.Boolean? = null
override var warningsAsErrors: kotlin.Boolean
get() = warningsAsErrorsField ?: false
set(value) { warningsAsErrorsField = value }
private var friendModulesDisabledField: kotlin.Boolean? = null
override var friendModulesDisabled: kotlin.Boolean
get() = friendModulesDisabledField ?: false
@@ -84,6 +89,7 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
verboseField?.let { args.verbose = it }
apiVersionField?.let { args.apiVersion = it }
languageVersionField?.let { args.languageVersion = it }
warningsAsErrorsField?.let { args.warningsAsErrors = it }
friendModulesDisabledField?.let { args.friendModulesDisabled = it }
mainField?.let { args.main = it }
metaInfoField?.let { args.metaInfo = it }
@@ -103,6 +109,7 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fil
verbose = false
apiVersion = null
languageVersion = null
warningsAsErrors = false
friendModulesDisabled = false
main = "call"
metaInfo = true
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt
+7
View File
@@ -24,6 +24,11 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
get() = languageVersionField ?: null
set(value) { languageVersionField = value }
private var warningsAsErrorsField: kotlin.Boolean? = null
override var warningsAsErrors: kotlin.Boolean
get() = warningsAsErrorsField ?: false
set(value) { warningsAsErrorsField = value }
private var includeRuntimeField: kotlin.Boolean? = null
override var includeRuntime: kotlin.Boolean
get() = includeRuntimeField ?: false
@@ -64,6 +69,7 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
verboseField?.let { args.verbose = it }
apiVersionField?.let { args.apiVersion = it }
languageVersionField?.let { args.languageVersion = it }
warningsAsErrorsField?.let { args.warningsAsErrors = it }
includeRuntimeField?.let { args.includeRuntime = it }
javaParametersField?.let { args.javaParameters = it }
jdkHomeField?.let { args.jdkHome = it }
@@ -79,6 +85,7 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fi
verbose = false
apiVersion = null
languageVersion = null
warningsAsErrors = false
includeRuntime = false
javaParameters = false
jdkHome = null