Update kotlin gradle plugin used in import tests

idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt

@@ -22,7 +22,7 @@ import org.junit.Before
 import org.junit.Test
 
 class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
-    private fun kotlinVersion() = if (gradleKotlinPluginVersion == MINIMAL_SUPPORTED_VERSION) "1.3.0-rc-146" else gradleKotlinPluginVersion
+    private fun kotlinVersion() = if (gradleKotlinPluginVersion == MINIMAL_SUPPORTED_VERSION) "1.3.10" else gradleKotlinPluginVersion
 
     @Before
     fun saveSdksBeforeTest() {
@@ -333,18 +333,18 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
                 sourceFolder("shared/src/androidTest/resources", JavaResourceRootType.TEST_RESOURCE)
             }
             var nativeVersion = when (gradleKotlinPluginVersion) {
-                MINIMAL_SUPPORTED_VERSION -> "1.0.2"
+                MINIMAL_SUPPORTED_VERSION -> "1.3.10"
-                else -> "1.1.1"
+                else -> "1.3.20"
             }
             module("shared_iOSMain") {
-                libraryDependency("Gradle: Kotlin/Native:stdlib:$nativeVersion", DependencyScope.COMPILE)
+                libraryDependency("Kotlin/Native $nativeVersion - stdlib", DependencyScope.PROVIDED)
                 libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE)
                 moduleDependency("shared_commonMain", DependencyScope.COMPILE)
                 sourceFolder("shared/src/iOSMain/kotlin", KotlinSourceRootType.Source)
                 sourceFolder("shared/src/iOSMain/resources", KotlinResourceRootType.Resource)
             }
             module("shared_iOSTest") {
-                libraryDependency("Gradle: Kotlin/Native:stdlib:$nativeVersion", DependencyScope.TEST)
+                libraryDependency("Kotlin/Native $nativeVersion - stdlib", DependencyScope.PROVIDED)
                 libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST)
                 moduleDependency("shared_iOSMain", DependencyScope.TEST)
                 moduleDependency("shared_commonMain", DependencyScope.TEST)

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

@@ -22,10 +22,14 @@ android {
     }
 }
 
+apply from: "../include.gradle"
+def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
+
+
 dependencies {
     implementation project(':shared')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.0-rc-146"
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVersion}"
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'

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

@@ -1,5 +1,6 @@
 buildscript {
-    ext.kotlin_version = '1.3.0-rc-146'
+    apply from: "include.gradle"
+    def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
     repositories {
         google()
         jcenter()
@@ -7,8 +8,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.0'
-        apply from: "include.gradle"
-        def kotlinVersion = gradleKotlinPluginVersion('1.3.0-rc-146')
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }

idea/testData/gradle/newMultiplatformImport/fileCollectionDependency/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         apply from: "include.gradle"
-        def kotlinVersion = gradleKotlinPluginVersion('1.3.0-rc-146')
+        def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }

idea/testData/gradle/newMultiplatformImport/nestedDependencies/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         apply from: "include.gradle"
-        def kotlinVersion = gradleKotlinPluginVersion('1.3.0-rc-146')
+        def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }

idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         apply from: "include.gradle"
-        def kotlinVersion = gradleKotlinPluginVersion('1.2.0-beta-74')
+        def kotlinVersion = gradleKotlinPluginVersion('1.3.20')
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }

idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/toInclude/build.gradle

@@ -1,4 +1,3 @@
-
 buildscript {
     repositories {
         mavenCentral()
@@ -6,28 +5,31 @@ buildscript {
     }
 
     dependencies {
-        apply from: "include.gradle"
+        apply from: "../include.gradle"
-        def kotlinVersion = gradleKotlinPluginVersion('1.2.0-beta-74')
+        def kotlinVersion = gradleKotlinPluginVersion('1.3.20')
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }
 
-project('common') {
-    apply plugin: 'kotlin-platform-common'
-}
 
-project('jvm') {
+apply plugin: 'kotlin-multiplatform'
-    apply plugin: 'kotlin-platform-jvm'
 
-    dependencies {
+
-        expectedBy project(':common')
+kotlin {
-    }
+    jvm()
-}
+    js()
-
+    sourceSets {
-project('js') {
+        commonMain {
-    apply plugin: 'kotlin-platform-js'
+        }
-
+        commonTest {
-    dependencies {
+        }
-        expectedBy project(':common')
+        jvmMain {
+        }
+        jvmTest {
+        }
+        jsMain {
+        }
+        jsTest {
+        }
     }
 }

idea/testData/gradle/newMultiplatformImport/projectDependency/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         apply from: "include.gradle"
-        def kotlinVersion = gradleKotlinPluginVersion('1.3.0-rc-146')
+        def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }

idea/testData/gradle/newMultiplatformImport/unresolvedDependency/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         apply from: "include.gradle"
-        def kotlinVersion = gradleKotlinPluginVersion('1.3.0-rc-146')
+        def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }