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

Do not discover script extensions for Kapt stub generation tasks (KT-26974)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-09-19 22:25:53 +03:00
parent 7b1c564b87
commit 1008adaf02
1 changed files with 2 additions and 1 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/scripting/internal/ScriptingGradleSubplugin.kt
+2 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.gradle.scripting.ScriptingExtension
import org.jetbrains.kotlin.gradle.tasks.GradleMessageCollector import org.jetbrains.kotlin.gradle.tasks.GradleMessageCollector
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.KotlinScriptDefinition
import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptDefinitionsFromClasspathDiscoverySource import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptDefinitionsFromClasspathDiscoverySource
import kotlin.properties.Delegates import kotlin.properties.Delegates
@@ -47,7 +48,7 @@ class ScriptingGradleSubplugin : Plugin<Project> {
if (javaPluginConvention?.sourceSets?.isEmpty() == false) { if (javaPluginConvention?.sourceSets?.isEmpty() == false) {
project.tasks.all { task -> project.tasks.all { task ->
if (task is KotlinCompile) { if (task is KotlinCompile && task !is KaptGenerateStubsTask) {
val configuration = project.configurations.findByName(getConfigurationName(task.sourceSetName)) val configuration = project.configurations.findByName(getConfigurationName(task.sourceSetName))
if (configuration?.isEmpty == false) { if (configuration?.isEmpty == false) {
javaPluginConvention.sourceSets.findByName(task.sourceSetName)?.let { sourceSet -> javaPluginConvention.sourceSets.findByName(task.sourceSetName)?.let { sourceSet ->