From 2c04e2b95c7d373ffbdbca56ade169bc9f95f8f6 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Fri, 10 Aug 2018 01:58:51 +0300 Subject: [PATCH] Fix: create a compilation's default source set for Android as well --- .../kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 47e97f76b24..5c379226e83 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -708,6 +708,8 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationT } val compilation = target.compilations.getByName(variantDataName) + val defaultSourceSet = project.kotlinExtension.sourceSets.maybeCreate(compilation.defaultSourceSetName) + val kotlinTaskName = compilation.compileKotlinTaskName // todo: Investigate possibility of creating and configuring kotlinTask before evaluation val kotlinTask = tasksProvider.createKotlinJVMTask(project, kotlinTaskName, variantDataName) @@ -717,6 +719,8 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationT kotlinTask.destinationDir = File(project.buildDir, "tmp/kotlin-classes/$variantDataName") kotlinTask.description = "Compiles the $variantDataName kotlin." + // Register the source only after the task is created, because tne task is required for that: + compilation.source(defaultSourceSet) configureSources(kotlinTask, variantData, compilation) // In MPPs, add the common main Kotlin sources to non-test variants, the common test sources to test variants