Changed gradle-plugin version in Gradle tests.

When 6.5.1 Gradle version was added, more tests have began to fail
because of legacy gradle-plugin versions (1.1., 1.2.) which are not
compatible with the new version of Gradle. This commit updates the used
version of the Gradle plugin to the latest stable (1.3.72) and makes it
configurable from tests.

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt

@@ -46,7 +46,7 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
             """
             <p>The compiler bundled to Kotlin plugin (1.0.0) is older than external compiler used for building modules:</p>
             <ul>
-            <li>app (1.1.0)</li>
+            <li>app (${LATEST_STABLE_GRADLE_PLUGIN_VERSION})</li>
             </ul>
             <p>This may cause different set of errors and warnings reported in IDE.</p>
             <p><a href="update">Update</a>  <a href="ignore">Ignore</a></p>

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt

@@ -72,6 +72,7 @@ internal fun GradleImportingTestCase.getSourceRootInfos(moduleName: String): Lis
     }
 }
 
+//ToDo: Remove @TargetVersions("4.7 <=> 6.0") after updating plugin versions in testData
 class GradleFacetImportTest : GradleImportingTestCase() {
 
     private fun assertSameKotlinSdks(vararg moduleNames: String) {
@@ -82,6 +83,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImport() {
         configureByFiles()
         importProject()
@@ -140,6 +142,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImport_1_1_2() {
         configureByFiles()
         importProject()
@@ -184,6 +187,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImportWithCustomSourceSets() {
         configureByFiles()
         importProject()
@@ -230,6 +234,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImportWithCustomSourceSets_1_1_2() {
         configureByFiles()
         importProject()
@@ -274,6 +279,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testCoroutineImportByOptions() {
         configureByFiles()
         importProject()
@@ -284,6 +290,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testCoroutineImportByProperties() {
         configureByFiles()
         importProject()
@@ -453,6 +460,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImportByPlatformPlugin() {
         configureByFiles()
         importProject()
@@ -548,6 +556,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImportByKotlinPlugin() {
         configureByFiles()
         importProject()
@@ -604,6 +613,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testArgumentEscaping() {
         configureByFiles()
         importProject()
@@ -685,6 +695,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testKotlinAndroidPluginDetection() {
         configureByFiles()
         createProjectSubFile(
@@ -698,6 +709,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testNoFacetInModuleWithoutKotlinPlugin() {
         configureByFiles()
 
@@ -710,6 +722,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testClasspathWithDependenciesImport() {
         configureByFiles()
         importProject()
@@ -720,6 +733,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testDependenciesClasspathImport() {
         configureByFiles()
         importProject()
@@ -730,6 +744,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJDKImport() {
         val mockJdkPath = "compiler/testData/mockJDK"
         object : WriteAction<Unit>() {
@@ -783,6 +798,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testAPIVersionExceedingLanguageVersion() {
         configureByFiles()
         importProject()
@@ -796,6 +812,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testIgnoreProjectLanguageAndAPIVersion() {
         KotlinCommonCompilerArgumentsHolder.getInstance(myProject).update {
             languageVersion = "1.0"
@@ -814,6 +831,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testCommonArgumentsImport() {
         configureByFiles()
         importProject()
@@ -861,6 +879,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testInternalArgumentsFacetImporting() {
         configureByFiles()
         importProject()
@@ -881,6 +900,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testStableModuleNameWhileUsingGradleJS() {
         configureByFiles()
         importProject()
@@ -893,6 +913,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testStableModuleNameWhileUsingGradleJVM() {
         configureByFiles()
         importProject()
@@ -904,6 +925,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testNoFriendPathsAreShown() {
         configureByFiles()
         importProject()
@@ -917,6 +939,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testSharedLanguageVersion() {
         configureByFiles()
 
@@ -930,6 +953,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testNonSharedLanguageVersion() {
         configureByFiles()
         val holder = KotlinCommonCompilerArgumentsHolder.getInstance(myProject)

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.193

@@ -72,6 +72,7 @@ internal fun GradleImportingTestCase.getSourceRootInfos(moduleName: String): Lis
     }
 }
 
+//ToDo: Remove @TargetVersions("4.7 <=> 6.0") after updating plugin versions in testData
 class GradleFacetImportTest : GradleImportingTestCase() {
 
     private fun assertSameKotlinSdks(vararg moduleNames: String) {
@@ -82,6 +83,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImport() {
         configureByFiles()
         importProject()
@@ -140,6 +142,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImport_1_1_2() {
         configureByFiles()
         importProject()
@@ -184,6 +187,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImportWithCustomSourceSets() {
         configureByFiles()
         importProject()
@@ -230,6 +234,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImportWithCustomSourceSets_1_1_2() {
         configureByFiles()
         importProject()
@@ -274,6 +279,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testCoroutineImportByOptions() {
         configureByFiles()
         importProject()
@@ -284,6 +290,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testCoroutineImportByProperties() {
         configureByFiles()
         importProject()
@@ -453,6 +460,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImportByPlatformPlugin() {
         configureByFiles()
         importProject()
@@ -548,6 +556,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJvmImportByKotlinPlugin() {
         configureByFiles()
         importProject()
@@ -604,6 +613,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testArgumentEscaping() {
         configureByFiles()
         importProject()
@@ -685,6 +695,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testKotlinAndroidPluginDetection() {
         configureByFiles()
         createProjectSubFile(
@@ -698,6 +709,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testNoFacetInModuleWithoutKotlinPlugin() {
         configureByFiles()
 
@@ -710,6 +722,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testClasspathWithDependenciesImport() {
         configureByFiles()
         importProject()
@@ -720,6 +733,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testDependenciesClasspathImport() {
         configureByFiles()
         importProject()
@@ -730,6 +744,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testJDKImport() {
         object : WriteAction<Unit>() {
             override fun run(result: Result<Unit>) {
@@ -780,6 +795,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testAPIVersionExceedingLanguageVersion() {
         configureByFiles()
         importProject()
@@ -793,6 +809,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testIgnoreProjectLanguageAndAPIVersion() {
         KotlinCommonCompilerArgumentsHolder.getInstance(myProject).update {
             languageVersion = "1.0"
@@ -811,6 +828,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testCommonArgumentsImport() {
         configureByFiles()
         importProject()
@@ -858,6 +876,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testInternalArgumentsFacetImporting() {
         configureByFiles()
         importProject()
@@ -878,6 +897,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testStableModuleNameWhileUsingGradleJS() {
         configureByFiles()
         importProject()
@@ -890,6 +910,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testStableModuleNameWhileUsingGradleJVM() {
         configureByFiles()
         importProject()
@@ -901,6 +922,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testNoFriendPathsAreShown() {
         configureByFiles()
         importProject()
@@ -914,6 +936,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testSharedLanguageVersion() {
         configureByFiles()
 
@@ -927,6 +950,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testNonSharedLanguageVersion() {
         configureByFiles()
         val holder = KotlinCommonCompilerArgumentsHolder.getInstance(myProject)

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt

@@ -88,7 +88,7 @@ import java.util.zip.ZipFile
 @Parameterized.UseParametersRunnerFactory(RunnerFactoryWithMuteInDatabase::class)
 abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
 
-    protected var sdkCreationChecker : KotlinSdkCreationChecker? = null
+    protected var sdkCreationChecker: KotlinSdkCreationChecker? = null
 
     private val removedSdks: MutableList<Sdk> = SmartList()
 
@@ -113,7 +113,7 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
 
     open fun isApplicableTest(): Boolean = true
 
-    open fun jvmHeapArgsByGradleVersion(version: String) : String = when {
+    open fun jvmHeapArgsByGradleVersion(version: String): String = when {
         version.startsWith("4.") ->
             // work-around due to memory leak in class loaders in gradle. The amount of used memory in the gradle daemon
             // is drammatically increased on every reimport of project due to sequential compilation of build scripts.
@@ -324,6 +324,14 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
         return File(baseDir, getTestName(true).substringBefore("_"))
     }
 
+    protected fun configureKotlinVersionAndProperties(text: String, properties: Map<String, String>? = null): String {
+        var result = text
+        (properties ?: mapOf("kotlin_plugin_version" to LATEST_STABLE_GRADLE_PLUGIN_VERSION)).forEach { (key, value) ->
+            result = result.replace("{{${key}}}", value)
+        }
+        return result
+    }
+
     protected open fun configureByFiles(properties: Map<String, String>? = null): List<VirtualFile> {
         val rootDir = testDataDirectory()
         assert(rootDir.exists()) { "Directory ${rootDir.path} doesn't exist" }
@@ -333,10 +341,7 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
                 it.isDirectory -> null
 
                 !it.name.endsWith(SUFFIX) -> {
-                    var text = FileUtil.loadFile(it, /* convertLineSeparators = */ true)
+                    val text = configureKotlinVersionAndProperties(FileUtil.loadFile(it, /* convertLineSeparators = */ true), properties)
-                    (properties ?: mapOf("kotlin_plugin_version" to LATEST_STABLE_GRADLE_PLUGIN_VERSION)).forEach { key, value ->
-                        text = text.replace("{{${key}}}", value)
-                    }
                     val virtualFile = createProjectSubFile(it.path.substringAfter(rootDir.path + File.separator), text)
 
                     // Real file with expected testdata allows to throw nicer exceptions in
@@ -367,13 +372,14 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
         }
             .forEach {
                 if (it.name == GradleConstants.SETTINGS_FILE_NAME && !File(testDataDirectory(), it.name + SUFFIX).exists()) return@forEach
-                val actualText = LoadTextUtil.loadText(it).toString()
+                val actualText = configureKotlinVersionAndProperties(LoadTextUtil.loadText(it).toString())
                 val expectedFileName = if (File(testDataDirectory(), it.name + ".$gradleVersion" + SUFFIX).exists()) {
                     it.name + ".$gradleVersion" + SUFFIX
                 } else {
                     it.name + SUFFIX
                 }
                 KotlinTestUtils.assertEqualsToFile(File(testDataDirectory(), expectedFileName), actualText)
+                { s -> configureKotlinVersionAndProperties(s) }
             }
     }
 

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt

@@ -71,7 +71,7 @@ class GradleInspectionTest : GradleImportingTestCase() {
         val problems = getInspectionResultFromTestDataProject()
 
         Assert.assertEquals(1, problems.size)
-        Assert.assertEquals("Plugin version (1.3.10) is not the same as library version (1.3.30)", problems.single())
+        Assert.assertEquals("Plugin version ($LATEST_STABLE_GRADLE_PLUGIN_VERSION) is not the same as library version (1.3.30)", problems.single())
     }
 
     @Test
@@ -82,7 +82,7 @@ class GradleInspectionTest : GradleImportingTestCase() {
 
         Assert.assertEquals(1, problems.size)
         Assert.assertEquals(
-            "Kotlin version that is used for building with Gradle (1.3.0) differs from the one bundled into the IDE plugin (\$PLUGIN_VERSION)",
+            "Kotlin version that is used for building with Gradle ($LATEST_STABLE_GRADLE_PLUGIN_VERSION) differs from the one bundled into the IDE plugin (\$PLUGIN_VERSION)",
             problems.single()
         )
     }

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMigrateTest.kt

@@ -24,7 +24,7 @@ import java.util.concurrent.TimeoutException
 
 class GradleMigrateTest : GradleImportingTestCase() {
     @Test
-    @TargetVersions("4.4+")
+    @TargetVersions("5.3+")
     fun testMigrateStdlib() {
         val migrateComponentState = doMigrationTest(
             beforeText = """
