From 38de98429d301d203d320b6eba7e909dc8a831ec Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Fri, 29 Nov 2019 13:57:21 +0300 Subject: [PATCH] Fix importing tests in bunch 183 --- ...ewMultiplatformProjectImportingTest.kt.183 | 118 +++++++++--------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt.183 b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt.183 index 83d26a83f54..aed1fd4dbff 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt.183 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt.183 @@ -6,23 +6,21 @@ 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.ResourceKotlinRootType -import org.jetbrains.kotlin.config.SourceKotlinRootType -import org.jetbrains.kotlin.config.TestResourceKotlinRootType -import org.jetbrains.kotlin.config.TestSourceKotlinRootType +import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase 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() { @@ -40,6 +38,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+") fun testProjectDependency() { configureByFiles() importProject() @@ -52,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" @@ -65,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) @@ -73,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) @@ -82,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) @@ -93,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) @@ -106,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) @@ -119,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) @@ -134,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) @@ -145,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) @@ -158,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) @@ -173,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) @@ -182,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) @@ -193,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) @@ -203,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) @@ -235,6 +234,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+") fun testUnresolvedDependency() { configureByFiles() importProject() @@ -254,6 +254,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+") fun testAndroidDependencyOnMPP() { configureByFiles() createProjectSubFile( @@ -295,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) @@ -309,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) @@ -337,20 +338,17 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin sourceFolder("shared/src/androidTest/kotlin", JavaSourceRootType.TEST_SOURCE) sourceFolder("shared/src/androidTest/resources", JavaResourceRootType.TEST_RESOURCE) } - var nativeVersion = when (gradleKotlinPluginVersion) { - MINIMAL_SUPPORTED_VERSION -> "1.3.10" - else -> "1.3.50" - } + 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) @@ -445,6 +443,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+") fun testNestedDependencies() { configureByFiles() importProject() @@ -453,18 +452,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) @@ -472,7 +471,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) @@ -483,22 +482,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) @@ -507,18 +506,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) @@ -527,6 +526,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+") fun testDetectAndroidSources() { configureByFiles() createProjectSubFile( @@ -548,6 +548,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) @@ -584,6 +585,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+") fun testProductionOnTestFlag() { configureByFiles() importProject(true)