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

Don't apply the Android Extensions subplugin to non-Android JVM tasks

Browse Source 
In a multiplatform project with both Android and non-Android JVM targets
the subplugin should only affect the tasks of the Android target
This commit is contained in:
Sergey Igushkin
2018-10-15 21:40:25 +03:00
parent 5db23f1a81
commit ee63a6b3af
1 changed files with 8 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/internal/AndroidSubplugin.kt
+8 -1
View File
@@ -29,7 +29,8 @@ import org.gradle.api.tasks.compile.AbstractCompile
import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry
import org.jetbrains.kotlin.gradle.model.builder.KotlinAndroidExtensionModelBuilder import org.jetbrains.kotlin.gradle.model.builder.KotlinAndroidExtensionModelBuilder
import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.android.AndroidGradleWrapper import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.multiplatformExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.w3c.dom.Document import org.w3c.dom.Document
import java.io.File import java.io.File
@@ -85,6 +86,12 @@ class AndroidSubplugin : KotlinGradleSubplugin<KotlinCompile> {
if (project.plugins.findPlugin(AndroidExtensionsSubpluginIndicator::class.java) == null) { if (project.plugins.findPlugin(AndroidExtensionsSubpluginIndicator::class.java) == null) {
return false return false
} }
project.multiplatformExtension?.let { kotlin ->
return kotlin.targets.any { target ->
target is KotlinAndroidTarget && target.compilations.any { it.compileKotlinTaskName == task.name }
}
}
return true return true
} }