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

Minor: rename

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-12-31 09:51:48 +03:00
parent 4d48905ef1
commit 288b2e86ae
1 changed files with 7 additions and 7 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
+7 -7
View File
@@ -294,7 +294,7 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
private fun processVariants(variants: DefaultDomainObjectSet<out BaseVariant>, project: Project, androidExt: BaseExtension): Unit { private fun processVariants(variants: DefaultDomainObjectSet<out BaseVariant>, project: Project, androidExt: BaseExtension): Unit {
val logger = project.getLogger() val logger = project.getLogger()
val kotlinOptions = getExtention<Any>(androidExt, "kotlinOptions") val kotlinOptions = getExtension<Any>(androidExt, "kotlinOptions")
val sourceSets = androidExt.getSourceSets() val sourceSets = androidExt.getSourceSets()
//TODO: change to BuilderConstants.MAIN - it was relocated in 0.11 plugin //TODO: change to BuilderConstants.MAIN - it was relocated in 0.11 plugin
val mainSourceSet = sourceSets.getByName("main") val mainSourceSet = sourceSets.getByName("main")
@@ -331,17 +331,17 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
if (variant is TestVariant) { if (variant is TestVariant) {
javaSourceList.addAll(AndroidGradleWrapper.getJavaSrcDirs(testSourceSet)) javaSourceList.addAll(AndroidGradleWrapper.getJavaSrcDirs(testSourceSet))
val testKotlinSource = getExtention<KotlinSourceSet>(testSourceSet, "kotlin") val testKotlinSource = getExtension<KotlinSourceSet>(testSourceSet, "kotlin")
kotlinTask.source(testKotlinSource.getKotlin()) kotlinTask.source(testKotlinSource.getKotlin())
} else { } else {
javaSourceList.addAll(AndroidGradleWrapper.getJavaSrcDirs(mainSourceSet)) javaSourceList.addAll(AndroidGradleWrapper.getJavaSrcDirs(mainSourceSet))
val mainKotlinSource = getExtention<KotlinSourceSet>(mainSourceSet, "kotlin") val mainKotlinSource = getExtension<KotlinSourceSet>(mainSourceSet, "kotlin")
kotlinTask.source(mainKotlinSource.getKotlin()) kotlinTask.source(mainKotlinSource.getKotlin())
} }
if (null != buildTypeSourceSet) { if (null != buildTypeSourceSet) {
javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(buildTypeSourceSet)) javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(buildTypeSourceSet))
kotlinTask.source(getExtention<KotlinSourceSet>(buildTypeSourceSet, "kotlin").getKotlin()) kotlinTask.source(getExtension<KotlinSourceSet>(buildTypeSourceSet, "kotlin").getKotlin())
} }
for (resourceFolder in AndroidGradleWrapper.getRClassFolder(variant)) { for (resourceFolder in AndroidGradleWrapper.getRClassFolder(variant)) {
@@ -357,13 +357,13 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
val defaultFlavourSourceSet = sourceSets.findByName(defaultFlavourSourceSetName) val defaultFlavourSourceSet = sourceSets.findByName(defaultFlavourSourceSetName)
if (defaultFlavourSourceSet != null) { if (defaultFlavourSourceSet != null) {
javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(defaultFlavourSourceSet)) javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(defaultFlavourSourceSet))
kotlinTask.source(getExtention<KotlinSourceSet>(defaultFlavourSourceSet, "kotlin").getKotlin()) kotlinTask.source(getExtension<KotlinSourceSet>(defaultFlavourSourceSet, "kotlin").getKotlin())
} }
val flavourSourceSet = sourceSets.findByName(flavourName) val flavourSourceSet = sourceSets.findByName(flavourName)
if (flavourSourceSet != null) { if (flavourSourceSet != null) {
javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(flavourSourceSet)) javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(flavourSourceSet))
kotlinTask.source(getExtention<KotlinSourceSet>(flavourSourceSet, "kotlin").getKotlin()) kotlinTask.source(getExtension<KotlinSourceSet>(flavourSourceSet, "kotlin").getKotlin())
} }
} }
} }
@@ -387,7 +387,7 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
} }
} }
fun <T> getExtention(obj: Any, extensionName: String): T { fun <T> getExtension(obj: Any, extensionName: String): T {
if (obj is ExtensionAware) { if (obj is ExtensionAware) {
val result = obj.getExtensions().findByName(extensionName) val result = obj.getExtensions().findByName(extensionName)
if (result != null) { if (result != null) {