Tests of import with latest gradle plugin are implemented

idea/testData/gradle/hierarchicalMultiplatformImport/importHMPPFlag/build.gradle.kts

@@ -1,11 +1,20 @@
+buildscript {
+    repositories {
+        {{kts_kotlin_plugin_repositories}}
+    }
+    dependencies {
+        {{extraPluginDependencies}}
+    }
+}
+
+repositories {
+    {{kts_kotlin_plugin_repositories}}
+}
+
 plugins {
     kotlin("multiplatform").version("{{kotlin_plugin_version}}")
 }
 
-repositories {
-    maven("https://kotlin.bintray.com/kotlin-dev")
-    jcenter()
-}
 
 group = "project"
 version = "1.0"

idea/testData/gradle/hierarchicalMultiplatformImport/importHMPPFlag/settings.gradle.kts

@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
-        maven("https://dl.bintray.com/kotlin/kotlin-dev")
-        gradlePluginPortal()
+        {{kts_kotlin_plugin_repositories}}
     }
+    {{kts_resolution_strategy}}
 }
 
 rootProject.name = "my-app"

idea/testData/gradle/hierarchicalMultiplatformImport/importIntermediateModules/build.gradle.kts

@@ -1,10 +1,18 @@
-plugins {
-    kotlin("multiplatform").version("{{kotlin_plugin_version}}")
+buildscript {
+    repositories {
+        {{kts_kotlin_plugin_repositories}}
+    }
+    dependencies {
+        {{extraPluginDependencies}}
+    }
 }
 
 repositories {
-    maven("https://kotlin.bintray.com/kotlin-dev")
-    jcenter()
+    {{kts_kotlin_plugin_repositories}}
+}
+
+plugins {
+    kotlin("multiplatform").version("{{kotlin_plugin_version}}")
 }
 
 group = "project"

idea/testData/gradle/hierarchicalMultiplatformImport/importIntermediateModules/settings.gradle.kts

@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
-        maven("https://dl.bintray.com/kotlin/kotlin-dev")
-        gradlePluginPortal()
+        {{kts_kotlin_plugin_repositories}}
     }
+    {{kts_resolution_strategy}}
 }
 
 rootProject.name = "my-app"

idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/build.gradle

@@ -1,21 +1,18 @@
 buildscript {
     repositories {
-        mavenLocal()
-        jcenter()
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+        {{kotlin_plugin_repositories}}
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
+        {{extraPluginDependencies}}
     }
 
 }
 
 allprojects {
     repositories {
-        mavenLocal()
-        jcenter()
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+        {{kotlin_plugin_repositories}}
     }
 }
 

idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/gradle.properties

@@ -1,4 +1,3 @@
-kotlin_version = {{kotlin_plugin_version}}
 coroutines_version = 1.1.1
 moowork_node = 1.2.0
 

idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/hmpp-mod-a/build.gradle

