diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt index d8d5f0aed3a..2a554ef5af9 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt @@ -13,12 +13,12 @@ import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleI import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.platform.konan.KonanPlatforms +import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions import org.junit.After import org.junit.Before import org.junit.Test class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() { - private fun kotlinVersion() = if (gradleKotlinPluginVersion == MINIMAL_SUPPORTED_VERSION) "1.3.50" else gradleKotlinPluginVersion @Before fun saveSdksBeforeTest() { @@ -36,6 +36,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+") fun testImportHMPPFlag() { configureByFiles() importProject() @@ -50,6 +51,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+") fun testImportIntermediateModules() { configureByFiles() importProject() @@ -59,7 +61,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("project.my-app.commonMain") { isHMPP(true) targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16, KonanPlatforms.defaultKonanPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) sourceFolder("src/commonMain/kotlin", SourceKotlinRootType) sourceFolder("src/commonMain/resources", ResourceKotlinRootType) } @@ -67,9 +69,9 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("project.my-app.commonTest") { isHMPP(true) targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16, KonanPlatforms.defaultKonanPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST) sourceFolder("src/commonTest/kotlin", TestSourceKotlinRootType) sourceFolder("src/commonTest/resources", TestResourceKotlinRootType) @@ -78,8 +80,8 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("project.my-app.jsMain") { isHMPP(true) targetPlatform(JsPlatforms.defaultJsPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE) moduleDependency("project.my-app.jvmAndJsMain", DependencyScope.COMPILE) moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.COMPILE) @@ -90,11 +92,11 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("project.my-app.jsTest") { isHMPP(true) targetPlatform(JsPlatforms.defaultJsPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-js:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-js:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonTest", DependencyScope.TEST) moduleDependency("project.my-app.jsMain", DependencyScope.TEST) @@ -109,7 +111,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("project.my-app.jvmAndJsMain") { isHMPP(true) targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE) sourceFolder("src/jvmAndJsMain/kotlin", SourceKotlinRootType) sourceFolder("src/jvmAndJsMain/resources", ResourceKotlinRootType) @@ -118,9 +120,9 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("project.my-app.jvmAndJsTest") { isHMPP(true) targetPlatform(JsPlatforms.defaultJsPlatform, JvmPlatforms.jvm16) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonTest", DependencyScope.TEST) moduleDependency("project.my-app.jvmAndJsMain", DependencyScope.TEST) @@ -131,8 +133,8 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("project.my-app.jvmMain") { isHMPP(true) targetPlatform(JvmPlatforms.jvm16) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.COMPILE) moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE) moduleDependency("project.my-app.jvmAndJsMain", DependencyScope.COMPILE) @@ -145,12 +147,12 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl targetPlatform(JvmPlatforms.jvm16) libraryDependency("Gradle: junit:junit:4.12", DependencyScope.TEST) libraryDependency("Gradle: org.hamcrest:hamcrest-core:1.3", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-junit:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test:${gradleKotlinPluginVersion}", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonTest", DependencyScope.TEST) @@ -164,7 +166,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("project.my-app.linuxAndJsMain") { isHMPP(true) targetPlatform(JsPlatforms.defaultJsPlatform, KonanPlatforms.defaultKonanPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE) sourceFolder("src/linuxAndJsMain/kotlin", SourceKotlinRootType) sourceFolder("src/linuxAndJsMain/resources", ResourceKotlinRootType) @@ -175,9 +177,9 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl targetPlatform(JsPlatforms.defaultJsPlatform, KonanPlatforms.defaultKonanPlatform) sourceFolder("src/linuxAndJsTest/kotlin", TestSourceKotlinRootType) sourceFolder("src/linuxAndJsTest/resources", TestResourceKotlinRootType) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonTest", DependencyScope.TEST) moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.TEST) @@ -186,13 +188,13 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("project.my-app.linuxX64Main") { isHMPP(true) targetPlatform(KonanPlatforms.defaultKonanPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) - libraryDependency("Kotlin/Native ${kotlinVersion()} - builtin [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - iconv [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - linux [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - posix [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - stdlib", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - zlib [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - builtin [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - iconv [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - linux [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - posix [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - stdlib", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - zlib [linux_x64]", DependencyScope.PROVIDED) moduleDependency("project.my-app.commonMain", DependencyScope.COMPILE) moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.COMPILE) sourceFolder("src/linuxX64Main/kotlin", SourceKotlinRootType) @@ -202,15 +204,15 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("project.my-app.linuxX64Test") { isHMPP(true) targetPlatform(KonanPlatforms.defaultKonanPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Kotlin/Native ${kotlinVersion()} - builtin [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - iconv [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - linux [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - posix [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - stdlib", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - zlib [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-test-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - builtin [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - iconv [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - linux [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - posix [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - stdlib", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - zlib [linux_x64]", DependencyScope.PROVIDED) moduleDependency("project.my-app.commonMain", DependencyScope.TEST) moduleDependency("project.my-app.commonTest", DependencyScope.TEST) moduleDependency("project.my-app.linuxAndJsMain", DependencyScope.TEST) @@ -223,6 +225,7 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+") fun testJvmWithJavaOnHMPP() { configureByFiles() importProject() @@ -306,12 +309,12 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl module("jvm-on-mpp.hmpp-mod-a.linuxX64Main") { moduleDependency("jvm-on-mpp.hmpp-mod-a.commonMain", DependencyScope.COMPILE) moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxAndJsMain", DependencyScope.COMPILE) - libraryDependency("Kotlin/Native ${kotlinVersion()} - builtin [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - iconv [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - linux [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - posix [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - stdlib", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - zlib [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - builtin [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - iconv [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - linux [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - posix [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - stdlib", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - zlib [linux_x64]", DependencyScope.PROVIDED) } module("jvm-on-mpp.hmpp-mod-a.linuxX64Test") { moduleDependency("jvm-on-mpp.hmpp-mod-a.commonMain", DependencyScope.TEST) @@ -319,12 +322,12 @@ class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradl moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxAndJsMain", DependencyScope.TEST) moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxAndJsTest", DependencyScope.TEST) moduleDependency("jvm-on-mpp.hmpp-mod-a.linuxX64Main", DependencyScope.TEST) - libraryDependency("Kotlin/Native ${kotlinVersion()} - builtin [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - iconv [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - linux [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - posix [linux_x64]", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - stdlib", DependencyScope.PROVIDED) - libraryDependency("Kotlin/Native ${kotlinVersion()} - zlib [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - builtin [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - iconv [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - linux [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - posix [linux_x64]", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - stdlib", DependencyScope.PROVIDED) + libraryDependency("Kotlin/Native ${gradleKotlinPluginVersion} - zlib [linux_x64]", DependencyScope.PROVIDED) } module("jvm-on-mpp.hmpp-mod-a.main") {} module("jvm-on-mpp.hmpp-mod-a.test") {} diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt index 338edd60e9a..a0ef81ee1c7 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle import com.intellij.openapi.roots.DependencyScope +import com.intellij.util.text.VersionComparatorUtil import org.jetbrains.jps.model.java.JavaResourceRootType import org.jetbrains.jps.model.java.JavaSourceRootType import org.jetbrains.kotlin.config.* @@ -14,12 +15,12 @@ import org.jetbrains.kotlin.platform.CommonPlatforms import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions import org.junit.After import org.junit.Before import org.junit.Test class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() { - private fun kotlinVersion() = if (gradleKotlinPluginVersion == MINIMAL_SUPPORTED_VERSION) "1.3.10" else gradleKotlinPluginVersion @Before fun saveSdksBeforeTest() { @@ -37,6 +38,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+") fun testProjectDependency() { configureByFiles() importProject() @@ -49,7 +51,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin "project", "app", "lib" -> additionalArguments(null) "app_jvmMain", "app_jvmTest", "lib_jvmMain", "lib_jvmTest" -> additionalArguments( - if (gradleKotlinPluginVersion == MINIMAL_SUPPORTED_VERSION) + if (VersionComparatorUtil.compare(gradleKotlinPluginVersion, "1.3.50") < 0) "-version" else "-Xallow-no-source-files" @@ -62,7 +64,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin module("app") module("app_commonMain") { platform(CommonPlatforms.defaultCommonPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("lib_commonMain", DependencyScope.COMPILE) sourceFolder("app/src/commonMain/kotlin", SourceKotlinRootType) sourceFolder("app/src/commonMain/resources", ResourceKotlinRootType) @@ -70,7 +72,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("app_commonTest") { platform(CommonPlatforms.defaultCommonPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("lib_commonMain", DependencyScope.TEST) moduleDependency("app_commonMain", DependencyScope.TEST) sourceFolder("app/src/commonTest/kotlin", TestSourceKotlinRootType) @@ -79,8 +81,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("app_jsMain") { platform(JsPlatforms.defaultJsPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${kotlinVersion()}", DependencyScope.COMPILE) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("lib_jsMain", DependencyScope.COMPILE) moduleDependency("lib_commonMain", DependencyScope.COMPILE) moduleDependency("app_commonMain", DependencyScope.COMPILE) @@ -90,8 +92,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("app_jsTest") { platform(JsPlatforms.defaultJsPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("lib_jsMain", DependencyScope.TEST) moduleDependency("lib_commonMain", DependencyScope.TEST) moduleDependency("app_commonMain", DependencyScope.TEST) @@ -103,8 +105,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("app_jvmMain") { platform(JvmPlatforms.jvm16) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.COMPILE) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.COMPILE) moduleDependency("lib_jvmMain", DependencyScope.COMPILE) moduleDependency("lib_commonMain", DependencyScope.COMPILE) @@ -116,8 +118,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("app_jvmTest") { platform(JvmPlatforms.jvm16) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.TEST) moduleDependency("lib_jvmMain", DependencyScope.TEST) moduleDependency("lib_commonMain", DependencyScope.TEST) @@ -131,8 +133,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("app_main") { platform(JvmPlatforms.jvm18) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.COMPILE) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.COMPILE) moduleDependency("lib_commonMain", DependencyScope.COMPILE) sourceFolder("app/src/main/java", JavaSourceRootType.SOURCE) @@ -142,8 +144,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("app_test") { platform(JvmPlatforms.jvm18) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.TEST) moduleDependency("lib_commonMain", DependencyScope.TEST) moduleDependency("app_main", DependencyScope.TEST) @@ -155,14 +157,14 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin module("lib") module("lib_commonMain") { platform(CommonPlatforms.defaultCommonPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) sourceFolder("lib/src/commonMain/kotlin", SourceKotlinRootType) sourceFolder("lib/src/commonMain/resources", ResourceKotlinRootType) inheritProjectOutput() } module("lib_commonTest") { platform(CommonPlatforms.defaultCommonPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("lib_commonMain", DependencyScope.TEST) sourceFolder("lib/src/commonTest/kotlin", TestSourceKotlinRootType) sourceFolder("lib/src/commonTest/resources", TestResourceKotlinRootType) @@ -170,8 +172,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("lib_jsMain") { platform(JsPlatforms.defaultJsPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${kotlinVersion()}", DependencyScope.COMPILE) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("lib_commonMain", DependencyScope.COMPILE) sourceFolder("lib/src/jsMain/kotlin", SourceKotlinRootType) sourceFolder("lib/src/jsMain/resources", ResourceKotlinRootType) @@ -179,8 +181,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("lib_jsTest") { platform(JsPlatforms.defaultJsPlatform) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("lib_commonMain", DependencyScope.TEST) moduleDependency("lib_commonTest", DependencyScope.TEST) moduleDependency("lib_jsMain", DependencyScope.TEST) @@ -190,8 +192,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("lib_jvmMain") { platform(JvmPlatforms.jvm16) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.COMPILE) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.COMPILE) moduleDependency("lib_commonMain", DependencyScope.COMPILE) sourceFolder("lib/src/jvmMain/kotlin", JavaSourceRootType.SOURCE) @@ -200,8 +202,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("lib_jvmTest") { platform(JvmPlatforms.jvm16) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.TEST) moduleDependency("lib_commonTest", DependencyScope.TEST) moduleDependency("lib_commonMain", DependencyScope.TEST) @@ -232,6 +234,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+") fun testUnresolvedDependency() { configureByFiles() importProject() @@ -251,6 +254,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+") fun testAndroidDependencyOnMPP() { configureByFiles() createProjectSubFile( @@ -292,11 +296,11 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin libraryDependency("Gradle: org.hamcrest:hamcrest-integration:1.3@jar", DependencyScope.TEST) libraryDependency("Gradle: org.hamcrest:hamcrest-library:1.3@jar", DependencyScope.TEST) if (gradleKotlinPluginVersion != MINIMAL_SUPPORTED_VERSION) { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:${kotlinVersion()}@jar", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:${gradleKotlinPluginVersion}@jar", DependencyScope.COMPILE) } - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}@jar", DependencyScope.COMPILE) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVersion()}@jar", DependencyScope.COMPILE) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}@jar", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}@jar", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:${gradleKotlinPluginVersion}@jar", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}@jar", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains:annotations:13.0@jar", DependencyScope.COMPILE) moduleDependency("shared", DependencyScope.COMPILE) moduleDependency("shared_androidMain", DependencyScope.COMPILE) @@ -306,27 +310,27 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("shared") module("shared_commonMain") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) sourceFolder("shared/src/commonMain/kotlin", SourceKotlinRootType) sourceFolder("shared/src/commonMain/resources", ResourceKotlinRootType) } module("shared_commonTest") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("shared_commonMain", DependencyScope.TEST) sourceFolder("shared/src/commonTest/kotlin", TestSourceKotlinRootType) sourceFolder("shared/src/commonTest/resources", TestResourceKotlinRootType) } module("shared_androidMain") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.COMPILE) moduleDependency("shared_commonMain", DependencyScope.COMPILE) sourceFolder("shared/src/androidMain/kotlin", JavaSourceRootType.SOURCE) sourceFolder("shared/src/androidMain/resources", JavaResourceRootType.RESOURCE) } module("shared_androidTest") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${gradleKotlinPluginVersion}", DependencyScope.TEST) libraryDependency("Gradle: org.jetbrains:annotations:13.0", DependencyScope.TEST) moduleDependency("shared_androidMain", DependencyScope.TEST) moduleDependency("shared_commonMain", DependencyScope.TEST) @@ -334,17 +338,17 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin sourceFolder("shared/src/androidTest/kotlin", JavaSourceRootType.TEST_SOURCE) sourceFolder("shared/src/androidTest/resources", JavaResourceRootType.TEST_RESOURCE) } - var nativeVersion = kotlinVersion() + var nativeVersion = gradleKotlinPluginVersion module("shared_iOSMain") { libraryDependency("Kotlin/Native $nativeVersion - stdlib", DependencyScope.PROVIDED) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("shared_commonMain", DependencyScope.COMPILE) sourceFolder("shared/src/iOSMain/kotlin", SourceKotlinRootType) sourceFolder("shared/src/iOSMain/resources", ResourceKotlinRootType) } module("shared_iOSTest") { libraryDependency("Kotlin/Native $nativeVersion - stdlib", DependencyScope.PROVIDED) - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("shared_iOSMain", DependencyScope.TEST) moduleDependency("shared_commonMain", DependencyScope.TEST) moduleDependency("shared_commonTest", DependencyScope.TEST) @@ -395,8 +399,8 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } - //TODObub(auskov): enable this test after publishing new api in gradle plugin - //@Test + @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+") fun testImportTestsAndTargets() { configureByFiles() importProject() @@ -407,7 +411,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin module("project_commonTest") { externalSystemTestTask("jsBrowserTest", "project:jsTest", "js") externalSystemTestTask("jsNodeTest", "project:jsTest", "js") - externalSystemTestTask("test", "project:jvmTest", "jvm") + externalSystemTestTask("jvmTest", "project:jvmTest", "jvm") } module("project_jsMain") module("project_jsTest") { @@ -416,13 +420,14 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("project_jvmMain") module("project_jvmTest") { - externalSystemTestTask("test", "project:jvmTest", "jvm") + externalSystemTestTask("jvmTest", "project:jvmTest", "jvm") } } } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+") fun testSingleAndroidTarget() { configureByFiles() importProject() @@ -479,6 +484,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+") fun testDependencyOnRoot() { configureByFiles() importProject() @@ -523,6 +529,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+") fun testNestedDependencies() { configureByFiles() importProject() @@ -531,18 +538,18 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin module("project") module("aaa") module("aaa_commonMain") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("bbb_commonMain", DependencyScope.COMPILE) moduleDependency("ccc_commonMain", DependencyScope.COMPILE) } module("aaa_commonTest") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("aaa_commonMain", DependencyScope.TEST) moduleDependency("bbb_commonMain", DependencyScope.TEST) moduleDependency("ccc_commonMain", DependencyScope.TEST) } module("aaa_jvmMain") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("aaa_commonMain", DependencyScope.COMPILE) moduleDependency("bbb_commonMain", DependencyScope.COMPILE) moduleDependency("bbb_jvmMain", DependencyScope.COMPILE) @@ -550,7 +557,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin moduleDependency("ccc_jvmMain", DependencyScope.COMPILE) } module("aaa_jvmTest") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("aaa_commonMain", DependencyScope.TEST) moduleDependency("aaa_commonTest", DependencyScope.TEST) moduleDependency("aaa_jvmMain", DependencyScope.TEST) @@ -561,22 +568,22 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("bbb") module("bbb_commonMain") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("ccc_commonMain", DependencyScope.COMPILE) } module("bbb_commonTest") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("bbb_commonMain", DependencyScope.TEST) moduleDependency("ccc_commonMain", DependencyScope.TEST) } module("bbb_jvmMain") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("bbb_commonMain", DependencyScope.COMPILE) moduleDependency("ccc_commonMain", DependencyScope.COMPILE) moduleDependency("ccc_jvmMain", DependencyScope.COMPILE) } module("bbb_jvmTest") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("bbb_commonMain", DependencyScope.TEST) moduleDependency("bbb_commonTest", DependencyScope.TEST) moduleDependency("bbb_jvmMain", DependencyScope.TEST) @@ -585,18 +592,18 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } module("ccc") module("ccc_commonMain") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) } module("ccc_commonTest") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("ccc_commonMain", DependencyScope.TEST) } module("ccc_jvmMain") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.COMPILE) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.COMPILE) moduleDependency("ccc_commonMain", DependencyScope.COMPILE) } module("ccc_jvmTest") { - libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}", DependencyScope.TEST) + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${gradleKotlinPluginVersion}", DependencyScope.TEST) moduleDependency("ccc_commonMain", DependencyScope.TEST) moduleDependency("ccc_commonTest", DependencyScope.TEST) moduleDependency("ccc_jvmMain", DependencyScope.TEST) @@ -605,6 +612,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+") fun testDetectAndroidSources() { configureByFiles() createProjectSubFile( @@ -626,6 +634,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin * dependencies in multiplatform project included in composite build */ @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+") fun testPlatformToCommonExpByInComposite() { configureByFiles() importProject(true) @@ -665,6 +674,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin * Test case for issue https://youtrack.jetbrains.com/issue/KT-29757 */ @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.40+") fun testJavaTransitiveOnMPP() { configureByFiles() importProject(true) @@ -726,6 +736,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin * Test case for issue https://youtrack.jetbrains.com/issue/KT-28822 */ @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.41+") fun testImportBeforeBuild() { configureByFiles() importProject(true) @@ -788,6 +799,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+") fun testProductionOnTestFlag() { configureByFiles() importProject(true) @@ -852,6 +864,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+") fun testCommonTestTargetPlatform() { configureByFiles() importProject(true) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt index c56fc4dd5c7..58907a239c3 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt @@ -36,13 +36,13 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes var gradleKotlinPluginVersionType: String = MINIMAL_SUPPORTED_VERSION val gradleKotlinPluginVersion: String - get() = KOTLIN_GRADLE_PLUGIN_VERSION_DESCRIPTION_TO_VERSION[gradleKotlinPluginVersionType] ?: gradleKotlinPluginVersion + get() = KOTLIN_GRADLE_PLUGIN_VERSION_DESCRIPTION_TO_VERSION[gradleKotlinPluginVersionType] ?: gradleKotlinPluginVersionType companion object { const val MINIMAL_SUPPORTED_VERSION = "minimal"// minimal supported version const val LATEST_STABLE_VERSUON = "latest stable" const val LATEST_SUPPORTED_VERSION = "master"// gradle plugin from current build - private val KOTLIN_GRADLE_PLUGIN_VERSIONS = listOf(MINIMAL_SUPPORTED_VERSION, LATEST_STABLE_VERSUON, LATEST_SUPPORTED_VERSION) + private val KOTLIN_GRADLE_PLUGIN_VERSIONS = listOf(MINIMAL_SUPPORTED_VERSION, LATEST_STABLE_VERSUON/*, LATEST_SUPPORTED_VERSION*/) private val KOTLIN_GRADLE_PLUGIN_VERSION_DESCRIPTION_TO_VERSION = mapOf( MINIMAL_SUPPORTED_VERSION to MINIMAL_SUPPORTED_GRADLE_PLUGIN_VERSION, LATEST_STABLE_VERSUON to LATEST_STABLE_GRADLE_PLUGIN_VERSION, @@ -63,21 +63,18 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes } } - override fun configureByFiles(): List { - val result = ArrayList(super.configureByFiles()) - result.add( - createProjectSubFile( - "include.gradle", """ -String gradleKotlinPluginVersion(String defaultVersion) { - return ${if (gradleKotlinPluginVersion.isEmpty() || MINIMAL_SUPPORTED_VERSION == gradleKotlinPluginVersion) "defaultVersion;" else "\"$gradleKotlinPluginVersion\""} -} -ext { - gradleKotlinPluginVersion = this.&gradleKotlinPluginVersion -} -""" - ) - ) - return result + override fun configureByFiles(properties: Map?): List { + val unitedProperties = HashMap(properties ?: emptyMap()) + unitedProperties["kotlin_plugin_version"] = gradleKotlinPluginVersion + unitedProperties["kotlin_plugin_repositories"] = """ + google() + jcenter() + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' } + mavenLocal() + //maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } + """.trimIndent() + return super.configureByFiles(unitedProperties) } } diff --git a/idea/testData/gradle/hierarchicalMultiplatformImport/importHMPPFlag/build.gradle.kts b/idea/testData/gradle/hierarchicalMultiplatformImport/importHMPPFlag/build.gradle.kts index 24e2dfa3b4b..7169fd22c85 100644 --- a/idea/testData/gradle/hierarchicalMultiplatformImport/importHMPPFlag/build.gradle.kts +++ b/idea/testData/gradle/hierarchicalMultiplatformImport/importHMPPFlag/build.gradle.kts @@ -1,6 +1,5 @@ plugins { - // TODO parametrization - kotlin("multiplatform").version("1.3.50") + kotlin("multiplatform").version("{{kotlin_plugin_version}}") } repositories { diff --git a/idea/testData/gradle/hierarchicalMultiplatformImport/importIntermediateModules/build.gradle.kts b/idea/testData/gradle/hierarchicalMultiplatformImport/importIntermediateModules/build.gradle.kts index afc1605f08a..534b87c8267 100644 --- a/idea/testData/gradle/hierarchicalMultiplatformImport/importIntermediateModules/build.gradle.kts +++ b/idea/testData/gradle/hierarchicalMultiplatformImport/importIntermediateModules/build.gradle.kts @@ -1,6 +1,5 @@ plugins { - // TODO parametrization - kotlin("multiplatform").version("1.3.50") + kotlin("multiplatform").version("{{kotlin_plugin_version}}") } repositories { diff --git a/idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/gradle.properties b/idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/gradle.properties index f2f647ed7b5..5a4435de063 100644 --- a/idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/gradle.properties +++ b/idea/testData/gradle/hierarchicalMultiplatformImport/jvmWithJavaOnHMPP/gradle.properties @@ -1,4 +1,4 @@ -kotlin_version = 1.3.50 +kotlin_version = {{kotlin_plugin_version}} coroutines_version = 1.1.1 moowork_node = 1.2.0 diff --git a/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/build.gradle b/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/build.gradle index 1e5f598222b..c2ab298d949 100644 --- a/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/build.gradle +++ b/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/build.gradle @@ -1,6 +1,5 @@ buildscript { - apply from: "include.gradle" - ext.kotlin_version = gradleKotlinPluginVersion('1.3.10') + ext.kotlin_version = '{{kotlin_plugin_version}}' repositories { google() jcenter() diff --git a/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/build.gradle b/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/build.gradle index 1e5f598222b..c2ab298d949 100644 --- a/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/build.gradle +++ b/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/build.gradle @@ -1,6 +1,5 @@ buildscript { - apply from: "include.gradle" - ext.kotlin_version = gradleKotlinPluginVersion('1.3.10') + ext.kotlin_version = '{{kotlin_plugin_version}}' repositories { google() jcenter() diff --git a/idea/testData/gradle/multiplatform/dependenciesReachableViaImpl/build.gradle b/idea/testData/gradle/multiplatform/dependenciesReachableViaImpl/build.gradle index 392870c79cf..d5b7cac9e23 100644 --- a/idea/testData/gradle/multiplatform/dependenciesReachableViaImpl/build.gradle +++ b/idea/testData/gradle/multiplatform/dependenciesReachableViaImpl/build.gradle @@ -4,9 +4,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.1.0') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } diff --git a/idea/testData/gradle/multiplatform/jsProductionOutputFile/build.gradle b/idea/testData/gradle/multiplatform/jsProductionOutputFile/build.gradle index 9d155d119af..84284b3ed3a 100644 --- a/idea/testData/gradle/multiplatform/jsProductionOutputFile/build.gradle +++ b/idea/testData/gradle/multiplatform/jsProductionOutputFile/build.gradle @@ -5,9 +5,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.1.51') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/idea/testData/gradle/multiplatform/jsTestOutputFile/build.gradle b/idea/testData/gradle/multiplatform/jsTestOutputFile/build.gradle index 9d155d119af..84284b3ed3a 100644 --- a/idea/testData/gradle/multiplatform/jsTestOutputFile/build.gradle +++ b/idea/testData/gradle/multiplatform/jsTestOutputFile/build.gradle @@ -5,9 +5,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.1.51') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle b/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle index 4e8642eb0c2..1ac6fae1168 100644 --- a/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle +++ b/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle @@ -5,9 +5,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.1.51') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/idea/testData/gradle/multiplatform/multiProject/build.gradle b/idea/testData/gradle/multiplatform/multiProject/build.gradle index fd8a740e378..76a49f23c1e 100644 --- a/idea/testData/gradle/multiplatform/multiProject/build.gradle +++ b/idea/testData/gradle/multiplatform/multiProject/build.gradle @@ -4,9 +4,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.1.0') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } diff --git a/idea/testData/gradle/multiplatform/platformToCommonDependency/build.gradle b/idea/testData/gradle/multiplatform/platformToCommonDependency/build.gradle index d0e158bbf2d..23799096aa0 100644 --- a/idea/testData/gradle/multiplatform/platformToCommonDependency/build.gradle +++ b/idea/testData/gradle/multiplatform/platformToCommonDependency/build.gradle @@ -4,9 +4,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.1.0') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } diff --git a/idea/testData/gradle/multiplatform/platformToCommonDependencyRoot/build.gradle b/idea/testData/gradle/multiplatform/platformToCommonDependencyRoot/build.gradle index 8cc4d4fa0c0..33c2d761cde 100644 --- a/idea/testData/gradle/multiplatform/platformToCommonDependencyRoot/build.gradle +++ b/idea/testData/gradle/multiplatform/platformToCommonDependencyRoot/build.gradle @@ -4,9 +4,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.1.0') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } diff --git a/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle b/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle index 53372814685..20fc85363d0 100644 --- a/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle +++ b/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle @@ -5,9 +5,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.2.60') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } diff --git a/idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle b/idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle index 3eeaa2f531c..8c655f65054 100644 --- a/idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle +++ b/idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle @@ -5,9 +5,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.2.41') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/idea/testData/gradle/multiplatform/transitiveImplement/build.gradle b/idea/testData/gradle/multiplatform/transitiveImplement/build.gradle index 5c4024ae4c2..19fa3de0d1c 100644 --- a/idea/testData/gradle/multiplatform/transitiveImplement/build.gradle +++ b/idea/testData/gradle/multiplatform/transitiveImplement/build.gradle @@ -4,9 +4,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.1.51') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } diff --git a/idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle b/idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle index 837e6e4fdbd..61c6e1664fb 100644 --- a/idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle +++ b/idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle @@ -5,9 +5,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.1.51') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/build.gradle b/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/build.gradle index 91f25182773..3fcb45eef6e 100644 --- a/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/build.gradle +++ b/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/build.gradle @@ -4,9 +4,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.2.31') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } diff --git a/idea/testData/gradle/nativeLibraries/legacyLibrariesNaming/build.gradle.kts b/idea/testData/gradle/nativeLibraries/legacyLibrariesNaming/build.gradle.kts index 01a72715cf4..3f34ab4878d 100644 --- a/idea/testData/gradle/nativeLibraries/legacyLibrariesNaming/build.gradle.kts +++ b/idea/testData/gradle/nativeLibraries/legacyLibrariesNaming/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.20" + kotlin("multiplatform") version "{{kotlin_plugin_version}}" } repositories { diff --git a/idea/testData/gradle/nativeLibraries/librariesNaming/build.gradle.kts b/idea/testData/gradle/nativeLibraries/librariesNaming/build.gradle.kts index 55a69e21a0e..3f34ab4878d 100644 --- a/idea/testData/gradle/nativeLibraries/librariesNaming/build.gradle.kts +++ b/idea/testData/gradle/nativeLibraries/librariesNaming/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.3.21" + kotlin("multiplatform") version "{{kotlin_plugin_version}}" } repositories { diff --git a/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/app/build.gradle b/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/app/build.gradle index ff1e59366de..3493d770543 100644 --- a/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/app/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/app/build.gradle @@ -22,8 +22,7 @@ android { } } -apply from: "../include.gradle" -def kotlinVersion = gradleKotlinPluginVersion('1.3.10') +def kotlinVersion = '{{kotlin_plugin_version}}' dependencies { diff --git a/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/build.gradle b/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/build.gradle index 38c087d7d15..616fd2d7726 100644 --- a/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/build.gradle @@ -1,10 +1,7 @@ buildscript { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.10') + def kotlinVersion = '{{kotlin_plugin_version}}' repositories { - google() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } dependencies { classpath 'com.android.tools.build:gradle:3.2.0' diff --git a/idea/testData/gradle/newMultiplatformImport/commonTestTargetPlatform/build.gradle b/idea/testData/gradle/newMultiplatformImport/commonTestTargetPlatform/build.gradle index 7388a0ca6b5..1d93a1c6fb2 100644 --- a/idea/testData/gradle/newMultiplatformImport/commonTestTargetPlatform/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/commonTestTargetPlatform/build.gradle @@ -1,15 +1,9 @@ buildscript { repositories { - mavenLocal() - jcenter() - mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } - maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.50') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } apply plugin: 'kotlin-multiplatform' diff --git a/idea/testData/gradle/newMultiplatformImport/dependencyOnRoot/build.gradle b/idea/testData/gradle/newMultiplatformImport/dependencyOnRoot/build.gradle index 4774e50762f..d4255e10a4a 100644 --- a/idea/testData/gradle/newMultiplatformImport/dependencyOnRoot/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/dependencyOnRoot/build.gradle @@ -1,19 +1,15 @@ buildscript { repositories { - mavenLocal() - jcenter() + {{kotlin_plugin_repositories}} } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.10') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } allprojects { repositories { - mavenLocal() - jcenter() + {{kotlin_plugin_repositories}} } } diff --git a/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/build.gradle b/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/build.gradle index d23ccec482f..b26e84e6834 100644 --- a/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/build.gradle @@ -1,14 +1,10 @@ buildscript { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.21') + def kotlinVersion = "{{kotlin_plugin_version}}" ext.kotlin_version = "$kotlinVersion" repositories { - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } - - google() - jcenter() + {{kotlin_plugin_repositories}} } dependencies { @@ -19,11 +15,7 @@ buildscript { allprojects { repositories { - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } - - google() - jcenter() - + {{kotlin_plugin_repositories}} } } diff --git a/idea/testData/gradle/newMultiplatformImport/fileCollectionDependency/build.gradle b/idea/testData/gradle/newMultiplatformImport/fileCollectionDependency/build.gradle index 61eddfadff3..67e50c2fa89 100644 --- a/idea/testData/gradle/newMultiplatformImport/fileCollectionDependency/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/fileCollectionDependency/build.gradle @@ -1,21 +1,15 @@ buildscript { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.10') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } allprojects { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } } diff --git a/idea/testData/gradle/newMultiplatformImport/importBeforeBuild/build.gradle b/idea/testData/gradle/newMultiplatformImport/importBeforeBuild/build.gradle index 6dadd848e12..30ff2ed311e 100644 --- a/idea/testData/gradle/newMultiplatformImport/importBeforeBuild/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/importBeforeBuild/build.gradle @@ -1,12 +1,10 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.41' apply false + id 'org.jetbrains.kotlin.jvm' version '{{kotlin_plugin_version}}' apply false } allprojects { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } } diff --git a/idea/testData/gradle/newMultiplatformImport/importTestsAndTargets/build.gradle b/idea/testData/gradle/newMultiplatformImport/importTestsAndTargets/build.gradle index c5a95df5858..8237ba52923 100644 --- a/idea/testData/gradle/newMultiplatformImport/importTestsAndTargets/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/importTestsAndTargets/build.gradle @@ -1,11 +1,8 @@ plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.3.50' + id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}' } repositories { - mavenLocal() - maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } - mavenCentral() - + {{kotlin_plugin_repositories}} } diff --git a/idea/testData/gradle/newMultiplatformImport/importTestsAndTargets/settings.gradle b/idea/testData/gradle/newMultiplatformImport/importTestsAndTargets/settings.gradle index 775de056c30..74b4775b32e 100644 --- a/idea/testData/gradle/newMultiplatformImport/importTestsAndTargets/settings.gradle +++ b/idea/testData/gradle/newMultiplatformImport/importTestsAndTargets/settings.gradle @@ -1,15 +1,6 @@ pluginManagement { repositories { - - mavenLocal() - - maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } - - mavenCentral() - - maven { url 'https://plugins.gradle.org/m2/' } - - + {{kotlin_plugin_repositories}} } } rootProject.name = 'project' diff --git a/idea/testData/gradle/newMultiplatformImport/javaTransitiveOnMPP/build.gradle b/idea/testData/gradle/newMultiplatformImport/javaTransitiveOnMPP/build.gradle index af5e845cac5..85ba1508557 100644 --- a/idea/testData/gradle/newMultiplatformImport/javaTransitiveOnMPP/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/javaTransitiveOnMPP/build.gradle @@ -1,10 +1,8 @@ buildscript { - ext.kotlin_version = '1.3.41' + ext.kotlin_version = '{{kotlin_plugin_version}}' 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" @@ -13,8 +11,6 @@ buildscript { subprojects { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } } \ No newline at end of file diff --git a/idea/testData/gradle/newMultiplatformImport/jvmWithJava/build.gradle b/idea/testData/gradle/newMultiplatformImport/jvmWithJava/build.gradle index f5f2e2bbcfe..489557d20eb 100644 --- a/idea/testData/gradle/newMultiplatformImport/jvmWithJava/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/jvmWithJava/build.gradle @@ -1,8 +1,6 @@ buildscript { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } dependencies { @@ -13,9 +11,7 @@ buildscript { allprojects { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } } diff --git a/idea/testData/gradle/newMultiplatformImport/jvmWithJava/jvm-mod/build.gradle b/idea/testData/gradle/newMultiplatformImport/jvmWithJava/jvm-mod/build.gradle index 7ec6685c369..4be2cc7d141 100644 --- a/idea/testData/gradle/newMultiplatformImport/jvmWithJava/jvm-mod/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/jvmWithJava/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 { diff --git a/idea/testData/gradle/newMultiplatformImport/jvmWithJava/mpp-mod-a/build.gradle b/idea/testData/gradle/newMultiplatformImport/jvmWithJava/mpp-mod-a/build.gradle index 0787802eb99..d4b441305e8 100644 --- a/idea/testData/gradle/newMultiplatformImport/jvmWithJava/mpp-mod-a/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/jvmWithJava/mpp-mod-a/build.gradle @@ -11,16 +11,12 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-noarg:$kotlin_version" } 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 { diff --git a/idea/testData/gradle/newMultiplatformImport/jvmWithJava/settings.gradle b/idea/testData/gradle/newMultiplatformImport/jvmWithJava/settings.gradle index 166cd35252a..ec9df0c7e7c 100644 --- a/idea/testData/gradle/newMultiplatformImport/jvmWithJava/settings.gradle +++ b/idea/testData/gradle/newMultiplatformImport/jvmWithJava/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' diff --git a/idea/testData/gradle/newMultiplatformImport/kaptPaths/build.gradle b/idea/testData/gradle/newMultiplatformImport/kaptPaths/build.gradle index 40c71a3233a..85dcf0f43ac 100644 --- a/idea/testData/gradle/newMultiplatformImport/kaptPaths/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/kaptPaths/build.gradle @@ -1,13 +1,10 @@ buildscript { repositories { - mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.50') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } @@ -16,8 +13,7 @@ apply plugin: 'kotlin-kapt' repositories { - mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } kotlin { diff --git a/idea/testData/gradle/newMultiplatformImport/nestedDependencies/build.gradle b/idea/testData/gradle/newMultiplatformImport/nestedDependencies/build.gradle index 09249e0d4c9..c6f48f69871 100644 --- a/idea/testData/gradle/newMultiplatformImport/nestedDependencies/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/nestedDependencies/build.gradle @@ -1,20 +1,14 @@ buildscript { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.10') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } allprojects { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } } diff --git a/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle b/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle index 1cc0a70f3a6..ec5c0bc38aa 100644 --- a/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle @@ -1,13 +1,10 @@ buildscript { repositories { - mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.20') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } @@ -15,6 +12,5 @@ apply plugin: 'kotlin-multiplatform' repositories { - mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } diff --git a/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/toInclude/build.gradle b/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/toInclude/build.gradle index acfc6ddc68f..74d41b87a05 100644 --- a/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/toInclude/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/toInclude/build.gradle @@ -1,20 +1,15 @@ buildscript { repositories { - mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "../include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.20') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } repositories { - mavenCentral() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } diff --git a/idea/testData/gradle/newMultiplatformImport/productionOnTestFlag/build.gradle b/idea/testData/gradle/newMultiplatformImport/productionOnTestFlag/build.gradle index 842170d06ce..da98dbcff35 100644 --- a/idea/testData/gradle/newMultiplatformImport/productionOnTestFlag/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/productionOnTestFlag/build.gradle @@ -1,16 +1,14 @@ subprojects { buildscript { repositories { - mavenLocal() - mavenCentral() + {{kotlin_plugin_repositories}} } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}" } } repositories { - mavenLocal() - mavenCentral() + {{kotlin_plugin_repositories}} } } diff --git a/idea/testData/gradle/newMultiplatformImport/projectDependency/build.gradle b/idea/testData/gradle/newMultiplatformImport/projectDependency/build.gradle index 6f47e25c09d..2c434e2b04a 100644 --- a/idea/testData/gradle/newMultiplatformImport/projectDependency/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/projectDependency/build.gradle @@ -1,20 +1,14 @@ buildscript { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.10') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } allprojects { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } } diff --git a/idea/testData/gradle/newMultiplatformImport/runtimeClasspath/build.gradle b/idea/testData/gradle/newMultiplatformImport/runtimeClasspath/build.gradle index 40c71a3233a..85dcf0f43ac 100644 --- a/idea/testData/gradle/newMultiplatformImport/runtimeClasspath/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/runtimeClasspath/build.gradle @@ -1,13 +1,10 @@ buildscript { repositories { - mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.50') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } @@ -16,8 +13,7 @@ apply plugin: 'kotlin-kapt' repositories { - mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } kotlin { diff --git a/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/app/build.gradle b/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/app/build.gradle index 33052cb2355..86074984db2 100644 --- a/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/app/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/app/build.gradle @@ -1,22 +1,16 @@ buildscript { repositories { - mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "../include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.50') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } apply plugin: 'kotlin-multiplatform' repositories { - google() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } - mavenCentral() + {{kotlin_plugin_repositories}} } apply plugin: 'com.android.application' apply plugin: 'kotlin-android-extensions' diff --git a/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/build.gradle b/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/build.gradle index 48f8cec3fc4..97d1d5c6896 100644 --- a/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/build.gradle @@ -1,13 +1,11 @@ buildscript { repositories { - google() - jcenter() + {{kotlin_plugin_repositories}} } dependencies { classpath 'com.android.tools.build:gradle:3.2.1' } } repositories { - google() - jcenter() + {{kotlin_plugin_repositories}} } diff --git a/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/settings.gradle b/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/settings.gradle index 9f7e6e905f4..a4d37398e89 100644 --- a/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/settings.gradle +++ b/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/settings.gradle @@ -1,10 +1,7 @@ pluginManagement { repositories { - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } - - mavenCentral() - - maven { url 'https://plugins.gradle.org/m2/' } + {{kotlin_plugin_repositories}} } } + include ':app' diff --git a/idea/testData/gradle/newMultiplatformImport/testTasks/build.gradle b/idea/testData/gradle/newMultiplatformImport/testTasks/build.gradle index dc9fa5666a4..14338a8ce8e 100644 --- a/idea/testData/gradle/newMultiplatformImport/testTasks/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/testTasks/build.gradle @@ -1,13 +1,10 @@ buildscript { repositories { - mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.20') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } @@ -15,8 +12,7 @@ apply plugin: 'kotlin-multiplatform' repositories { - mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } kotlin { diff --git a/idea/testData/gradle/newMultiplatformImport/unresolvedDependency/build.gradle b/idea/testData/gradle/newMultiplatformImport/unresolvedDependency/build.gradle index 3d0d0cd4ac1..7898c64066d 100644 --- a/idea/testData/gradle/newMultiplatformImport/unresolvedDependency/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/unresolvedDependency/build.gradle @@ -1,21 +1,15 @@ buildscript { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.10') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } } allprojects { repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + {{kotlin_plugin_repositories}} } } diff --git a/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle b/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle index a9681723f95..3a83d3d6308 100644 --- a/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle +++ b/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle @@ -5,9 +5,7 @@ buildscript { } dependencies { - apply from: "include.gradle" - def kotlinVersion = gradleKotlinPluginVersion('1.3.20') - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}") } }