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

Introduce language version 1.3

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-09-06 17:18:02 +03:00
parent 27b8b209e3
commit 03440210ee
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/apiVersionInvalid.out
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
error: unknown API version: 239.42 error: unknown API version: 239.42
Supported API versions: 1.0, 1.1, 1.2 (EXPERIMENTAL) Supported API versions: 1.0, 1.1, 1.2 (EXPERIMENTAL), 1.3 (EXPERIMENTAL)
COMPILATION_ERROR COMPILATION_ERROR
compiler/testData/cli/jvm/languageVersionInvalid.out
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
error: unknown language version: 239.42 error: unknown language version: 239.42
Supported language versions: 1.0, 1.1, 1.2 (EXPERIMENTAL) Supported language versions: 1.0, 1.1, 1.2 (EXPERIMENTAL), 1.3 (EXPERIMENTAL)
COMPILATION_ERROR COMPILATION_ERROR
compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
+3
View File
@@ -50,6 +50,9 @@ class ApiVersion private constructor(
@JvmField @JvmField
val KOTLIN_1_2 = createByLanguageVersion(LanguageVersion.KOTLIN_1_2) val KOTLIN_1_2 = createByLanguageVersion(LanguageVersion.KOTLIN_1_2)
@JvmField
val KOTLIN_1_3 = createByLanguageVersion(LanguageVersion.KOTLIN_1_3)
@JvmField @JvmField
val LATEST_STABLE: ApiVersion = createByLanguageVersion(LanguageVersion.LATEST_STABLE) val LATEST_STABLE: ApiVersion = createByLanguageVersion(LanguageVersion.LATEST_STABLE)
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+3 -3
View File
@@ -16,8 +16,7 @@
package org.jetbrains.kotlin.config package org.jetbrains.kotlin.config
import org.jetbrains.kotlin.config.LanguageVersion.KOTLIN_1_1 import org.jetbrains.kotlin.config.LanguageVersion.*
import org.jetbrains.kotlin.config.LanguageVersion.KOTLIN_1_2
import org.jetbrains.kotlin.utils.DescriptionAware import org.jetbrains.kotlin.utils.DescriptionAware
import java.util.* import java.util.*
@@ -91,7 +90,8 @@ enum class LanguageFeature(
enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware { enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware {
KOTLIN_1_0(1, 0), KOTLIN_1_0(1, 0),
KOTLIN_1_1(1, 1), KOTLIN_1_1(1, 1),
KOTLIN_1_2(1, 2); KOTLIN_1_2(1, 2),
KOTLIN_1_3(1, 3);
val isStable: Boolean val isStable: Boolean
get() = this <= LATEST_STABLE get() = this <= LATEST_STABLE
idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt
+1
View File
@@ -68,6 +68,7 @@ fun getDefaultLanguageLevel(
.minWith(VersionComparatorUtil.COMPARATOR) .minWith(VersionComparatorUtil.COMPARATOR)
?: return LanguageVersion.LATEST_STABLE ?: return LanguageVersion.LATEST_STABLE
return when { return when {
libVersion.startsWith("1.3") -> LanguageVersion.KOTLIN_1_3
libVersion.startsWith("1.2") -> LanguageVersion.KOTLIN_1_2 libVersion.startsWith("1.2") -> LanguageVersion.KOTLIN_1_2
libVersion.startsWith("1.1") -> LanguageVersion.KOTLIN_1_1 libVersion.startsWith("1.1") -> LanguageVersion.KOTLIN_1_1
libVersion.startsWith("1.0") -> LanguageVersion.KOTLIN_1_0 libVersion.startsWith("1.0") -> LanguageVersion.KOTLIN_1_0
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 * Allow to use declarations only from the specified version of bundled libraries
* Possible values: "1.0", "1.1", "1.2 (EXPERIMENTAL)" * Possible values: "1.0", "1.1", "1.2 (EXPERIMENTAL)", "1.3 (EXPERIMENTAL)"
* Default value: null * Default value: null
*/ */
var apiVersion: kotlin.String? var apiVersion: kotlin.String?
/** /**
* Provide source compatibility with specified language version * Provide source compatibility with specified language version
* Possible values: "1.0", "1.1", "1.2 (EXPERIMENTAL)" * Possible values: "1.0", "1.1", "1.2 (EXPERIMENTAL)", "1.3 (EXPERIMENTAL)"
* Default value: null * Default value: null
*/ */
var languageVersion: kotlin.String? var languageVersion: kotlin.String?