From 157fb349ea91515a6dd99c590f73944966ff1ae1 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Mon, 12 Mar 2018 17:06:21 +0300
Subject: [PATCH] [gradle-plugin] Allow user to add several expectedBy
 dependencies

---
 .../plugin/KotlinNativePlatformPlugin.kt      |  5 ----
 .../test/MultiplatformSpecification.groovy    | 23 ++++++++-----------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinNativePlatformPlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinNativePlatformPlugin.kt
index 2cb00f947a9..214b66e4701 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinNativePlatformPlugin.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinNativePlatformPlugin.kt
@@ -25,11 +25,6 @@ open class KotlinNativePlatformPlugin: KotlinPlatformImplementationPluginBase("n
 
     protected fun addCommonProject(commonProject: Project, platformProject: Project) {
         commonProjects.add(commonProject)
-        if (commonProjects.size > 1) {
-            throw GradleException("Platform project $platformProject has more than one " +
-                    "'$EXPECTED_BY_CONFIG_NAME' dependency: ${commonProjects.joinToString()}")
-        }
-
         commonProject.whenEvaluated {
             if (!commonProject.pluginManager.hasPlugin("kotlin-platform-common")) {
                 throw GradleException("Platform project $platformProject has an " +
diff --git a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy
index 6f431bd4412..4c3ce3cb896 100644
--- a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy
+++ b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy
@@ -244,22 +244,22 @@ class MultiplatformSpecification extends BaseKonanSpecification {
         result.output.contains("dependency is not a project: ")
     }
 
-    def 'Build should fail if several common projects are added'() {
-        when:
+    def 'Build should support several expectedBy-dependencies'() {
+        expect:
         def project = KonanProject.createEmpty(projectDirectory) { KonanProject it ->
-            def commonDirectory = createCommonProject(it)
+            def commonDirectory = createCommonProject(it, "commonFoo")
             createCommonSource(commonDirectory,
                     ["src", "main", "kotlin"],
                     "common.kt",
-                    "fun foo(): Int = 0")
+                    "expect fun foo(): Int")
 
-            commonDirectory = createCommonProject(it, "common2")
+            commonDirectory = createCommonProject(it, "commonBar")
             createCommonSource(commonDirectory,
                     ["src", "main", "kotlin"],
                     "common.kt",
-                    "fun bar(): Int = 0")
+                    "expect fun bar(): Int")
 
-            it.generateSrcFile("platform.kt", "fun baz() = 0")
+            it.generateSrcFile("platform.kt", "actual fun foo() = 0\nactual fun bar() = 0")
             it.buildFile.append("""
                 konanArtifacts {
                     library('foo') {
@@ -268,15 +268,12 @@ class MultiplatformSpecification extends BaseKonanSpecification {
                 }
 
                 dependencies {
-                    expectedBy project(':common')
-                    expectedBy project(':common2')
+                    expectedBy project(':commonFoo')
+                    expectedBy project(':commonBar')
                 }
                 """.stripIndent())
         }
-        def result = project.createRunner().withArguments(":build").buildAndFail()
-
-        then:
-        result.output.contains("has more than one 'expectedBy' dependency")
+        project.createRunner().withArguments(":build").build()
     }
 
     def 'Build should fail if the common project has no common plugin'() {