From c25cdb4264db858a6616cd62b235421bed0a6e46 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Tue, 16 Oct 2018 14:22:54 +0300 Subject: [PATCH] Fix resourcesDir that cannot be imported due to not being a File --- .../kotlin/gradle/plugin/KotlinCompilation.kt | 4 +++- .../gradle/plugin/mpp/kotlinCompilationOutputs.kt | 13 ++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt index 82a59cce449..97a0c449510 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt @@ -9,9 +9,11 @@ import org.gradle.api.Named import org.gradle.api.attributes.HasAttributes import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.FileCollection +import java.io.File interface KotlinCompilationOutput { - var resourcesDir: Any + var resourcesDirProvider: Any + val resourcesDir: File val classesDirs: ConfigurableFileCollection val allOutputs: FileCollection diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilationOutputs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilationOutputs.kt index 2d2b820ca43..a7f756f6557 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilationOutputs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilationOutputs.kt @@ -10,11 +10,12 @@ import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.FileCollection import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationOutput import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast +import java.io.File import java.util.concurrent.Callable class DefaultKotlinCompilationOutput( - project: Project, - override var resourcesDir: Any + private val project: Project, + override var resourcesDirProvider: Any ) : KotlinCompilationOutput, Callable { override val classesDirs: ConfigurableFileCollection = project.files() @@ -24,6 +25,9 @@ class DefaultKotlinCompilationOutput( from(Callable { resourcesDir }) } + override val resourcesDir: File + get() = project.file(resourcesDirProvider) + override fun call(): FileCollection = allOutputs } @@ -34,7 +38,10 @@ class KotlinWithJavaCompilationOutput( private val javaSourceSetOutput get() = compilation.javaSourceSet.output - override var resourcesDir: Any + override val resourcesDir: File + get() = javaSourceSetOutput.resourcesDir + + override var resourcesDirProvider: Any get() = javaSourceSetOutput.resourcesDir set(value) { javaSourceSetOutput.setResourcesDir(value) }