From 81f4bd3846ffedbf53f89f74ba7ccf5987ccb957 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Fri, 10 Aug 2018 16:34:37 +0300 Subject: [PATCH] Add tests for configuring kotlin with gradle 4.9 --- .../gradle/AbstractModelBuilderTest.java | 2 +- .../gradle/GradleConfiguratorTest.kt | 41 ++++++++++++++----- .../addLibraryGSK/build.gradle.kts | 4 ++ ...e.kts.after => build.gradle.kts.3.5.after} | 4 ++ .../addLibraryGSK/build.gradle.kts.4.9.after | 9 ++++ .../build.gradle.kts | 5 +++ .../build.gradle.kts.after | 5 +++ .../addNonKotlinLibraryGSK/build.gradle.kts | 4 ++ .../build.gradle.kts.after | 4 ++ .../addTestLibraryGSK/build.gradle.kts | 4 ++ ...e.kts.after => build.gradle.kts.3.5.after} | 4 ++ .../build.gradle.kts.4.9.after | 9 ++++ .../build.gradle.kts | 4 ++ .../build.gradle.kts.after | 4 ++ .../build.gradle.kts | 9 ++++ .../build.gradle.kts.after | 9 ++++ .../changeLanguageVersionGSK/build.gradle.kts | 7 ++++ .../build.gradle.kts.after | 7 ++++ ...ld.gradle.after => build.gradle.3.5.after} | 0 .../configure10/build.gradle.4.9.after | 15 +++++++ ...e.kts.after => build.gradle.kts.3.5.after} | 0 .../configureGSK/build.gradle.kts.4.9.after | 25 +++++++++++ ...e.kts.after => build.gradle.kts.3.5.after} | 0 .../build.gradle.kts.4.9.after | 24 +++++++++++ .../app/build.gradle | 6 +++ .../build.gradle.after | 15 +++++++ .../settings.gradle | 1 + .../app/build.gradle.kts | 6 +++ .../build.gradle.kts.after | 15 +++++++ .../settings.gradle | 1 + .../app/build.gradle | 6 +++ .../build.gradle.after | 12 ++++++ .../settings.gradle | 1 + .../app/build.gradle.kts | 6 +++ .../build.gradle.kts.after | 12 ++++++ .../settings.gradle | 1 + .../app/build.gradle | 16 ++++++++ .../build.gradle.after | 31 ++++++++++++++ .../settings.gradle | 1 + .../app/build.gradle.kts | 18 ++++++++ .../build.gradle.kts.after | 33 +++++++++++++++ .../settings.gradle | 1 + .../app/build.gradle | 16 ++++++++ .../build.gradle.after | 28 +++++++++++++ .../settings.gradle | 1 + .../app/build.gradle.kts | 18 ++++++++ .../build.gradle.kts.after | 30 ++++++++++++++ .../settings.gradle | 1 + ...ld.gradle.after => build.gradle.3.5.after} | 0 .../build.gradle.4.9.after | 24 +++++++++++ ...ld.gradle.after => build.gradle.3.5.after} | 0 .../build.gradle.4.9.after | 18 ++++++++ 52 files changed, 506 insertions(+), 11 deletions(-) rename idea/testData/gradle/configurator/addLibraryGSK/{build.gradle.kts.after => build.gradle.kts.3.5.after} (74%) create mode 100644 idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.4.9.after rename idea/testData/gradle/configurator/addTestLibraryGSK/{build.gradle.kts.after => build.gradle.kts.3.5.after} (74%) create mode 100644 idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.4.9.after create mode 100644 idea/testData/gradle/configurator/changeCoroutinesSupportGSK49/build.gradle.kts create mode 100644 idea/testData/gradle/configurator/changeCoroutinesSupportGSK49/build.gradle.kts.after rename idea/testData/gradle/configurator/configure10/{build.gradle.after => build.gradle.3.5.after} (100%) create mode 100644 idea/testData/gradle/configurator/configure10/build.gradle.4.9.after rename idea/testData/gradle/configurator/configureGSK/{build.gradle.kts.after => build.gradle.kts.3.5.after} (100%) create mode 100644 idea/testData/gradle/configurator/configureGSK/build.gradle.kts.4.9.after rename idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/{build.gradle.kts.after => build.gradle.kts.3.5.after} (100%) create mode 100644 idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after create mode 100644 idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/app/build.gradle create mode 100644 idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after create mode 100644 idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/settings.gradle create mode 100644 idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/app/build.gradle.kts create mode 100644 idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after create mode 100644 idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/settings.gradle create mode 100644 idea/testData/gradle/configurator/configureJsWithBuildGradle/app/build.gradle create mode 100644 idea/testData/gradle/configurator/configureJsWithBuildGradle/build.gradle.after create mode 100644 idea/testData/gradle/configurator/configureJsWithBuildGradle/settings.gradle create mode 100644 idea/testData/gradle/configurator/configureJsWithBuildGradleKts/app/build.gradle.kts create mode 100644 idea/testData/gradle/configurator/configureJsWithBuildGradleKts/build.gradle.kts.after create mode 100644 idea/testData/gradle/configurator/configureJsWithBuildGradleKts/settings.gradle create mode 100644 idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/app/build.gradle create mode 100644 idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after create mode 100644 idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/settings.gradle create mode 100644 idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/app/build.gradle.kts create mode 100644 idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after create mode 100644 idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/settings.gradle create mode 100644 idea/testData/gradle/configurator/configureJvmWithBuildGradle/app/build.gradle create mode 100644 idea/testData/gradle/configurator/configureJvmWithBuildGradle/build.gradle.after create mode 100644 idea/testData/gradle/configurator/configureJvmWithBuildGradle/settings.gradle create mode 100644 idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/app/build.gradle.kts create mode 100644 idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/build.gradle.kts.after create mode 100644 idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/settings.gradle rename idea/testData/gradle/configurator/configureKotlinDevVersion/{build.gradle.after => build.gradle.3.5.after} (100%) create mode 100644 idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after rename idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/{build.gradle.after => build.gradle.3.5.after} (100%) create mode 100644 idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.4.9.after diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java index 9eae4b88d77..9604dbd2ec6 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java @@ -60,7 +60,7 @@ import static org.junit.Assume.assumeThat; @RunWith(value = Parameterized.class) public abstract class AbstractModelBuilderTest { - public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"3.5"}}; + public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"3.5"}, {"4.9"}}; private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]"); diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt index 8b002fdcbdc..7da5995237c 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt @@ -18,9 +18,9 @@ import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait import org.jetbrains.kotlin.test.testFramework.runWriteAction +import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions import org.jetbrains.plugins.gradle.util.GradleConstants import org.junit.Assert -import org.junit.Ignore import org.junit.Test import java.io.File @@ -122,7 +122,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } @Test - @Ignore // Enable in Gradle 4.4+ + @TargetVersions("4.4+") fun testConfigureJvmWithBuildGradle() { val files = importProjectFromTestData() @@ -139,7 +139,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } @Test - @Ignore // Enable in Gradle 4.4+ + @TargetVersions("4.4+") fun testConfigureJvmWithBuildGradleKts() { val files = importProjectFromTestData() @@ -156,7 +156,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } @Test - @Ignore // Enable in Gradle 4.4+ + @TargetVersions("4.4+") fun testConfigureJvmEAPWithBuildGradle() { val files = importProjectFromTestData() @@ -173,7 +173,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } @Test - @Ignore // Enable in Gradle 4.4+ + @TargetVersions("4.4+") fun testConfigureJvmEAPWithBuildGradleKts() { val files = importProjectFromTestData() @@ -190,7 +190,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } @Test - @Ignore // Enable in Gradle 4.4+ + @TargetVersions("4.4+") fun testConfigureJsWithBuildGradle() { val files = importProjectFromTestData() @@ -207,7 +207,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } @Test - @Ignore // Enable in Gradle 4.4+ + @TargetVersions("4.4+") fun testConfigureJsWithBuildGradleKts() { val files = importProjectFromTestData() @@ -224,7 +224,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } @Test - @Ignore // Enable in Gradle 4.4+ + @TargetVersions("4.4+") fun testConfigureJsEAPWithBuildGradle() { val files = importProjectFromTestData() @@ -241,7 +241,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } @Test - @Ignore // Enable in Gradle 4.4+ + @TargetVersions("4.4+") fun testConfigureJsEAPWithBuildGradleKts() { val files = importProjectFromTestData() @@ -349,6 +349,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } } + @TargetVersions("3.5") @Test fun testAddLibraryGSKWithKotlinVersion() { val files = importProjectFromTestData() @@ -450,6 +451,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } } + @TargetVersions("3.5") @Test fun testChangeCoroutinesSupportGSK() { val files = importProjectFromTestData() @@ -463,6 +465,20 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } } + @TargetVersions("4.4+") + @Test + fun testChangeCoroutinesSupportGSK49() { + val files = importProjectFromTestData() + + runInEdtAndWait { + myTestFixture.project.executeWriteCommand("") { + KotlinWithGradleConfigurator.changeCoroutineConfiguration(myTestFixture.module, "enable") + } + + checkFiles(files) + } + } + @Test fun testAddLanguageVersion() { val files = importProjectFromTestData() @@ -554,7 +570,12 @@ class GradleConfiguratorTest : GradleImportingTestCase() { .forEach { if (it.name == GradleConstants.SETTINGS_FILE_NAME && !File(testDataDirectory(), it.name + SUFFIX).exists()) return@forEach val actualText = LoadTextUtil.loadText(it).toString() - KotlinTestUtils.assertEqualsToFile(File(testDataDirectory(), it.name + SUFFIX), actualText) + val expectedFileName = if (File(testDataDirectory(), it.name + ".$gradleVersion" + SUFFIX).exists()) { + it.name + ".$gradleVersion" + SUFFIX + } else { + it.name + SUFFIX + } + KotlinTestUtils.assertEqualsToFile(File(testDataDirectory(), expectedFileName), actualText) } } } diff --git a/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts b/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts index 3eb5768fc71..03c943d126c 100644 --- a/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts +++ b/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")) diff --git a/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.3.5.after similarity index 74% rename from idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.after rename to idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.3.5.after index ee1dca3c20f..0307735d7e7 100644 --- a/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.after +++ b/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")) diff --git a/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.4.9.after b/idea/testData/gradle/configurator/addLibraryGSK/build.gradle.kts.4.9.after new file mode 100644 index 00000000000..507e16e0e66 --- /dev/null +++ b/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")) +} diff --git a/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts b/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts index 120a6147250..111e7f9b21f 100644 --- a/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts +++ b/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)) diff --git a/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts.after b/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts.after index b235f0a11cd..0b0f3fd9fbb 100644 --- a/idea/testData/gradle/configurator/addLibraryGSKWithKotlinVersion/build.gradle.kts.after +++ b/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)) diff --git a/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts b/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts index 3eb5768fc71..03c943d126c 100644 --- a/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts +++ b/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")) diff --git a/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts.after index f0c587bfc28..86457fad79d 100644 --- a/idea/testData/gradle/configurator/addNonKotlinLibraryGSK/build.gradle.kts.after +++ b/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")) diff --git a/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts b/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts index d175a6350b5..37bd5562c65 100644 --- a/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts +++ b/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts @@ -1,3 +1,7 @@ +plugins { + kotlin("jvm") version "1.2.50" +} + dependencies { compile(kotlinModule("stdlib-jre8")) } diff --git a/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.3.5.after similarity index 74% rename from idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.after rename to idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.3.5.after index d295550f0c4..d1b3da8fb6a 100644 --- a/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.after +++ b/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") diff --git a/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.4.9.after b/idea/testData/gradle/configurator/addTestLibraryGSK/build.gradle.kts.4.9.after new file mode 100644 index 00000000000..2df275eb045 --- /dev/null +++ b/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")) +} diff --git a/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts b/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts index 8ae41abbd2c..df760ffbb49 100644 --- a/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts +++ b/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 } diff --git a/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts.after index cf0ea6d7678..2b77a440072 100644 --- a/idea/testData/gradle/configurator/changeCoroutinesSupportGSK/build.gradle.kts.after +++ b/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 } diff --git a/idea/testData/gradle/configurator/changeCoroutinesSupportGSK49/build.gradle.kts b/idea/testData/gradle/configurator/changeCoroutinesSupportGSK49/build.gradle.kts new file mode 100644 index 00000000000..8325045325d --- /dev/null +++ b/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 +} diff --git a/idea/testData/gradle/configurator/changeCoroutinesSupportGSK49/build.gradle.kts.after b/idea/testData/gradle/configurator/changeCoroutinesSupportGSK49/build.gradle.kts.after new file mode 100644 index 00000000000..2b77a440072 --- /dev/null +++ b/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 +} diff --git a/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts b/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts index decac356650..31d661636d5 100644 --- a/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts +++ b/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" } diff --git a/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts.after index 37143c1a29e..23cfd99112d 100644 --- a/idea/testData/gradle/configurator/changeLanguageVersionGSK/build.gradle.kts.after +++ b/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" } diff --git a/idea/testData/gradle/configurator/configure10/build.gradle.after b/idea/testData/gradle/configurator/configure10/build.gradle.3.5.after similarity index 100% rename from idea/testData/gradle/configurator/configure10/build.gradle.after rename to idea/testData/gradle/configurator/configure10/build.gradle.3.5.after diff --git a/idea/testData/gradle/configurator/configure10/build.gradle.4.9.after b/idea/testData/gradle/configurator/configure10/build.gradle.4.9.after new file mode 100644 index 00000000000..1d379070701 --- /dev/null +++ b/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" +} diff --git a/idea/testData/gradle/configurator/configureGSK/build.gradle.kts.after b/idea/testData/gradle/configurator/configureGSK/build.gradle.kts.3.5.after similarity index 100% rename from idea/testData/gradle/configurator/configureGSK/build.gradle.kts.after rename to idea/testData/gradle/configurator/configureGSK/build.gradle.kts.3.5.after diff --git a/idea/testData/gradle/configurator/configureGSK/build.gradle.kts.4.9.after b/idea/testData/gradle/configurator/configureGSK/build.gradle.kts.4.9.after new file mode 100644 index 00000000000..f9a75c1f617 --- /dev/null +++ b/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" +} diff --git a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.after b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after similarity index 100% rename from idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.after rename to idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after diff --git a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after new file mode 100644 index 00000000000..63b8520e43f --- /dev/null +++ b/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" +} diff --git a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/app/build.gradle b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/app/build.gradle new file mode 100644 index 00000000000..5624134f5e3 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/app/build.gradle @@ -0,0 +1,6 @@ +group 'testgroup' +version '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after new file mode 100644 index 00000000000..59a32def1d0 --- /dev/null +++ b/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" +} diff --git a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/settings.gradle b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/settings.gradle new file mode 100644 index 00000000000..9d495b34f86 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/settings.gradle @@ -0,0 +1 @@ +include ':app' \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/app/build.gradle.kts b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/app/build.gradle.kts new file mode 100644 index 00000000000..8f4b554e9d0 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/app/build.gradle.kts @@ -0,0 +1,6 @@ +group = "testgroup" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after new file mode 100644 index 00000000000..fbeb1beb6a0 --- /dev/null +++ b/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")) +} diff --git a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/settings.gradle b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/settings.gradle new file mode 100644 index 00000000000..9d495b34f86 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/settings.gradle @@ -0,0 +1 @@ +include ':app' \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJsWithBuildGradle/app/build.gradle b/idea/testData/gradle/configurator/configureJsWithBuildGradle/app/build.gradle new file mode 100644 index 00000000000..5624134f5e3 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJsWithBuildGradle/app/build.gradle @@ -0,0 +1,6 @@ +group 'testgroup' +version '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJsWithBuildGradle/build.gradle.after b/idea/testData/gradle/configurator/configureJsWithBuildGradle/build.gradle.after new file mode 100644 index 00000000000..f775d085cc0 --- /dev/null +++ b/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" +} diff --git a/idea/testData/gradle/configurator/configureJsWithBuildGradle/settings.gradle b/idea/testData/gradle/configurator/configureJsWithBuildGradle/settings.gradle new file mode 100644 index 00000000000..9d495b34f86 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJsWithBuildGradle/settings.gradle @@ -0,0 +1 @@ +include ':app' \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJsWithBuildGradleKts/app/build.gradle.kts b/idea/testData/gradle/configurator/configureJsWithBuildGradleKts/app/build.gradle.kts new file mode 100644 index 00000000000..8f4b554e9d0 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJsWithBuildGradleKts/app/build.gradle.kts @@ -0,0 +1,6 @@ +group = "testgroup" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJsWithBuildGradleKts/build.gradle.kts.after b/idea/testData/gradle/configurator/configureJsWithBuildGradleKts/build.gradle.kts.after new file mode 100644 index 00000000000..dee724b0b0f --- /dev/null +++ b/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")) +} diff --git a/idea/testData/gradle/configurator/configureJsWithBuildGradleKts/settings.gradle b/idea/testData/gradle/configurator/configureJsWithBuildGradleKts/settings.gradle new file mode 100644 index 00000000000..9d495b34f86 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJsWithBuildGradleKts/settings.gradle @@ -0,0 +1 @@ +include ':app' \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/app/build.gradle b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/app/build.gradle new file mode 100644 index 00000000000..0c8366a9522 --- /dev/null +++ b/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' +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after new file mode 100644 index 00000000000..89a1f745e5d --- /dev/null +++ b/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" + } +} diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/settings.gradle b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/settings.gradle new file mode 100644 index 00000000000..9d495b34f86 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/settings.gradle @@ -0,0 +1 @@ +include ':app' \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/app/build.gradle.kts b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/app/build.gradle.kts new file mode 100644 index 00000000000..83235f26b6f --- /dev/null +++ b/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 { + sourceCompatibility = JavaVersion.VERSION_1_8 +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after new file mode 100644 index 00000000000..16264f56f44 --- /dev/null +++ b/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 { + 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" +} diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/settings.gradle b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/settings.gradle new file mode 100644 index 00000000000..9d495b34f86 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/settings.gradle @@ -0,0 +1 @@ +include ':app' \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJvmWithBuildGradle/app/build.gradle b/idea/testData/gradle/configurator/configureJvmWithBuildGradle/app/build.gradle new file mode 100644 index 00000000000..0c8366a9522 --- /dev/null +++ b/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' +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJvmWithBuildGradle/build.gradle.after b/idea/testData/gradle/configurator/configureJvmWithBuildGradle/build.gradle.after new file mode 100644 index 00000000000..af3580bb32b --- /dev/null +++ b/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" + } +} diff --git a/idea/testData/gradle/configurator/configureJvmWithBuildGradle/settings.gradle b/idea/testData/gradle/configurator/configureJvmWithBuildGradle/settings.gradle new file mode 100644 index 00000000000..9d495b34f86 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJvmWithBuildGradle/settings.gradle @@ -0,0 +1 @@ +include ':app' \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/app/build.gradle.kts b/idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/app/build.gradle.kts new file mode 100644 index 00000000000..83235f26b6f --- /dev/null +++ b/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 { + sourceCompatibility = JavaVersion.VERSION_1_8 +} \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/build.gradle.kts.after b/idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/build.gradle.kts.after new file mode 100644 index 00000000000..8760802091d --- /dev/null +++ b/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 { + 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" +} diff --git a/idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/settings.gradle b/idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/settings.gradle new file mode 100644 index 00000000000..9d495b34f86 --- /dev/null +++ b/idea/testData/gradle/configurator/configureJvmWithBuildGradleKts/settings.gradle @@ -0,0 +1 @@ +include ':app' \ No newline at end of file diff --git a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.after b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.3.5.after similarity index 100% rename from idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.after rename to idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.3.5.after diff --git a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after new file mode 100644 index 00000000000..30599f08a08 --- /dev/null +++ b/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" + } +} diff --git a/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.after b/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.3.5.after similarity index 100% rename from idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.after rename to idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.3.5.after diff --git a/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.4.9.after b/idea/testData/gradle/configurator/configureKotlinWithPluginsBlock/build.gradle.4.9.after new file mode 100644 index 00000000000..6021b4b836d --- /dev/null +++ b/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" +}