Tracks and match source sets for MPP after the plugins are applied

Since the custom source sets may be added after the plugins are applied in both common and platform module, we need to handle `.all { ... }` source sets in both modules and add common sources to the platform module once a match is found. Issue #KT-22510 Fixed
2018-04-27 18:21:01 +03:00
parent 97d455729b
commit e82170a04e
2 changed files with 74 additions and 11 deletions
@@ -256,4 +256,35 @@ class MultiplatformGradleIT : BaseGradleIT() {
            assertContains("$successMarker :lib:compileTestJava")
        }
    }
+
+    @Test
+    fun testCustomSourceSets() = with(Project("multiplatformProject")) {
+        setupWorkingDir()
+
+        val sourceSetName = "foo"
+        val sourceSetDeclaration = "\nsourceSets { $sourceSetName { } }"
+
+        listOf("lib", "libJvm", "libJs").forEach { module ->
+            gradleBuildScript(module).appendText(sourceSetDeclaration)
+        }
+
+        listOf(
+            "expect fun foo(): String" to "lib/src/$sourceSetName/kotlin",
+            "actual fun foo(): String = \"jvm\"" to "libJvm/src/$sourceSetName/kotlin",
+            "actual fun foo(): String = \"js\"" to "libJs/src/$sourceSetName/kotlin"
+        ).forEach { (code, path) ->
+            File(projectDir, path).run {
+                mkdirs();
+                File(this, "Foo.kt").writeText(code)
+            }
+        }
+
+        val customSourceSetCompileTasks = listOf(":lib" to "Common", ":libJs" to "2Js", ":libJvm" to "")
+            .map { (module, platform) -> "$module:compile${sourceSetName.capitalize()}Kotlin$platform" }
+
+        build(*customSourceSetCompileTasks.toTypedArray()) {
+            assertSuccessful()
+            assertTasksExecuted(customSourceSetCompileTasks)
+        }
+    }
 }