From 36387c533f18346bae0badfdaa91db74c28a5958 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Tue, 11 Mar 2014 17:08:25 +0400 Subject: [PATCH] Fix kotlin-android plugin for android-gradle:0.9+ #KT-4667 Fixed --- .../jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index cd8a27e65a1..5e8be9c55d4 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -37,6 +37,7 @@ import org.gradle.api.artifacts.dsl.DependencyHandler import org.gradle.api.artifacts.ConfigurationContainer import org.gradle.api.artifacts.Dependency import java.util.HashSet +import org.gradle.api.UnknownDomainObjectException val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations" @@ -178,14 +179,18 @@ open class KotlinAndroidPlugin: Plugin { val kotlinOptions = getExtention(androidExt, "kotlinOptions") val sourceSets = androidExt.getSourceSets() 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) { if (variant is LibraryVariant || variant is ApkVariant) { val buildType: BuildType = if (variant is LibraryVariant) { - variant.getBuildType() + variant.getBuildType()!! } else { - (variant as ApkVariant).getBuildType() + (variant as ApkVariant).getBuildType()!! } val buildTypeSourceSetName = buildType.getName()