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

Add 1.1 language version to kotlin options for Gradle

Browse Source
This commit is contained in:
Alexey Tsvetkov
2016-10-05 22:02:29 +03:00
parent 8fa7e1f93e
commit 0944e9076d
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java
+2 -1
View File
@@ -25,7 +25,8 @@ import java.util.List;
public abstract class CommonCompilerArguments {
public static final String PLUGIN_OPTION_FORMAT = "plugin:<pluginId>:<optionName>=<value>";
@GradleOption(defaultValue = "\"1.0\"", possibleValues = { "\"1.0\"" })
// todo: reuse LanguageVersion from frontend
@GradleOption(defaultValue = "\"1.1\"", possibleValues = { "\"1.0\", \"1.1\"" })
@Argument(value = "language-version", description = "Provide source compatibility with specified language version")
@ValueDescription("<version>")
public String languageVersion;
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt
+2 -2
View File
@@ -12,8 +12,8 @@ interface KotlinJsOptions {
/**
* Provide source compatibility with specified language version
* Possible values: "1.0"
* Default value: "1.0"
* Possible values: "1.0", "1.1"
* Default value: "1.1"
*/
var languageVersion: kotlin.String
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
+2 -2
View File
@@ -11,7 +11,7 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
private var languageVersionField: kotlin.String? = null
override var languageVersion: kotlin.String
get() = languageVersionField ?: "1.0"
get() = languageVersionField ?: "1.1"
set(value) { languageVersionField = value }
private var mainField: kotlin.String? = null
@@ -76,7 +76,7 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fillDefaultValues() {
kjsm = true
languageVersion = "1.0"
languageVersion = "1.1"
main = "noCall"
metaInfo = true
moduleKind = "plain"
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
+2 -2
View File
@@ -25,8 +25,8 @@ interface KotlinJvmOptions {
/**
* Provide source compatibility with specified language version
* Possible values: "1.0"
* Default value: "1.0"
* Possible values: "1.0", "1.1"
* Default value: "1.1"
*/
var languageVersion: kotlin.String
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt
+2 -2
View File
@@ -21,7 +21,7 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
private var languageVersionField: kotlin.String? = null
override var languageVersion: kotlin.String
get() = languageVersionField ?: "1.0"
get() = languageVersionField ?: "1.1"
set(value) { languageVersionField = value }
private var noJdkField: kotlin.Boolean? = null
@@ -66,7 +66,7 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fi
includeRuntime = false
jdkHome = null
jvmTarget = "1.6"
languageVersion = "1.0"
languageVersion = "1.1"
noJdk = false
noReflect = true
noStdlib = true