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

(minor) Improve exception message in case no Android plugin was found

Browse Source
This commit is contained in:
Sergey Igushkin
2017-06-06 16:13:52 +03:00
parent 21b88995ab
commit 2cad64881d
1 changed files with 6 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
+6 -3
View File
@@ -424,11 +424,14 @@ abstract class AbstractAndroidProjectHandler<V>(private val kotlinConfigurationT
project.afterEvaluate { project -> project.afterEvaluate { project ->
if (project != null) { if (project != null) {
val plugin = sequenceOf("android", "android-library", "com.android.test", "com.android.feature") val androidPluginIds = listOf("android", "com.android.application", "android-library", "com.android.library",
"com.android.test", "com.android.feature")
val plugin = androidPluginIds.asSequence()
.mapNotNull { project.plugins.findPlugin(it) as? BasePlugin } .mapNotNull { project.plugins.findPlugin(it) as? BasePlugin }
.firstOrNull() .firstOrNull()
?: throw InvalidPluginException("The Kotlin Android plugin cannot be used without " + ?: throw InvalidPluginException("'kotlin-android' expects one of the Android Gradle " +
"the Android Gradle plugin applied to the project.") "plugins to be applied to the project:\n\t" +
androidPluginIds.joinToString("\n\t") { "* $it" })
val subpluginEnvironment = loadSubplugins(project) val subpluginEnvironment = loadSubplugins(project)