@@ -4,20 +4,15 @@ apply plugin: 'kotlin-multiplatform'
 
 buildscript {
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-noarg:$kotlin_version"
+        {{extraPluginDependencies}}
     }
     repositories {
-        mavenLocal()
-        jcenter()
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+        {{kotlin_plugin_repositories}}
     }
 }
 
 repositories {
-    mavenLocal()
-    jcenter()
-    maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+    {{kotlin_plugin_repositories}}
 }
 
 kotlin {

idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/jvm-mod/build.gradle

@@ -5,9 +5,7 @@ plugins {
 version 'unspecified'
 
 repositories {
-    mavenLocal()
-    jcenter()
-    maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+    {{kotlin_plugin_repositories}}
 }
 
 dependencies {

idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/settings.gradle

@@ -1,14 +1,6 @@
 pluginManagement {
     repositories {
-        maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' }
-        maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
-
-        mavenCentral()
-        mavenLocal()
-        jcenter()
-
-        maven { url 'https://dl.bintray.com/qwwdfsad/kotlinx' }
-        maven { url 'https://plugins.gradle.org/m2/' }
+        {{kotlin_plugin_repositories}}
     }
 }
 rootProject.name = 'jvm-on-mpp'

idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle

@@ -6,49 +6,6 @@ buildscript {
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
-
-project('project1') {
-    apply plugin: 'kotlin-platform-common'
-}
-
-project('project2') {
-    repositories {
-        mavenCentral()
-    }
-
-    apply plugin: 'kotlin-platform-js'
-
-    dependencies {
-        implement project(':project1')
-    }
-}
-
-project('project3') {
-    repositories {
-        mavenCentral()
-    }
-
-    apply plugin: 'com.android.application'
-    apply plugin: 'kotlin-android'
-
-    sourceSets {
-        custom
-    }
-
-    android {
-        compileSdkVersion 26
-        buildToolsVersion "23.0.1"
-        defaultConfig {
-            applicationId "org.jetbrains.kotlin"
-            minSdkVersion 18
-            targetSdkVersion 26
-            versionCode 1
-            versionName "1.0"
-            testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        }
-    }
-}
-        

idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project1/build.gradle

@@ -0,0 +1,13 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven { url 'https://maven.google.com' }
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        classpath 'com.android.tools.build:gradle:3.0.0'
+    }
+}
+
+apply plugin: 'kotlin-platform-common'

idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project2/build.gradle

@@ -0,0 +1,21 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven { url 'https://maven.google.com' }
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        classpath 'com.android.tools.build:gradle:3.0.0'
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+apply plugin: 'kotlin-platform-js'
+
+dependencies {
+    implement project(':project1')
+}

idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project3/build.gradle

@@ -0,0 +1,35 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven { url 'https://maven.google.com' }
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        classpath 'com.android.tools.build:gradle:3.0.0'
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+sourceSets {
+    custom
+}
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "26.0.2"
+    defaultConfig {
+        applicationId "org.jetbrains.kotlin"
+        minSdkVersion 18
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+}

idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
 

idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle

@@ -6,63 +6,6 @@ buildscript {
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
-
-project('project1') {
-    apply plugin: 'kotlin-platform-common'
-
-    sourceSets {
-        custom
-    }
-}
-
-project('project2') {
-    repositories {
-        mavenCentral()
-    }
-
-    apply plugin: 'kotlin-platform-jvm'
-
-    sourceSets {
-        custom
-    }
-
-    dependencies {
-        implement project(':project1')
-    }
-}
-
-project('project3') {
-    repositories {
-        mavenCentral()
-    }
-
-    apply plugin: 'com.android.application'
-    apply plugin: 'kotlin-android'
-
-    sourceSets {
-        custom
-    }
-
-    android {
-        compileSdkVersion 26
-        buildToolsVersion "23.0.1"
-        defaultConfig {
-            applicationId "org.jetbrains.kotlin"
-            minSdkVersion 18
-            targetSdkVersion 26
-            versionCode 1
-            versionName "1.0"
-            testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        }
-    }
-
-    dependencies {
-        compile project(':project2')
-        customCompile project(':project2')
-        testCompile(project(':project2').sourceSets.test.output)
-    }
-}
-        

idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/project1/build.gradle

@@ -0,0 +1,5 @@
+apply plugin: 'kotlin-platform-common'
+
+sourceSets {
+    custom
+}

idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/project2/build.gradle

@@ -0,0 +1,14 @@
+
+repositories {
+    mavenCentral()
+}
+
+apply plugin: 'kotlin-platform-jvm'
+
+sourceSets {
+    custom
+}
+
+dependencies {
+    implement project(':project1')
+}

idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/project3/build.gradle

@@ -0,0 +1,29 @@
+repositories {
+    mavenCentral()
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+sourceSets {
+    custom
+}
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "23.0.1"
+    defaultConfig {
+        applicationId "org.jetbrains.kotlin"
+        minSdkVersion 18
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+}
+
+dependencies {
+    compile project(':project2')
+    customCompile project(':project2')
+    testCompile(project(':project2').sourceSets.test.output)
+}

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

@@ -6,6 +6,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.0'
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        {{extraPluginDependencies}}
     }
 }
 

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

@@ -4,6 +4,7 @@ buildscript {
     }
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        {{extraPluginDependencies}}
     }
 }
 apply plugin: 'kotlin-multiplatform'

