From 0944e9076db544f180d1b9b84fd44062e546986b Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Wed, 5 Oct 2016 22:02:29 +0300
Subject: [PATCH] Add 1.1 language version to kotlin options for Gradle

---
 .../kotlin/cli/common/arguments/CommonCompilerArguments.java  | 3 ++-
 .../kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt | 4 ++--
 .../org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt    | 4 ++--
 .../org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt       | 4 ++--
 .../org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt   | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java
index a3bb30c0f48..6fe761d0981 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java
@@ -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;
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt
index 30e1c506ef9..acedfa6be48 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt
@@ -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
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
index 15ccbbb989a..2cb98f71fa7 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt
@@ -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"
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
index cd4186f9d5c..81bc55cea5b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
@@ -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
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt
index 9928fb76877..0f17864db23 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt
@@ -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