Add tests for configuring kotlin with gradle 4.9

idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
 dependencies {
     testCompile("junit:junit:4.12")
     compile(kotlinModule("stdlib-jre8"))

idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.3.5.after

@@ -1,3 +1,7 @@
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
 dependencies {
     testCompile("junit:junit:4.12")
     compile(kotlinModule("stdlib-jre8"))

idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.4.9.after

@@ -0,0 +1,9 @@
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
+dependencies {
+    testCompile("junit:junit:4.12")
+    compile(kotlinModule("stdlib-jre8"))
+    compile(kotlin("reflect"))
+}

idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts

@@ -1,4 +1,9 @@
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
 val kotlin_version: String by extra
+
 dependencies {
     testCompile("junit:junit:4.12")
     compile(kotlinModule("stdlib-jre8", kotlin_version))

idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts.after

@@ -1,4 +1,9 @@
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
 val kotlin_version: String by extra
+
 dependencies {
     testCompile("junit:junit:4.12")
     compile(kotlinModule("stdlib-jre8", kotlin_version))

idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
 dependencies {
     testCompile("junit:junit:4.12")
     compile(kotlinModule("stdlib-jre8"))

idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts.after

@@ -1,3 +1,7 @@
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
 dependencies {
     testCompile("junit:junit:4.12")
     compile(kotlinModule("stdlib-jre8"))

idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
 dependencies {
     compile(kotlinModule("stdlib-jre8"))
 }

idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.3.5.after

@@ -1,3 +1,7 @@
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
 dependencies {
     compile(kotlinModule("stdlib-jre8"))
     testCompile("junit:junit:4.12")

idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.4.9.after

@@ -0,0 +1,9 @@
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
+dependencies {
+    compile(kotlinModule("stdlib-jre8"))
+    testCompile("junit:junit:4.12")
+    testCompile(kotlin("test"))
+}

idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts

@@ -1,5 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.Coroutines
 
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
 kotlin {
     experimental.coroutines = Coroutines.DISABLE
 }

idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts.after

@@ -1,5 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.Coroutines
 
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
 kotlin {
     experimental.coroutines = Coroutines.ENABLE
 }

idea/testData/gradle/configurator/changeCoroutinesSupportGSK49/build.gradle.kts

@@ -0,0 +1,9 @@
+import org.jetbrains.kotlin.gradle.dsl.Coroutines
+
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
+kotlin {
+    experimental.coroutines = Coroutines.WARN
+}

idea/testData/gradle/configurator/changeCoroutinesSupportGSK49/build.gradle.kts.after

@@ -0,0 +1,9 @@
+import org.jetbrains.kotlin.gradle.dsl.Coroutines
+
+plugins {
+    kotlin("jvm") version "1.2.50"
+}
+
+kotlin {
+    experimental.coroutines = Coroutines.ENABLE
+}

idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts

@@ -1,4 +1,11 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+   kotlin("jvm") version "1.2.50"
+}
+
 val compileKotlin: KotlinCompile by tasks
+
 compileKotlin.kotlinOptions {
    languageVersion = "1.0"
 }

idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts.after

@@ -1,4 +1,11 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+   kotlin("jvm") version "1.2.50"
+}
+
 val compileKotlin: KotlinCompile by tasks
+
 compileKotlin.kotlinOptions {
     languageVersion = "1.1"
 }

idea/testData/gradle/configurator/configure10/build.gradle.4.9.after

@@ -0,0 +1,15 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.0.6'
+}
+repositories {
+    mavenCentral()
+}
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
+}

idea/testData/gradle/configurator/configureGSK/build.gradle.kts.4.9.after

@@ -0,0 +1,25 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("jvm") version "1.1.2"
+}
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+dependencies {
+    compile(kotlin("stdlib-jre8"))
+}
+repositories {
+    mavenCentral()
+}
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
+val compileTestKotlin: KotlinCompile by tasks
+compileTestKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}

idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after

@@ -0,0 +1,24 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("jvm") version "1.2.60-dev-286"
+}
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+dependencies {
+    compile(kotlin("stdlib-jdk8"))
+}
+repositories {
+    maven {
+        setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/")
+    }
+    mavenCentral()
+}
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
+val compileTestKotlin: KotlinCompile by tasks
+compileTestKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}

idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/app/build.gradle

@@ -0,0 +1,6 @@
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+}

idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after

@@ -0,0 +1,15 @@
+plugins {
+    id 'kotlin2js' version '1.2.40-eap-62'
+}
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+    maven {
+        url 'http://dl.bintray.com/kotlin/kotlin-eap'
+    }
+}
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js"
+}

idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/settings.gradle

@@ -0,0 +1 @@
+include ':app'

idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/app/build.gradle.kts

@@ -0,0 +1,6 @@
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
+}

idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after

@@ -0,0 +1,15 @@
+plugins {
+    id("kotlin2js") version "1.2.40-eap-62"
+}
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
+    maven {
+        setUrl("http://dl.bintray.com/kotlin/kotlin-eap")
+    }
+}
+dependencies {
+    compile(kotlin("stdlib-js"))
+}

idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/settings.gradle

@@ -0,0 +1 @@
+include ':app'

idea/testData/gradle/configurator/configureJsWithBuildGradle/app/build.gradle

@@ -0,0 +1,6 @@
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+}

idea/testData/gradle/configurator/configureJsWithBuildGradle/build.gradle.after

@@ -0,0 +1,12 @@
+plugins {
+    id 'kotlin2js' version '1.2.40'
+}
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+}
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js"
+}

idea/testData/gradle/configurator/configureJsWithBuildGradle/settings.gradle

@@ -0,0 +1 @@
+include ':app'

idea/testData/gradle/configurator/configureJsWithBuildGradleKts/app/build.gradle.kts

@@ -0,0 +1,6 @@
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
+}

idea/testData/gradle/configurator/configureJsWithBuildGradleKts/build.gradle.kts.after

@@ -0,0 +1,12 @@
+plugins {
+    id("kotlin2js") version "1.2.40"
+}
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
+}
+dependencies {
+    compile(kotlin("stdlib-js"))
+}

idea/testData/gradle/configurator/configureJsWithBuildGradleKts/settings.gradle

@@ -0,0 +1 @@
+include ':app'

idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/app/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+}
+
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+}

idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after

@@ -0,0 +1,31 @@
+plugins {
+    id 'java'
+    id 'org.jetbrains.kotlin.jvm' version '1.2.40-eap-62'
+}
+
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+    maven {
+        url 'http://dl.bintray.com/kotlin/kotlin-eap'
+    }
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}

idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/settings.gradle

@@ -0,0 +1 @@
+include ':app'

idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/app/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+    java
+}
+
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile("junit", "junit", "4.12")
+}
+
+configure<JavaPluginConvention> {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+}

idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after

@@ -0,0 +1,33 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    java
+    kotlin("jvm") version "1.2.40-eap-62"
+}
+
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
+    maven {
+        setUrl("http://dl.bintray.com/kotlin/kotlin-eap")
+    }
+}
+
+dependencies {
+    testCompile("junit", "junit", "4.12")
+    compile(kotlin("stdlib-jdk8"))
+}
+
+configure<JavaPluginConvention> {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+}
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
+val compileTestKotlin: KotlinCompile by tasks
+compileTestKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}

idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/settings.gradle

@@ -0,0 +1 @@
+include ':app'

idea/testData/gradle/configurator/configureJvmWithBuildGradle/app/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+}
+
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+}

idea/testData/gradle/configurator/configureJvmWithBuildGradle/build.gradle.after

@@ -0,0 +1,28 @@
+plugins {
+    id 'java'
+    id 'org.jetbrains.kotlin.jvm' version '1.2.40'
+}
+
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}

idea/testData/gradle/configurator/configureJvmWithBuildGradle/settings.gradle

@@ -0,0 +1 @@
+include ':app'

idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/app/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+    java
+}
+
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile("junit", "junit", "4.12")
+}
+
+configure<JavaPluginConvention> {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+}

idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/build.gradle.kts.after

@@ -0,0 +1,30 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    java
+    kotlin("jvm") version "1.2.40"
+}
+
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile("junit", "junit", "4.12")
+    compile(kotlin("stdlib-jdk8"))
+}
+
+configure<JavaPluginConvention> {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+}
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
+val compileTestKotlin: KotlinCompile by tasks
+compileTestKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}

idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/settings.gradle

@@ -0,0 +1 @@
+include ':app'

idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after

@@ -0,0 +1,24 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.2.60-dev-286'
+}
+group 'testgroup'
+version '1.0-SNAPSHOT'
+repositories {
+    maven {
+        url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/'
+    }
+    mavenCentral()
+}
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}

idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.4.9.after

@@ -0,0 +1,18 @@
+plugins {
+    id 'java'
+    id 'org.jetbrains.kotlin.jvm' version '1.0.6'
+}
+
+group 'testgroup'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
+}