From ea0099aa395cc535fb2662706b55f631ca0122d8 Mon Sep 17 00:00:00 2001 From: Alexander Dudinsky Date: Tue, 4 Aug 2020 12:58:38 +0300 Subject: [PATCH] Fix testPlatformToCommonExpByInComposite. In 9d362875da6586d805156cbb19edd420d6038c11 build started fail if mpp or js targets not configured. The test testPlatformToCommonExpByInComposite was fixed due it. --- .../gradle/NewMultiplatformProjectImportingTest.kt | 12 ++++++++++++ .../platformToCommonExpByInComposite/build.gradle | 5 +++++ 2 files changed, 17 insertions(+) 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 7347ebc7257..e1b599ca285 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt @@ -657,6 +657,16 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin module("project.commonTest") { moduleDependency("project.commonMain", DependencyScope.TEST) } + module("project.jvmMain") { + moduleDependency("project.commonMain", DependencyScope.COMPILE) + } + module("project.jvmTest"){ + moduleDependency("project.commonMain", DependencyScope.TEST) + moduleDependency("project.commonTest", DependencyScope.TEST) + moduleDependency("project.jvmMain", DependencyScope.TEST) + moduleDependency("project.jvmMain", DependencyScope.RUNTIME) + } + module("toInclude") module("toInclude.commonMain") module("toInclude.commonTest") { @@ -670,6 +680,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin moduleDependency("toInclude.commonMain", DependencyScope.TEST) moduleDependency("toInclude.commonTest", DependencyScope.TEST) moduleDependency("toInclude.jsMain", DependencyScope.TEST) + moduleDependency("toInclude.jsMain", DependencyScope.RUNTIME) } module("toInclude.jvmMain") { moduleDependency("toInclude.commonMain", DependencyScope.COMPILE) @@ -678,6 +689,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin moduleDependency("toInclude.commonMain", DependencyScope.TEST) moduleDependency("toInclude.commonTest", DependencyScope.TEST) moduleDependency("toInclude.jvmMain", DependencyScope.TEST) + moduleDependency("toInclude.jvmMain", DependencyScope.RUNTIME) } } } diff --git a/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle b/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle index ec5c0bc38aa..a741b570fa6 100644 --- a/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle @@ -14,3 +14,8 @@ apply plugin: 'kotlin-multiplatform' repositories { {{kotlin_plugin_repositories}} } + +// +kotlin{ + jvm() +} \ No newline at end of file