Remove JvmTarget.JVM_1_6 from Gradle DSL
This target is not available inside compiler and left for IDE compatibility. ^KT-54103 Fixed
This commit is contained in:
@@ -17,18 +17,12 @@ internal fun generateJvmTarget(
|
|||||||
val jvmTargetFqName = FqName("org.jetbrains.kotlin.gradle.dsl.JvmTarget")
|
val jvmTargetFqName = FqName("org.jetbrains.kotlin.gradle.dsl.JvmTarget")
|
||||||
filePrinter(fileFromFqName(apiDir, jvmTargetFqName)) {
|
filePrinter(fileFromFqName(apiDir, jvmTargetFqName)) {
|
||||||
generateDeclaration("enum class", jvmTargetFqName, afterType = "(val target: String)") {
|
generateDeclaration("enum class", jvmTargetFqName, afterType = "(val target: String)") {
|
||||||
val jvmTargetValues = JvmTarget.values()
|
val jvmTargetValues = JvmTarget.supportedValues()
|
||||||
val deprecatedJvmTargetValues = JvmTarget.values().subtract(JvmTarget.supportedValues().toSet())
|
|
||||||
|
|
||||||
val lastIndex = jvmTargetValues.size - 1
|
val lastIndex = jvmTargetValues.size - 1
|
||||||
jvmTargetValues.forEachIndexed { index, jvmTarget ->
|
jvmTargetValues.forEachIndexed { index, jvmTarget ->
|
||||||
val lastChar = if (index == lastIndex) ";" else ","
|
val lastChar = if (index == lastIndex) ";" else ","
|
||||||
val prefix = if (jvmTarget in deprecatedJvmTargetValues) {
|
println("${jvmTarget.name}(\"${jvmTarget.description}\")$lastChar")
|
||||||
"@Deprecated(\"Will be removed soon\") "
|
|
||||||
} else {
|
|
||||||
""
|
|
||||||
}
|
|
||||||
println("$prefix${jvmTarget.name}(\"${jvmTarget.description}\")$lastChar")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
println()
|
println()
|
||||||
|
|||||||
-1
@@ -6,7 +6,6 @@
|
|||||||
package org.jetbrains.kotlin.gradle.dsl
|
package org.jetbrains.kotlin.gradle.dsl
|
||||||
|
|
||||||
enum class JvmTarget(val target: String) {
|
enum class JvmTarget(val target: String) {
|
||||||
@Deprecated("Will be removed soon") JVM_1_6("1.6"),
|
|
||||||
JVM_1_8("1.8"),
|
JVM_1_8("1.8"),
|
||||||
JVM_9("9"),
|
JVM_9("9"),
|
||||||
JVM_10("10"),
|
JVM_10("10"),
|
||||||
|
|||||||
Reference in New Issue
Block a user