jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-20 08:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gradle: support for 1.2.0-beta2 com.android.application plugin

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-04-13 17:34:37 +03:00
parent 34205c3ff0
commit 5e6250511b
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
View File

@@ -288,7 +288,7 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
project afterEvaluate { project ->
if (project != null) {
val testVariants = ext.getTestVariants()!!
val testVariants = AndroidGradleWrapper.getTestVariants(ext)
processVariants(testVariants, project, ext)
if (ext is AppExtension) {
val appVariants = ext.getApplicationVariants()!!

10
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
View File

@@ -4,6 +4,8 @@ import com.android.build.gradle.BaseExtension
import com.android.build.gradle.BasePlugin
import com.android.build.gradle.api.ApkVariant
import com.android.build.gradle.api.BaseVariant
import com.android.build.gradle.api.TestVariant
import org.gradle.api.internal.DefaultDomainObjectSet
import org.gradle.api.tasks.util.PatternFilterable
import org.jetbrains.annotations.NotNull
@@ -51,6 +53,14 @@ class AndroidGradleWrapper {
return variant.getProductFlavors().iterator().collect { it.getName() }
}
@NotNull
static def DefaultDomainObjectSet<TestVariant> getTestVariants(BaseExtension extension) {
if (extension.getMetaClass().getMetaMethod("getTestVariants")) {
return extension.getTestVariants()
}
return Collections.emptyList()
}
@NotNull
static def List<File> getRClassFolder(BaseVariant variant) {
def list = new ArrayList<File>()