diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 6a155942b9b..d3dab71a72f 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -72,3 +72,5 @@ val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTe val generateProtoBuf by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufKt") val generateProtoBufCompare by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare") + +val generateGradleOptions by generator("org.jetbrains.kotlin.generators.arguments.GenerateGradleOptionsKt") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt index b3b3b1f585b..bb3350f0507 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt @@ -6,21 +6,15 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo /** * Allow to use declarations only from the specified version of bundled libraries - * Possible values: "1.0", "1.1", "1.2, 1.3 (EXPERIMENTAL)" + * Possible values: "1.0", "1.1", "1.2", "1.3 (EXPERIMENTAL)" * Default value: null */ var apiVersion: kotlin.String? /** * Provide source compatibility with specified language version - * Possible values: "1.0", "1.1", "1.2, 1.3 (EXPERIMENTAL)" + * Possible values: "1.0", "1.1", "1.2", "1.3 (EXPERIMENTAL)" * Default value: null */ var languageVersion: kotlin.String? - - /** - * Report an error if there are any warnings - * Default value: false - */ - var warningsAsErrors: kotlin.Boolean } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt index e52a0cfc2ba..822d97df139 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt @@ -16,6 +16,12 @@ interface KotlinCommonToolOptions { */ 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 * Default value: emptyList() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsBase.kt index add9e81cb26..114f6c27278 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsBase.kt @@ -14,13 +14,20 @@ internal abstract class KotlinJsDceOptionsBase : org.jetbrains.kotlin.gradle.dsl get() = verboseField ?: false 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) { suppressWarningsField?.let { args.suppressWarnings = it } verboseField?.let { args.verbose = it } + warningsAsErrorsField?.let { args.warningsAsErrors = it } } } internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments.fillDefaultValues() { suppressWarnings = false verbose = false + warningsAsErrors = false } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt index e197f1cb471..079b8b1dbce 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt @@ -14,6 +14,11 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko get() = verboseField ?: false 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 override var apiVersion: kotlin.String? get() = apiVersionField ?: null @@ -24,11 +29,6 @@ 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 @@ -87,9 +87,9 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments) { suppressWarningsField?.let { args.suppressWarnings = it } verboseField?.let { args.verbose = it } + warningsAsErrorsField?.let { args.warningsAsErrors = 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 } @@ -107,9 +107,9 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fillDefaultValues() { suppressWarnings = false verbose = false + warningsAsErrors = false apiVersion = null languageVersion = null - warningsAsErrors = false friendModulesDisabled = false main = "call" metaInfo = true diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt index 5915ff71f3f..ba4372302c0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt @@ -14,6 +14,11 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K get() = verboseField ?: false 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 override var apiVersion: kotlin.String? get() = apiVersionField ?: null @@ -24,11 +29,6 @@ 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 @@ -67,9 +67,9 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments) { suppressWarningsField?.let { args.suppressWarnings = it } verboseField?.let { args.verbose = it } + warningsAsErrorsField?.let { args.warningsAsErrors = 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 } @@ -83,9 +83,9 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fillDefaultValues() { suppressWarnings = false verbose = false + warningsAsErrors = false apiVersion = null languageVersion = null - warningsAsErrors = false includeRuntime = false javaParameters = false jdkHome = null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt index 68702d504c6..7fdab16d5db 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt @@ -1,19 +1,3 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - // DO NOT EDIT MANUALLY! // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptionsBase.kt index 5f05d8fbad8..95d92857d43 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptionsBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptionsBase.kt @@ -1,19 +1,3 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - // DO NOT EDIT MANUALLY! // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl @@ -30,6 +14,11 @@ internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kot get() = verboseField ?: false 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 override var apiVersion: kotlin.String? get() = apiVersionField ?: null @@ -43,6 +32,7 @@ internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kot internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments) { suppressWarningsField?.let { args.suppressWarnings = it } verboseField?.let { args.verbose = it } + warningsAsErrorsField?.let { args.warningsAsErrors = it } apiVersionField?.let { args.apiVersion = it } languageVersionField?.let { args.languageVersion = it } } @@ -51,6 +41,7 @@ internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kot internal fun org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments.fillDefaultValues() { suppressWarnings = false verbose = false + warningsAsErrors = false apiVersion = null languageVersion = null }