Fix kotlin-android plugin for android-gradle:0.9+

#KT-4667 Fixed
This commit is contained in:
Natalia Ukhorskaya
2014-03-11 17:08:25 +04:00
parent 5975c40e5d
commit 36387c533f
@@ -37,6 +37,7 @@ import org.gradle.api.artifacts.dsl.DependencyHandler
import org.gradle.api.artifacts.ConfigurationContainer import org.gradle.api.artifacts.ConfigurationContainer
import org.gradle.api.artifacts.Dependency import org.gradle.api.artifacts.Dependency
import java.util.HashSet import java.util.HashSet
import org.gradle.api.UnknownDomainObjectException
val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations" val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations"
@@ -178,14 +179,18 @@ open class KotlinAndroidPlugin: Plugin<Project> {
val kotlinOptions = getExtention<K2JVMCompilerArguments>(androidExt, "kotlinOptions") val kotlinOptions = getExtention<K2JVMCompilerArguments>(androidExt, "kotlinOptions")
val sourceSets = androidExt.getSourceSets() val sourceSets = androidExt.getSourceSets()
val mainSourceSet = sourceSets.getByName(BuilderConstants.MAIN) val mainSourceSet = sourceSets.getByName(BuilderConstants.MAIN)
val testSourceSet = sourceSets.getByName(BuilderConstants.INSTRUMENT_TEST) val testSourceSet = try {
sourceSets.getByName("instrumentTest")
} catch (e: UnknownDomainObjectException) {
sourceSets.getByName("androidTest")
}
for (variant in variants) { for (variant in variants) {
if (variant is LibraryVariant || variant is ApkVariant) { if (variant is LibraryVariant || variant is ApkVariant) {
val buildType: BuildType = if (variant is LibraryVariant) { val buildType: BuildType = if (variant is LibraryVariant) {
variant.getBuildType() variant.getBuildType()!!
} else { } else {
(variant as ApkVariant).getBuildType() (variant as ApkVariant).getBuildType()!!
} }
val buildTypeSourceSetName = buildType.getName() val buildTypeSourceSetName = buildType.getName()