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

Remove "EXPERIMENTAL" from 1.2 version description in tests and gradle options

Browse Source
This commit is contained in:
Ilya Gorbunov
2017-05-12 19:38:32 +03:00
parent b901a8946c
commit 456c26cdae
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/apiVersionInvalid.out
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
error: unknown API version: 239.42
Supported API versions: 1.0, 1.1, 1.2 (EXPERIMENTAL), 1.3 (EXPERIMENTAL)
Supported API versions: 1.0, 1.1, 1.2, 1.3 (EXPERIMENTAL)
COMPILATION_ERROR
compiler/testData/cli/jvm/languageVersionInvalid.out
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
error: unknown language version: 239.42
Supported language versions: 1.0, 1.1, 1.2 (EXPERIMENTAL), 1.3 (EXPERIMENTAL)
Supported language versions: 1.0, 1.1, 1.2, 1.3 (EXPERIMENTAL)
COMPILATION_ERROR
libraries/tools/kotlin-gradle-plugin/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 to use declarations only from the specified version of bundled libraries
* Possible values: "1.0", "1.1", "1.2 (EXPERIMENTAL)", "1.3 (EXPERIMENTAL)"
* Possible values: "1.0", "1.1", "1.2, 1.3 (EXPERIMENTAL)"
* Default value: null
*/
var apiVersion: kotlin.String?
/**
* Provide source compatibility with specified language version
* Possible values: "1.0", "1.1", "1.2 (EXPERIMENTAL)", "1.3 (EXPERIMENTAL)"
* Possible values: "1.0", "1.1", "1.2, 1.3 (EXPERIMENTAL)"
* Default value: null
*/
var languageVersion: kotlin.String?