azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Fix after rebase on master

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-27 12:38:07 +03:00
parent a2930b45f6
commit 2680ea6bdd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+3 -3
View File
@@ -90,7 +90,7 @@ internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
protected val sourceSetName: String = kotlinCompilation.compilationName protected val sourceSetName: String = kotlinCompilation.compilationName
override val kotlinTask: TaskProvider<out T> = prepareKotlinCompileTask(kotlinCompilation.compileKotlinTaskName) override val kotlinTask: TaskProvider<out T> = prepareKotlinCompileTask()
protected val javaSourceSet: SourceSet? protected val javaSourceSet: SourceSet?
get() = get() =
@@ -101,8 +101,8 @@ internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
else null else null
} }
private fun prepareKotlinCompileTask(name: String): TaskProvider<out T> = private fun prepareKotlinCompileTask(): TaskProvider<out T> =
registerKotlinCompileTask(name).also { task -> registerKotlinCompileTask().also { task ->
kotlinCompilation.output.addClassesDir { project.files(task.map { it.destinationDir }) } kotlinCompilation.output.addClassesDir { project.files(task.map { it.destinationDir }) }
} }