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

Rename DeprecatedOption into GradleDeprecatedOption

Browse Source 
This should make it more explicit

^KT-49011 In Progress
This commit is contained in:
Yahor Berdnikau
2022-01-28 14:37:16 +01:00
parent 118bda675f
commit c019dbce47
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DeprecatedOption.kt → compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/GradleDeprecatedOption.kt
+1 -1
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.cli.common.arguments package org.jetbrains.kotlin.cli.common.arguments
@Retention(AnnotationRetention.RUNTIME) @Retention(AnnotationRetention.RUNTIME)
annotation class DeprecatedOption( annotation class GradleDeprecatedOption(
val message: String = "This option has no effect and will be removed in a future release.", val message: String = "This option has no effect and will be removed in a future release.",
val removeAfter: String, val removeAfter: String,
val level: DeprecationLevel val level: DeprecationLevel
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+5 -5
View File
@@ -27,12 +27,12 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
) )
var classpath: String? by NullableStringFreezableVar(null) var classpath: String? by NullableStringFreezableVar(null)
@DeprecatedOption(removeAfter = "1.5", level = DeprecationLevel.ERROR) @GradleDeprecatedOption(removeAfter = "1.5", level = DeprecationLevel.ERROR)
@GradleOption(DefaultValues.BooleanFalseDefault::class) @GradleOption(DefaultValues.BooleanFalseDefault::class)
@Argument(value = "-include-runtime", description = "Include Kotlin runtime into the resulting JAR") @Argument(value = "-include-runtime", description = "Include Kotlin runtime into the resulting JAR")
var includeRuntime: Boolean by FreezableVar(false) var includeRuntime: Boolean by FreezableVar(false)
@DeprecatedOption( @GradleDeprecatedOption(
message = "This option is not working well with Gradle caching and will be removed in the future.", message = "This option is not working well with Gradle caching and will be removed in the future.",
removeAfter = "1.7", removeAfter = "1.7",
level = DeprecationLevel.WARNING level = DeprecationLevel.WARNING
@@ -49,7 +49,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
@Argument(value = "-no-jdk", description = "Don't automatically include the Java runtime into the classpath") @Argument(value = "-no-jdk", description = "Don't automatically include the Java runtime into the classpath")
var noJdk: Boolean by FreezableVar(false) var noJdk: Boolean by FreezableVar(false)
@DeprecatedOption(removeAfter = "1.6", level = DeprecationLevel.ERROR) @GradleDeprecatedOption(removeAfter = "1.6", level = DeprecationLevel.ERROR)
@GradleOption(DefaultValues.BooleanTrueDefault::class) @GradleOption(DefaultValues.BooleanTrueDefault::class)
@Argument( @Argument(
value = "-no-stdlib", value = "-no-stdlib",
@@ -57,7 +57,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
) )
var noStdlib: Boolean by FreezableVar(false) var noStdlib: Boolean by FreezableVar(false)
@DeprecatedOption(removeAfter = "1.5", level = DeprecationLevel.ERROR) @GradleDeprecatedOption(removeAfter = "1.5", level = DeprecationLevel.ERROR)
@GradleOption(DefaultValues.BooleanTrueDefault::class) @GradleOption(DefaultValues.BooleanTrueDefault::class)
@Argument(value = "-no-reflect", description = "Don't automatically include Kotlin reflection into the classpath") @Argument(value = "-no-reflect", description = "Don't automatically include Kotlin reflection into the classpath")
var noReflect: Boolean by FreezableVar(false) var noReflect: Boolean by FreezableVar(false)
@@ -97,7 +97,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
// Advanced options // Advanced options
@DeprecatedOption(removeAfter = "1.6", level = DeprecationLevel.HIDDEN) @GradleDeprecatedOption(removeAfter = "1.6", level = DeprecationLevel.HIDDEN)
@GradleOption(DefaultValues.BooleanFalseDefault::class) @GradleOption(DefaultValues.BooleanFalseDefault::class)
@Argument( @Argument(
value = "-Xuse-ir", value = "-Xuse-ir",
generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+4 -4
View File
@@ -183,7 +183,7 @@ fun main() {
} }
private inline fun <reified T : Any> List<KProperty1<T, *>>.filterToBeDeleted() = filter { prop -> private inline fun <reified T : Any> List<KProperty1<T, *>>.filterToBeDeleted() = filter { prop ->
prop.findAnnotation<DeprecatedOption>() prop.findAnnotation<GradleDeprecatedOption>()
?.let { LanguageVersion.fromVersionString(it.removeAfter) } ?.let { LanguageVersion.fromVersionString(it.removeAfter) }
?.let { it >= LanguageVersion.LATEST_STABLE } ?.let { it >= LanguageVersion.LATEST_STABLE }
?: true ?: true
@@ -289,7 +289,7 @@ private fun Printer.generatePropertyDeclaration(property: KProperty1<*, *>, modi
} }
private fun Printer.generateOptionDeprecation(property: KProperty1<*, *>) { private fun Printer.generateOptionDeprecation(property: KProperty1<*, *>) {
property.findAnnotation<DeprecatedOption>() property.findAnnotation<GradleDeprecatedOption>()
?.let { DeprecatedOptionAnnotator.generateOptionAnnotation(it) } ?.let { DeprecatedOptionAnnotator.generateOptionAnnotation(it) }
?.also { println(it) } ?.also { println(it) }
} }
@@ -320,7 +320,7 @@ private fun generateMarkdown(properties: List<KProperty1<*, *>>) {
for (property in properties) { for (property in properties) {
val name = property.name val name = property.name
if (name == "includeRuntime") continue // This option has no effect in Gradle builds if (name == "includeRuntime") continue // This option has no effect in Gradle builds
val renderName = listOfNotNull("`$name`", property.findAnnotation<DeprecatedOption>()?.let { "__(Deprecated)__" }) val renderName = listOfNotNull("`$name`", property.findAnnotation<GradleDeprecatedOption>()?.let { "__(Deprecated)__" })
.joinToString(" ") .joinToString(" ")
val description = property.findAnnotation<Argument>()!!.description val description = property.findAnnotation<Argument>()!!.description
val possibleValues = property.gradleValues.possibleValues val possibleValues = property.gradleValues.possibleValues
@@ -363,7 +363,7 @@ private inline fun <reified T> KAnnotatedElement.findAnnotation(): T? =
annotations.filterIsInstance<T>().firstOrNull() annotations.filterIsInstance<T>().firstOrNull()
object DeprecatedOptionAnnotator { object DeprecatedOptionAnnotator {
fun generateOptionAnnotation(annotation: DeprecatedOption): String { fun generateOptionAnnotation(annotation: GradleDeprecatedOption): String {
val message = annotation.message.takeIf { it.isNotEmpty() }?.let { "message = \"$it\"" } val message = annotation.message.takeIf { it.isNotEmpty() }?.let { "message = \"$it\"" }
val level = "level = DeprecationLevel.${annotation.level.name}" val level = "level = DeprecationLevel.${annotation.level.name}"
val arguments = listOfNotNull(message, level).joinToString() val arguments = listOfNotNull(message, level).joinToString()