From 1bbd135de848d8ae16bff473e7c771c4684b8d57 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Tue, 4 Apr 2023 21:17:06 +0200 Subject: [PATCH] [Gradle] Remove DefaultValues.prettyDefaultValue in favor of stripping OPTIONS_PACKAGE_PREFIX KTIJ-24976 --- .../jetbrains/kotlin/generators/arguments/DefaultValues.kt | 2 -- .../kotlin/generators/arguments/GenerateGradleOptions.kt | 4 ++-- .../jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptions.kt | 4 ++-- .../kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt | 4 ++-- .../jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions.kt | 2 +- .../org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/DefaultValues.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/DefaultValues.kt index 9148f8da919..961ff1aec92 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/arguments/DefaultValues.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/DefaultValues.kt @@ -24,7 +24,6 @@ open class DefaultValues( val defaultValue: String, val type: KType, val kotlinOptionsType: KType, - val prettyDefaultValue: String? = null, val possibleValues: List? = null, val fromKotlinOptionConverterProp: String? = null, val toKotlinOptionConverterProp: String? = null, @@ -89,7 +88,6 @@ open class DefaultValues( toKotlinOptionConverterProp = """ this.target """.trimIndent(), - prettyDefaultValue = "\"${JvmTarget.DEFAULT}\"" ) object JsEcmaVersions : DefaultValues( diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt index 9a03695b753..047d52098eb 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt @@ -878,14 +878,14 @@ private fun Printer.generateOptionDeprecation(property: KProperty1<*, *>) { private fun Printer.generateDoc(property: KProperty1<*, *>) { val description = property.findAnnotation()!!.description val possibleValues = property.gradleValues.possibleValues - val defaultValue = property.gradleValues.prettyDefaultValue ?: property.gradleValues.defaultValue + val defaultValue = property.gradleValues.defaultValue println("/**") println(" * ${description.replace("\n", " ")}") if (possibleValues != null) { println(" * Possible values: ${possibleValues.joinToString()}") } - println(" * Default value: $defaultValue") + println(" * Default value: ${defaultValue.removePrefix("$OPTIONS_PACKAGE_PREFIX.")}") println(" */") } diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptions.kt index 21d7601a9c0..57cead68cd6 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptions.kt @@ -17,7 +17,7 @@ interface KotlinJsCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommon /** * Define whether the `main` function should be called upon execution * Possible values: "call", "noCall" - * Default value: org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode.CALL + * Default value: JsMainFunctionExecutionMode.CALL */ @get:org.gradle.api.tasks.Input val main: org.gradle.api.provider.Property @@ -32,7 +32,7 @@ interface KotlinJsCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommon /** * Kind of the JS module generated by the compiler * Possible values: "plain", "amd", "commonjs", "umd" - * Default value: org.jetbrains.kotlin.gradle.dsl.JsModuleKind.MODULE_PLAIN + * Default value: JsModuleKind.MODULE_PLAIN */ @get:org.gradle.api.tasks.Input val moduleKind: org.gradle.api.provider.Property diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt index 150fae32ea6..c32aab5c0ac 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt @@ -23,7 +23,7 @@ interface KotlinJsOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions /** * Define whether the `main` function should be called upon execution * Possible values: "call", "noCall" - * Default value: org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode.CALL + * Default value: JsMainFunctionExecutionMode.CALL */ var main: kotlin.String get() = options.main.get().mainKotlinOption @@ -44,7 +44,7 @@ interface KotlinJsOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions /** * Kind of the JS module generated by the compiler * Possible values: "plain", "amd", "commonjs", "umd" - * Default value: org.jetbrains.kotlin.gradle.dsl.JsModuleKind.MODULE_PLAIN + * Default value: JsModuleKind.MODULE_PLAIN */ var moduleKind: kotlin.String get() = options.moduleKind.get().moduleKindKotlinOption diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions.kt index edbc90dbb47..8024bb037a8 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions.kt @@ -17,7 +17,7 @@ interface KotlinJvmCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommo /** * Target version of the generated JVM bytecode (1.8, 9, 10, ..., 20), default is 1.8 * Possible values: "1.8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20" - * Default value: "1.8" + * Default value: JvmTarget.DEFAULT */ @get:org.gradle.api.tasks.Input val jvmTarget: org.gradle.api.provider.Property diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt index aacfac04b89..6cc5e285d41 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt @@ -23,7 +23,7 @@ interface KotlinJvmOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions /** * Target version of the generated JVM bytecode (1.8, 9, 10, ..., 20), default is 1.8 * Possible values: "1.8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20" - * Default value: "1.8" + * Default value: JvmTarget.DEFAULT */ var jvmTarget: kotlin.String get() = options.jvmTarget.get().jvmTargetKotlinOption