diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 04e4cc53083..864b424589b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -294,7 +294,7 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t private fun processVariants(variants: DefaultDomainObjectSet, project: Project, androidExt: BaseExtension): Unit { val logger = project.getLogger() - val kotlinOptions = getExtention(androidExt, "kotlinOptions") + val kotlinOptions = getExtension(androidExt, "kotlinOptions") val sourceSets = androidExt.getSourceSets() //TODO: change to BuilderConstants.MAIN - it was relocated in 0.11 plugin val mainSourceSet = sourceSets.getByName("main") @@ -331,17 +331,17 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t if (variant is TestVariant) { javaSourceList.addAll(AndroidGradleWrapper.getJavaSrcDirs(testSourceSet)) - val testKotlinSource = getExtention(testSourceSet, "kotlin") + val testKotlinSource = getExtension(testSourceSet, "kotlin") kotlinTask.source(testKotlinSource.getKotlin()) } else { javaSourceList.addAll(AndroidGradleWrapper.getJavaSrcDirs(mainSourceSet)) - val mainKotlinSource = getExtention(mainSourceSet, "kotlin") + val mainKotlinSource = getExtension(mainSourceSet, "kotlin") kotlinTask.source(mainKotlinSource.getKotlin()) } if (null != buildTypeSourceSet) { javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(buildTypeSourceSet)) - kotlinTask.source(getExtention(buildTypeSourceSet, "kotlin").getKotlin()) + kotlinTask.source(getExtension(buildTypeSourceSet, "kotlin").getKotlin()) } for (resourceFolder in AndroidGradleWrapper.getRClassFolder(variant)) { @@ -357,13 +357,13 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t val defaultFlavourSourceSet = sourceSets.findByName(defaultFlavourSourceSetName) if (defaultFlavourSourceSet != null) { javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(defaultFlavourSourceSet)) - kotlinTask.source(getExtention(defaultFlavourSourceSet, "kotlin").getKotlin()) + kotlinTask.source(getExtension(defaultFlavourSourceSet, "kotlin").getKotlin()) } val flavourSourceSet = sourceSets.findByName(flavourName) if (flavourSourceSet != null) { javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(flavourSourceSet)) - kotlinTask.source(getExtention(flavourSourceSet, "kotlin").getKotlin()) + kotlinTask.source(getExtension(flavourSourceSet, "kotlin").getKotlin()) } } } @@ -387,7 +387,7 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t } } - fun getExtention(obj: Any, extensionName: String): T { + fun getExtension(obj: Any, extensionName: String): T { if (obj is ExtensionAware) { val result = obj.getExtensions().findByName(extensionName) if (result != null) {