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

Fix AndroidSubplugin applicability check (plain Java Gradle project)

Browse Source
This commit is contained in:
Yan Zhulanow
2016-01-27 13:58:32 +03:00
parent 16958d7a66
commit c7a0375c25
1 changed files with 6 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
+6 -1
View File
@@ -20,6 +20,7 @@ import com.android.build.gradle.BaseExtension
import com.android.build.gradle.api.AndroidSourceSet import com.android.build.gradle.api.AndroidSourceSet
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.UnknownDomainObjectException
import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.api.tasks.compile.AbstractCompile
import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
import org.jetbrains.kotlin.gradle.plugin.SubpluginOption import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
@@ -41,7 +42,11 @@ public class AndroidSubplugin : KotlinGradleSubplugin {
} }
override fun isApplicable(project: Project, task: AbstractCompile): Boolean { override fun isApplicable(project: Project, task: AbstractCompile): Boolean {
project.extensions.getByName("android") as? BaseExtension ?: return false try {
project.extensions.getByName("android") as? BaseExtension ?: return false
} catch (e: UnknownDomainObjectException) {
return false
}
if (project.plugins.findPlugin(AndroidExtensionsSubpluginIndicator::class.java) == null) { if (project.plugins.findPlugin(AndroidExtensionsSubpluginIndicator::class.java) == null) {
val dependencies = project.buildscript.configurations.getByName("classpath").dependencies val dependencies = project.buildscript.configurations.getByName("classpath").dependencies
if (dependencies.any { it.name == getArtifactName() && it.group == getGroupName() } && !migrateWarningReported) { if (dependencies.any { it.name == getArtifactName() && it.group == getGroupName() } && !migrateWarningReported) {