idea/testData/gradle/newMultiplatformImport/dependencyOnRoot/build.gradle

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

idea/testData/gradle/newMultiplatformImport/detectAndroidSources/build.gradle

@@ -10,6 +10,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        {{extraPluginDependencies}}
     }
 }
 

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

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

idea/testData/gradle/newMultiplatformImport/importBeforeBuild/build.gradle

@@ -1,7 +1,14 @@
-plugins {
-    id 'org.jetbrains.kotlin.jvm' version '{{kotlin_plugin_version}}' apply false
+buildscript {
+    repositories {
+        {{kotlin_plugin_repositories}}
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
+        {{extraPluginDependencies}}
+    }
 }
 
+
 allprojects {
     repositories {
         {{kotlin_plugin_repositories}}

idea/testData/gradle/newMultiplatformImport/importTestsAndTargets/build.gradle

@@ -1,10 +1,20 @@
-plugins {
-    id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
-}
-repositories {
-    {{kotlin_plugin_repositories}}
+buildscript {
+    repositories {
+        {{kotlin_plugin_repositories}}
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+                {{extraPluginDependencies}}
+    }
 }
 
+allprojects {
+    repositories {
+        {{kotlin_plugin_repositories}}
+    }
+}
+
+apply plugin: 'kotlin-multiplatform'
 
 group 'com.example'
 version '0.0.1'

idea/testData/gradle/newMultiplatformImport/importTestsAndTargets/settings.gradle

@@ -1,9 +1,2 @@
-pluginManagement {
-    repositories {
-        {{kotlin_plugin_repositories}}
-    }
-}
 rootProject.name = 'project'
-
-
 enableFeaturePreview('GRADLE_METADATA')

idea/testData/gradle/newMultiplatformImport/javaTransitiveOnMPP/build.gradle

@@ -6,6 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        {{extraPluginDependencies}}
     }
 }
 

idea/testData/gradle/newMultiplatformImport/jvmWithJava/build.gradle

@@ -5,6 +5,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        {{extraPluginDependencies}}
     }
 
 }

idea/testData/gradle/newMultiplatformImport/jvmWithJava/gradle.properties

@@ -1,4 +1,4 @@
-kotlin_version = 1.3.40
+kotlin_version = {{kotlin_plugin_version}}
 coroutines_version = 1.1.1
 moowork_node = 1.2.0
 

idea/testData/gradle/newMultiplatformImport/jvmWithJava/mpp-mod-a/build.gradle

@@ -1,23 +1,6 @@
 version '1.0.0'
 
 apply plugin: 'kotlin-multiplatform'
-apply plugin: 'maven-publish'
-apply plugin: 'kotlin-allopen'
-apply plugin: 'kotlin-noarg'
-
-buildscript {
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-noarg:$kotlin_version"
-    }
-    repositories {
-        {{kotlin_plugin_repositories}}
-    }
-}
-
-repositories {
-    {{kotlin_plugin_repositories}}
-}
 
 kotlin {
     jvm {

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

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

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

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

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

@@ -5,6 +5,7 @@ buildscript {
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+                {{extraPluginDependencies}}
     }
 }
 
@@ -12,10 +13,8 @@ repositories {
     {{kotlin_plugin_repositories}}
 }
 
-
 apply plugin: 'kotlin-multiplatform'
 
-
 kotlin {
     jvm()
     js()

idea/testData/gradle/newMultiplatformImport/productionOnTestFlag/build.gradle

@@ -5,6 +5,7 @@ subprojects {
         }
         dependencies {
             classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
+            {{extraPluginDependencies}}
         }
     }
  

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

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

idea/testData/gradle/newMultiplatformImport/runtimeClasspath/build.gradle

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

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

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

idea/testData/gradle/newMultiplatformImport/testTasks/build.gradle

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

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

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