@@ -32,35 +32,39 @@ class GradleMigrateTest : GradleImportingTestCase() {
                 repositories {
                     jcenter()
                     mavenCentral()
+                    maven{ url 'https://dl.bintray.com/kotlin/kotlin-dev'}
+                    maven{ url 'http://dl.bintray.com/kotlin/kotlin-eap' }
                 }
                 dependencies {
-                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40"
+                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.40"
                 }
             }
 
             apply plugin: 'kotlin'
 
             dependencies {
-                compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.40"
+                compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.40"
             }
             """,
-
+            //ToDo: Change 1.4-M3 to 1.4.0 version after release
             afterText =
             """
             buildscript {
                 repositories {
                     jcenter()
                     mavenCentral()
+                    maven{ url 'https://dl.bintray.com/kotlin/kotlin-dev'}
+                    maven{ url 'http://dl.bintray.com/kotlin/kotlin-eap'}
                 }
                 dependencies {
-                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
+                    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4-M3"
                 }
             }
 
             apply plugin: 'kotlin'
 
             dependencies {
-                compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.50"
+                compile "org.jetbrains.kotlin:kotlin-stdlib:1.4-M3"
             }
             """
         )
@@ -69,12 +73,12 @@ class GradleMigrateTest : GradleImportingTestCase() {
 
         Assert.assertEquals(
             MigrationInfo.create(
-                oldStdlibVersion = "1.2.40",
+                oldStdlibVersion = "1.3.40",
-                oldApiVersion = ApiVersion.KOTLIN_1_2,
+                oldApiVersion = ApiVersion.KOTLIN_1_3,
-                oldLanguageVersion = LanguageVersion.KOTLIN_1_2,
+                oldLanguageVersion = LanguageVersion.KOTLIN_1_3,
-                newStdlibVersion = "1.3.50",
+                newStdlibVersion = "1.4-M3",
-                newApiVersion = ApiVersion.KOTLIN_1_3,
+                newApiVersion = ApiVersion.KOTLIN_1_4,
-                newLanguageVersion = LanguageVersion.KOTLIN_1_3
+                newLanguageVersion = LanguageVersion.KOTLIN_1_4
             ),
             migrateComponentState?.migrationInfo
         )

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt

@@ -25,8 +25,7 @@ import kotlin.reflect.KMutableProperty0
 class GradleQuickFixTest : GradleImportingTestCase() {
     private lateinit var codeInsightTestFixture: CodeInsightTestFixture
 
-    private fun getTestDataPath() =
+    override fun testDataDirName() = "fixes"
-        PluginTestCaseBase.getTestDataPathBase() + "/gradle/fixes/" + getTestName(true).substringBefore('_')
 
     override fun setUpFixtures() {
         myTestFixture = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(getName()).fixture
@@ -47,7 +46,7 @@ class GradleQuickFixTest : GradleImportingTestCase() {
     }
 
     private fun doGradleQuickFixTest(localInspectionTool: LocalInspectionTool) {
-        val buildGradleVFile = createProjectSubFile("build.gradle", File(getTestDataPath(), "build.gradle").readText())
+        val buildGradleVFile = configureByFiles().first { it.name == "build.gradle" }
         importProject()
 
         applyInspectionFixes(localInspectionTool, buildGradleVFile)
@@ -78,6 +77,10 @@ class GradleQuickFixTest : GradleImportingTestCase() {
     }
 
     private fun checkResult(file: VirtualFile) {
-        KotlinTestUtils.assertEqualsToFile(File(getTestDataPath(), "build.gradle.after"), LoadTextUtil.loadText(file).toString())
+        KotlinTestUtils.assertEqualsToFile(
+            File(testDataDirectory(), "build.gradle.after"),
+            configureKotlinVersionAndProperties(LoadTextUtil.loadText(file).toString())
+        )
+        { s -> configureKotlinVersionAndProperties(s) }
     }
 }

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleUpdateConfigurationQuickFixTest.kt

@@ -25,6 +25,7 @@ import com.intellij.testFramework.fixtures.CodeInsightTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import com.intellij.testFramework.runInEdtAndWait
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
+import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
 import org.junit.Test
 import java.io.File
 import kotlin.reflect.KMutableProperty0
@@ -48,26 +49,31 @@ class GradleUpdateConfigurationQuickFixTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testUpdateLanguageVersion() {
         doTest("Set module language version to 1.1")
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testUpdateApiVersion() {
         doTest("Set module API version to 1.1")
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testUpdateLanguageAndApiVersion() {
         doTest("Set module language version to 1.1")
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testEnableCoroutines() {
         doTest("Enable coroutine support in the current module")
     }
 
     @Test
+    @TargetVersions("4.7 <=> 6.0")
     fun testAddKotlinReflect() {
         doTest("Add 'kotlin-reflect.jar' to the classpath")
     }

idea/testData/gradle/configurator/addCoroutinesSupport/build.gradle

@@ -4,12 +4,12 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-{{kotlin_plugin_version}}"
 }

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

@@ -4,14 +4,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-{{kotlin_plugin_version}}"
 }
 kotlin {
     experimental {

idea/testData/gradle/configurator/addLanguageVersion/build.gradle

@@ -4,12 +4,12 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
 }

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

@@ -4,14 +4,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
 }
 compileKotlin {
     kotlinOptions {

idea/testData/gradle/configurator/addLibrary/build.gradle

@@ -4,12 +4,12 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
 }

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

@@ -4,13 +4,13 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
     implementation "org.jetbrains.kotlin:kotlin-reflect:1.0.0"
 }

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 plugins {
-    kotlin("jvm") version "1.2.50"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 
 dependencies {
     testCompile("junit:junit:4.12")
-    compile(kotlinModule("stdlib-jre8"))
+    compile(kotlin("stdlib-jre8"))
     implementation("org.a.b:lib:1.0.0")
 }

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

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

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

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

idea/testData/gradle/configurator/changeCoroutinesSupport/build.gradle

@@ -4,14 +4,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
 }
 kotlin {
     experimental {

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

@@ -4,14 +4,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
 }
 kotlin {
     experimental {

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

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.dsl.Coroutines
 
 plugins {
-    kotlin("jvm") version "1.2.50"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 
 kotlin {

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

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.dsl.Coroutines
 
 plugins {
-    kotlin("jvm") version "1.2.50"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 
 kotlin {

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

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.dsl.Coroutines
 
 plugins {
-    kotlin("jvm") version "1.2.50"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 
 kotlin {

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

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.dsl.Coroutines
 
 plugins {
-    kotlin("jvm") version "1.2.50"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 
 kotlin {

idea/testData/gradle/configurator/changeFeatureSupport/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin"

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

@@ -5,7 +5,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin"
@@ -19,6 +19,6 @@ dependencies {
 }
 compileKotlin {
     kotlinOptions {
-        freeCompilerArgs = ["-XXLanguage:+InlineClasses"]
+        freeCompilerArgs = ["-Xinline-classes"]
     }
 }

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

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.2.70"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {

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

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.2.70"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {

idea/testData/gradle/configurator/changeLanguageVersion/build.gradle

@@ -4,14 +4,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
 }
 compileKotlin {
     kotlinOptions {

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

@@ -4,14 +4,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
 }
 compileKotlin {
     kotlinOptions {

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

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-   kotlin("jvm") version "1.2.50"
+   kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 
 val compileKotlin: KotlinCompile by tasks

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

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-   kotlin("jvm") version "1.2.50"
+   kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 
 val compileKotlin: KotlinCompile by tasks

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

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

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

@@ -0,0 +1,25 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("jvm") version "1.1.2"
+}
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+dependencies {
+    implementation(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.after

@@ -0,0 +1,22 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("jvm") version "1.2.60-dev-286"
+}
+group = "testgroup"
+version = "1.0-SNAPSHOT"
+dependencies {
+    implementation(kotlin("stdlib-jdk8"))
+}
+repositories {
+    maven("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_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/configureKotlinWithPluginsBlock/build.gradle.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'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib"
+}

idea/testData/gradle/configurator/disableFeatureSupport/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin"

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

@@ -5,7 +5,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin"

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

@@ -1,4 +1,4 @@
 plugins {
-    kotlin("jvm") version "1.2.70"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 

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

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.2.70"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 
 val compileKotlin: KotlinCompile by tasks

idea/testData/gradle/configurator/enableFeatureSupport/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin"

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

@@ -5,7 +5,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin"
@@ -19,6 +19,6 @@ dependencies {
 }
 compileKotlin {
     kotlinOptions {
-        freeCompilerArgs = ["-XXLanguage:+InlineClasses"]
+        freeCompilerArgs = ["-Xinline-classes"]
     }
 }

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

@@ -1,3 +1,3 @@
 plugins {
-    kotlin("jvm") version "1.2.70"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }

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

@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.2.70"
+    kotlin("jvm") version "{{kotlin_plugin_version}}"
 }
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {
-    freeCompilerArgs = listOf("-XXLanguage:+InlineClasses")
+    freeCompilerArgs = listOf("-Xinline-classes")
 }

idea/testData/gradle/configurator/enableFeatureSupportMultiplatform/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-190"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin-multiplatform"

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

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-190"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin-multiplatform"

idea/testData/gradle/configurator/enableFeatureSupportMultiplatformToExistentArguments/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-190"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin-multiplatform"

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

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-190"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin-multiplatform"

idea/testData/gradle/configurator/enableFeatureSupportToExistentArguments/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin"

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

@@ -5,7 +5,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 apply plugin: "kotlin"
@@ -19,7 +19,7 @@ dependencies {
 }
 compileKotlin {
     kotlinOptions {
-        freeCompilerArgs = ["-XXLanguage:+SamConversionForKotlinFunctions", "-XXLanguage:+InlineClasses"]
+        freeCompilerArgs = ["-XXLanguage:+SamConversionForKotlinFunctions", "-Xinline-classes"]
         // Free compiler arguments
     }
 }

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

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
     }
 }
 

idea/testData/gradle/configurator/testTasksAreImported/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.2.50'
+    id 'org.jetbrains.kotlin.jvm' version '{{kotlin_plugin_version}}'
 }
 
 repositories {

idea/testData/gradle/fixes/updateKotlinxCoroutines/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
     }
 }
 

idea/testData/gradle/fixes/updateKotlinxCoroutines/build.gradle.after

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
     }
 }
 

idea/testData/gradle/inspections/differentKotlinGradleVersion/gradle.properties

@@ -1 +1 @@
-test=1.3.0
+test={{kotlin_plugin_version}}

idea/testData/gradle/inspections/differentStdlibGradleVersionWithVariables/gradle.properties

@@ -1,2 +1,2 @@
-kotlin=1.3.10
+kotlin={{kotlin_plugin_version}}
 lib_version=1.3.30

idea/testData/gradle/inspections/noDifferentStdlibCommonGradleVersion/build.gradle

@@ -9,12 +9,12 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
     }
 }
 
 apply plugin: 'kotlin-platform-common'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.2.40"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-common"
 }

idea/testData/gradle/inspections/noDifferentStdlibJdk7GradleVersion/build.gradle

@@ -9,12 +9,12 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
     }
 }
 
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.40"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
 }

idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/build.gradle

@@ -11,9 +11,7 @@ buildscript {
 
 allprojects {
     repositories {
-        google()
+        {{kotlin_plugin_repositories}}
-        jcenter()
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
 }
 

idea/testData/gradle/newMultiplatformImport/commonTestTargetPlatform/build.gradle

@@ -6,6 +6,11 @@ buildscript {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
     }
 }
+
+repositories {
+    {{kotlin_plugin_repositories}}
+}
+
 apply plugin: 'kotlin-multiplatform'
 
 group 'com.example'

idea/testData/gradle/newMultiplatformImport/javaTransitiveOnMPP/settings.gradle

@@ -1,6 +1,4 @@
 
 include('mpp-base')
 include('mpp')
-include('jvm')
+include('jvm')
-
-enableFeaturePreview('STABLE_PUBLISHING')

tests/mute-common.csv

@@ -7,17 +7,12 @@ org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTes
 org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTestGenerated.JavaAgainstKotlin.testUsingReadOnlyInterfaces,,, FLAKY
 "org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testSingleAndroidTarget[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Stable on windows,, FLAKY
 "org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testSingleAndroidTarget[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Stable on windows,, FLAKY
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testSingleAndroidTarget[7: Gradle-6.5.1, KotlinGradlePlugin-latest stable]", Stable on windows,, FLAKY
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testSingleAndroidTarget[8: Gradle-6.5.1, KotlinGradlePlugin-master]", Stable on windows,, FLAKY
 org.jetbrains.kotlin.idea.caches.resolve.MultiPlatformHighlightingTestGenerated.testJvmKotlinReferencesCommonKotlinThroughJavaDifferentJvmImpls, Always red,,
 org.jetbrains.kotlin.idea.codeInsight.gradle.GradleBuildFileHighlightingTest.testKtsInJsProject[1: with Gradle-5.6.4], ERROR: Diagnostic's list should be empty,,
 org.jetbrains.kotlin.idea.codeInsight.gradle.GradleBuildFileHighlightingTest.testKtsInJsProject[0: with Gradle-4.9], ERROR: Diagnostic's list should be empty,,
 org.jetbrains.kotlin.idea.codeInsight.gradle.GradleBuildFileHighlightingTest.testKtsInJsProject, ERROR: Diagnostic's list should be empty,,
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testAddLibraryGSK[1: with Gradle-5.6.4], unresolved kotlinModule,,
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testAddTestLibraryGSK[1: with Gradle-5.6.4], unresolved kotlinModule,,
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testConfigure10[1: with Gradle-5.6.4], absent test data,,
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testConfigureGSK[1: with Gradle-5.6.4], absent test data,,
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testConfigureGradleKtsKotlinDevVersion[1: with Gradle-5.6.4], absent test data,,
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testConfigureKotlinDevVersion[1: with Gradle-5.6.4], absent test data,,
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testConfigureKotlinWithPluginsBlock[1: with Gradle-5.6.4], absent test data,,
 org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInTempDirTest.testKotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance,,, FLAKY
 org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInTempDirTest.testNoKotlincExistsNoSettingsRuntime10,,, FLAKY
 org.jetbrains.kotlin.idea.configuration.ConfigureKotlinTest.testJava9WithModuleInfo, ERROR: Require directive for kotlin.stdlib is expected,,

tests/mute-platform.csv.as36

@@ -17,5 +17,4 @@ org.jetbrains.kotlin.idea.debugger.test.KotlinSteppingTestGenerated.StepOver.tes
 org.jetbrains.kotlin.idea.debugger.test.KotlinSteppingTestGenerated.StepOverForce.testSofSuspendableCallInFun, Super flaky on Android Studio (can be reproduced locally),, FLAKY
 org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.AutoImports.testAmbiguousNamePreferFromJdk, Class from JDK is not prioritized,,
 org.jetbrains.kotlin.idea.codeInsight.gradle.GradleKtsImportTest.testError[0: with Gradle-6.0.1], KT-37864,,
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testAddNonKotlinLibraryGSK[1: with Gradle-5.6.4], unresolved kotlinModule,,
 org.jetbrains.kotlin.idea.debugger.test.KotlinSteppingTestGenerated.Custom.testFunctionBreakpointInStdlib, Unprocessed,,

tests/mute-platform.csv.as40

@@ -114,5 +114,4 @@ org.jetbrains.kotlin.idea.codeInsight.gradle.GradleKtsImportTest.testError[0: wi
 org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Var.testVarWithTypeWoInitializer, Unprocessed,, FLAKY
 org.jetbrains.kotlin.idea.refactoring.move.MoveTestGenerated.testKotlin_moveTopLevelDeclarations_moveFunctionToPackage_MoveFunctionToPackage, fail on TeamCity but works well locally,, FLAKY
 org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertSealedClassToEnum.testInstancesAndMembers, Enum reorder,, FLAKY
-org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testAddNonKotlinLibraryGSK[1: with Gradle-5.6.4], unresolved kotlinModule,,
 org.jetbrains.kotlin.idea.debugger.test.KotlinSteppingTestGenerated.Custom.testFunctionBreakpointInStdlib, Unprocessed,,