Re-generate Gradle options to have allWarningsAsErrors updated.
Issue #KT-20553 Fixed
This commit is contained in:
+6
-6
@@ -4,6 +4,12 @@ package org.jetbrains.kotlin.gradle.dsl
|
|||||||
|
|
||||||
interface KotlinCommonToolOptions {
|
interface KotlinCommonToolOptions {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Report an error if there are any warnings
|
||||||
|
* Default value: false
|
||||||
|
*/
|
||||||
|
var allWarningsAsErrors: kotlin.Boolean
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate no warnings
|
* Generate no warnings
|
||||||
* Default value: false
|
* Default value: false
|
||||||
@@ -16,12 +22,6 @@ interface KotlinCommonToolOptions {
|
|||||||
*/
|
*/
|
||||||
var verbose: kotlin.Boolean
|
var verbose: kotlin.Boolean
|
||||||
|
|
||||||
/**
|
|
||||||
* Report an error if there are any warnings
|
|
||||||
* Default value: false
|
|
||||||
*/
|
|
||||||
var warningsAsErrors: kotlin.Boolean
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A list of additional compiler arguments
|
* A list of additional compiler arguments
|
||||||
* Default value: emptyList()
|
* Default value: emptyList()
|
||||||
|
|||||||
+7
-7
@@ -4,6 +4,11 @@ package org.jetbrains.kotlin.gradle.dsl
|
|||||||
|
|
||||||
internal abstract class KotlinJsDceOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJsDceOptions {
|
internal abstract class KotlinJsDceOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJsDceOptions {
|
||||||
|
|
||||||
|
private var allWarningsAsErrorsField: kotlin.Boolean? = null
|
||||||
|
override var allWarningsAsErrors: kotlin.Boolean
|
||||||
|
get() = allWarningsAsErrorsField ?: false
|
||||||
|
set(value) { allWarningsAsErrorsField = value }
|
||||||
|
|
||||||
private var suppressWarningsField: kotlin.Boolean? = null
|
private var suppressWarningsField: kotlin.Boolean? = null
|
||||||
override var suppressWarnings: kotlin.Boolean
|
override var suppressWarnings: kotlin.Boolean
|
||||||
get() = suppressWarningsField ?: false
|
get() = suppressWarningsField ?: false
|
||||||
@@ -14,20 +19,15 @@ internal abstract class KotlinJsDceOptionsBase : org.jetbrains.kotlin.gradle.dsl
|
|||||||
get() = verboseField ?: false
|
get() = verboseField ?: false
|
||||||
set(value) { verboseField = value }
|
set(value) { verboseField = value }
|
||||||
|
|
||||||
private var warningsAsErrorsField: kotlin.Boolean? = null
|
|
||||||
override var warningsAsErrors: kotlin.Boolean
|
|
||||||
get() = warningsAsErrorsField ?: false
|
|
||||||
set(value) { warningsAsErrorsField = value }
|
|
||||||
|
|
||||||
internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments) {
|
internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments) {
|
||||||
|
allWarningsAsErrorsField?.let { args.allWarningsAsErrors = it }
|
||||||
suppressWarningsField?.let { args.suppressWarnings = it }
|
suppressWarningsField?.let { args.suppressWarnings = it }
|
||||||
verboseField?.let { args.verbose = it }
|
verboseField?.let { args.verbose = it }
|
||||||
warningsAsErrorsField?.let { args.warningsAsErrors = it }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments.fillDefaultValues() {
|
internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments.fillDefaultValues() {
|
||||||
|
allWarningsAsErrors = false
|
||||||
suppressWarnings = false
|
suppressWarnings = false
|
||||||
verbose = false
|
verbose = false
|
||||||
warningsAsErrors = false
|
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-7
@@ -4,6 +4,11 @@ package org.jetbrains.kotlin.gradle.dsl
|
|||||||
|
|
||||||
internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions {
|
internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions {
|
||||||
|
|
||||||
|
private var allWarningsAsErrorsField: kotlin.Boolean? = null
|
||||||
|
override var allWarningsAsErrors: kotlin.Boolean
|
||||||
|
get() = allWarningsAsErrorsField ?: false
|
||||||
|
set(value) { allWarningsAsErrorsField = value }
|
||||||
|
|
||||||
private var suppressWarningsField: kotlin.Boolean? = null
|
private var suppressWarningsField: kotlin.Boolean? = null
|
||||||
override var suppressWarnings: kotlin.Boolean
|
override var suppressWarnings: kotlin.Boolean
|
||||||
get() = suppressWarningsField ?: false
|
get() = suppressWarningsField ?: false
|
||||||
@@ -14,11 +19,6 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
|
|||||||
get() = verboseField ?: false
|
get() = verboseField ?: false
|
||||||
set(value) { verboseField = value }
|
set(value) { verboseField = value }
|
||||||
|
|
||||||
private var warningsAsErrorsField: kotlin.Boolean? = null
|
|
||||||
override var warningsAsErrors: kotlin.Boolean
|
|
||||||
get() = warningsAsErrorsField ?: false
|
|
||||||
set(value) { warningsAsErrorsField = value }
|
|
||||||
|
|
||||||
private var apiVersionField: kotlin.String?? = null
|
private var apiVersionField: kotlin.String?? = null
|
||||||
override var apiVersion: kotlin.String?
|
override var apiVersion: kotlin.String?
|
||||||
get() = apiVersionField ?: null
|
get() = apiVersionField ?: null
|
||||||
@@ -85,9 +85,9 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
|
|||||||
set(value) { typedArraysField = value }
|
set(value) { typedArraysField = value }
|
||||||
|
|
||||||
internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments) {
|
internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments) {
|
||||||
|
allWarningsAsErrorsField?.let { args.allWarningsAsErrors = it }
|
||||||
suppressWarningsField?.let { args.suppressWarnings = it }
|
suppressWarningsField?.let { args.suppressWarnings = it }
|
||||||
verboseField?.let { args.verbose = it }
|
verboseField?.let { args.verbose = it }
|
||||||
warningsAsErrorsField?.let { args.warningsAsErrors = it }
|
|
||||||
apiVersionField?.let { args.apiVersion = it }
|
apiVersionField?.let { args.apiVersion = it }
|
||||||
languageVersionField?.let { args.languageVersion = it }
|
languageVersionField?.let { args.languageVersion = it }
|
||||||
friendModulesDisabledField?.let { args.friendModulesDisabled = it }
|
friendModulesDisabledField?.let { args.friendModulesDisabled = it }
|
||||||
@@ -105,9 +105,9 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
|
|||||||
}
|
}
|
||||||
|
|
||||||
internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fillDefaultValues() {
|
internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fillDefaultValues() {
|
||||||
|
allWarningsAsErrors = false
|
||||||
suppressWarnings = false
|
suppressWarnings = false
|
||||||
verbose = false
|
verbose = false
|
||||||
warningsAsErrors = false
|
|
||||||
apiVersion = null
|
apiVersion = null
|
||||||
languageVersion = null
|
languageVersion = null
|
||||||
friendModulesDisabled = false
|
friendModulesDisabled = false
|
||||||
|
|||||||
+7
-7
@@ -4,6 +4,11 @@ package org.jetbrains.kotlin.gradle.dsl
|
|||||||
|
|
||||||
internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions {
|
internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions {
|
||||||
|
|
||||||
|
private var allWarningsAsErrorsField: kotlin.Boolean? = null
|
||||||
|
override var allWarningsAsErrors: kotlin.Boolean
|
||||||
|
get() = allWarningsAsErrorsField ?: false
|
||||||
|
set(value) { allWarningsAsErrorsField = value }
|
||||||
|
|
||||||
private var suppressWarningsField: kotlin.Boolean? = null
|
private var suppressWarningsField: kotlin.Boolean? = null
|
||||||
override var suppressWarnings: kotlin.Boolean
|
override var suppressWarnings: kotlin.Boolean
|
||||||
get() = suppressWarningsField ?: false
|
get() = suppressWarningsField ?: false
|
||||||
@@ -14,11 +19,6 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
|
|||||||
get() = verboseField ?: false
|
get() = verboseField ?: false
|
||||||
set(value) { verboseField = value }
|
set(value) { verboseField = value }
|
||||||
|
|
||||||
private var warningsAsErrorsField: kotlin.Boolean? = null
|
|
||||||
override var warningsAsErrors: kotlin.Boolean
|
|
||||||
get() = warningsAsErrorsField ?: false
|
|
||||||
set(value) { warningsAsErrorsField = value }
|
|
||||||
|
|
||||||
private var apiVersionField: kotlin.String?? = null
|
private var apiVersionField: kotlin.String?? = null
|
||||||
override var apiVersion: kotlin.String?
|
override var apiVersion: kotlin.String?
|
||||||
get() = apiVersionField ?: null
|
get() = apiVersionField ?: null
|
||||||
@@ -65,9 +65,9 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
|
|||||||
set(value) { noStdlibField = value }
|
set(value) { noStdlibField = value }
|
||||||
|
|
||||||
internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments) {
|
internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments) {
|
||||||
|
allWarningsAsErrorsField?.let { args.allWarningsAsErrors = it }
|
||||||
suppressWarningsField?.let { args.suppressWarnings = it }
|
suppressWarningsField?.let { args.suppressWarnings = it }
|
||||||
verboseField?.let { args.verbose = it }
|
verboseField?.let { args.verbose = it }
|
||||||
warningsAsErrorsField?.let { args.warningsAsErrors = it }
|
|
||||||
apiVersionField?.let { args.apiVersion = it }
|
apiVersionField?.let { args.apiVersion = it }
|
||||||
languageVersionField?.let { args.languageVersion = it }
|
languageVersionField?.let { args.languageVersion = it }
|
||||||
includeRuntimeField?.let { args.includeRuntime = it }
|
includeRuntimeField?.let { args.includeRuntime = it }
|
||||||
@@ -81,9 +81,9 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
|
|||||||
}
|
}
|
||||||
|
|
||||||
internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fillDefaultValues() {
|
internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fillDefaultValues() {
|
||||||
|
allWarningsAsErrors = false
|
||||||
suppressWarnings = false
|
suppressWarnings = false
|
||||||
verbose = false
|
verbose = false
|
||||||
warningsAsErrors = false
|
|
||||||
apiVersion = null
|
apiVersion = null
|
||||||
languageVersion = null
|
languageVersion = null
|
||||||
includeRuntime = false
|
includeRuntime = false
|
||||||
|
|||||||
+7
-7
@@ -4,6 +4,11 @@ package org.jetbrains.kotlin.gradle.dsl
|
|||||||
|
|
||||||
internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonOptions {
|
internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonOptions {
|
||||||
|
|
||||||
|
private var allWarningsAsErrorsField: kotlin.Boolean? = null
|
||||||
|
override var allWarningsAsErrors: kotlin.Boolean
|
||||||
|
get() = allWarningsAsErrorsField ?: false
|
||||||
|
set(value) { allWarningsAsErrorsField = value }
|
||||||
|
|
||||||
private var suppressWarningsField: kotlin.Boolean? = null
|
private var suppressWarningsField: kotlin.Boolean? = null
|
||||||
override var suppressWarnings: kotlin.Boolean
|
override var suppressWarnings: kotlin.Boolean
|
||||||
get() = suppressWarningsField ?: false
|
get() = suppressWarningsField ?: false
|
||||||
@@ -14,11 +19,6 @@ internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kot
|
|||||||
get() = verboseField ?: false
|
get() = verboseField ?: false
|
||||||
set(value) { verboseField = value }
|
set(value) { verboseField = value }
|
||||||
|
|
||||||
private var warningsAsErrorsField: kotlin.Boolean? = null
|
|
||||||
override var warningsAsErrors: kotlin.Boolean
|
|
||||||
get() = warningsAsErrorsField ?: false
|
|
||||||
set(value) { warningsAsErrorsField = value }
|
|
||||||
|
|
||||||
private var apiVersionField: kotlin.String?? = null
|
private var apiVersionField: kotlin.String?? = null
|
||||||
override var apiVersion: kotlin.String?
|
override var apiVersion: kotlin.String?
|
||||||
get() = apiVersionField ?: null
|
get() = apiVersionField ?: null
|
||||||
@@ -30,18 +30,18 @@ internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kot
|
|||||||
set(value) { languageVersionField = value }
|
set(value) { languageVersionField = value }
|
||||||
|
|
||||||
internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments) {
|
internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments) {
|
||||||
|
allWarningsAsErrorsField?.let { args.allWarningsAsErrors = it }
|
||||||
suppressWarningsField?.let { args.suppressWarnings = it }
|
suppressWarningsField?.let { args.suppressWarnings = it }
|
||||||
verboseField?.let { args.verbose = it }
|
verboseField?.let { args.verbose = it }
|
||||||
warningsAsErrorsField?.let { args.warningsAsErrors = it }
|
|
||||||
apiVersionField?.let { args.apiVersion = it }
|
apiVersionField?.let { args.apiVersion = it }
|
||||||
languageVersionField?.let { args.languageVersion = it }
|
languageVersionField?.let { args.languageVersion = it }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments.fillDefaultValues() {
|
internal fun org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments.fillDefaultValues() {
|
||||||
|
allWarningsAsErrors = false
|
||||||
suppressWarnings = false
|
suppressWarnings = false
|
||||||
verbose = false
|
verbose = false
|
||||||
warningsAsErrors = false
|
|
||||||
apiVersion = null
|
apiVersion = null
|
||||||
languageVersion = null
|
languageVersion = null
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user