From d1a5794d36798888f6292fe37a5371c4a0be3acb Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Fri, 17 Aug 2018 03:18:32 +0300 Subject: [PATCH] (minor) Move source set configuration creation It was placed in the new MPP plugin and was therefore not used for the 'KotlinSourceSet's with the old plugin. Move this logic to the KotlinSourceSetFactory so that it is applied to all source sets --- .../gradle/plugin/mpp/KotlinMultiplatformPlugin.kt | 7 ------- .../gradle/plugin/sources/KotlinSourceSetFactory.kt | 9 +++++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt index 52fcc950180..ebb21e341ef 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt @@ -103,7 +103,6 @@ internal class KotlinMultiplatformPlugin( } private fun configureSourceSets(project: Project) = with (project.kotlinExtension as KotlinMultiplatformExtension) { - sourceSets.all { defineSourceSetConfigurations(project, it) } val production = sourceSets.create(KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME) val test = sourceSets.create(KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME) @@ -156,10 +155,4 @@ internal class KotlinMultiplatformPlugin( } } } - - private fun defineSourceSetConfigurations(project: Project, sourceSet: KotlinSourceSet) = with (project.configurations) { - sourceSet.relatedConfigurationNames.forEach { configurationName -> - maybeCreate(configurationName) - } - } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/KotlinSourceSetFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/KotlinSourceSetFactory.kt index 016d6b658fe..aea545bd090 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/KotlinSourceSetFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/KotlinSourceSetFactory.kt @@ -28,8 +28,13 @@ internal abstract class KotlinSourceSetFactory internal con project.file("src/$sourceSetName") protected open fun setUpSourceSetDefaults(sourceSet: T) { - with(sourceSet) { - sourceSet.kotlin.srcDir(File(defaultSourceLocation(sourceSet.name), "kotlin")) + sourceSet.kotlin.srcDir(File(defaultSourceLocation(sourceSet.name), "kotlin")) + defineSourceSetConfigurations(project, sourceSet) + } + + private fun defineSourceSetConfigurations(project: Project, sourceSet: KotlinSourceSet) = with (project.configurations) { + sourceSet.relatedConfigurationNames.forEach { configurationName -> + maybeCreate(configurationName) } }