From 136ccbd328cf2c480ec417a3586bbb8d4ec91876 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 20 Sep 2022 15:52:27 +0200 Subject: [PATCH] Remove JvmTarget.JVM_1_6 from Gradle DSL This target is not available inside compiler and left for IDE compatibility. ^KT-54103 Fixed --- .../kotlin/generators/arguments/jvmTargetGenerator.kt | 10 ++-------- .../org/jetbrains/kotlin/gradle/dsl/JvmTarget.kt | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/jvmTargetGenerator.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/jvmTargetGenerator.kt index a485fa6306f..aca3c0f2b80 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/arguments/jvmTargetGenerator.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/jvmTargetGenerator.kt @@ -17,18 +17,12 @@ internal fun generateJvmTarget( val jvmTargetFqName = FqName("org.jetbrains.kotlin.gradle.dsl.JvmTarget") filePrinter(fileFromFqName(apiDir, jvmTargetFqName)) { generateDeclaration("enum class", jvmTargetFqName, afterType = "(val target: String)") { - val jvmTargetValues = JvmTarget.values() - val deprecatedJvmTargetValues = JvmTarget.values().subtract(JvmTarget.supportedValues().toSet()) + val jvmTargetValues = JvmTarget.supportedValues() val lastIndex = jvmTargetValues.size - 1 jvmTargetValues.forEachIndexed { index, jvmTarget -> val lastChar = if (index == lastIndex) ";" else "," - val prefix = if (jvmTarget in deprecatedJvmTargetValues) { - "@Deprecated(\"Will be removed soon\") " - } else { - "" - } - println("$prefix${jvmTarget.name}(\"${jvmTarget.description}\")$lastChar") + println("${jvmTarget.name}(\"${jvmTarget.description}\")$lastChar") } println() diff --git a/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JvmTarget.kt b/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JvmTarget.kt index 51f75e33f15..aa039a879c5 100644 --- a/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JvmTarget.kt +++ b/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JvmTarget.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.gradle.dsl enum class JvmTarget(val target: String) { - @Deprecated("Will be removed soon") JVM_1_6("1.6"), JVM_1_8("1.8"), JVM_9("9"), JVM_10("10"),