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

Exclude unsupported language versions from gradle options

Browse Source 
^KT-36146 Fixed
This commit is contained in:
Pavel Kirpichenkov
2020-02-05 11:29:53 +03:00
parent f530c0c903
commit a5d201e263
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt
+3 -1
View File
@@ -32,7 +32,9 @@ open class DefaultValues(val defaultValue: String, val possibleValues: List<Stri
object LanguageVersions : DefaultValues( object LanguageVersions : DefaultValues(
"null", "null",
LanguageVersion.values().map { "\"${it.description}\"" } LanguageVersion.values()
.filterNot { it.isUnsupported }
.map { "\"${it.description}\"" }
) )
object JvmTargetVersions : DefaultValues( object JvmTargetVersions : DefaultValues(
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
+2 -2
View File
@@ -6,14 +6,14 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo
/** /**
* Allow using declarations only from the specified version of bundled libraries * Allow using declarations only from the specified version of bundled libraries
* Possible values: "1.0", "1.1", "1.2", "1.3", "1.4" * Possible values: "1.2 (DEPRECATED)", "1.3", "1.4", "1.5 (EXPERIMENTAL)"
* Default value: null * Default value: null
*/ */
var apiVersion: kotlin.String? var apiVersion: kotlin.String?
/** /**
* Provide source compatibility with the specified version of Kotlin * Provide source compatibility with the specified version of Kotlin
* Possible values: "1.0", "1.1", "1.2", "1.3", "1.4" * Possible values: "1.2 (DEPRECATED)", "1.3", "1.4", "1.5 (EXPERIMENTAL)"
* Default value: null * Default value: null
*/ */
var languageVersion: kotlin.String? var languageVersion: kotlin.String?