From 118fd7daeff4ac0d35c67c39aa66944c3db9240e Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Fri, 19 Apr 2024 12:52:56 +0200 Subject: Bumped to 0.3.16 Support for android projects that doesn't declare buildTypes or flavors extensions (com.android.test for example). --- src/main/groovy/FlycheckAndroidJavaTask.groovy | 6 ++++-- src/main/groovy/FlycheckAndroidKotlinTask.groovy | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/groovy/FlycheckAndroidJavaTask.groovy b/src/main/groovy/FlycheckAndroidJavaTask.groovy index 7fef801..e8ebf4f 100644 --- a/src/main/groovy/FlycheckAndroidJavaTask.groovy +++ b/src/main/groovy/FlycheckAndroidJavaTask.groovy @@ -18,9 +18,11 @@ class FlycheckAndroidJavaTask extends DefaultTask { } else if (android && android.class.simpleName == 'LibraryExtension_Decorated') { variants = android.libraryVariants.collect { it.name } } else { - def buildTypes = project.extensions.buildTypes.names + def buildTypesExt = project.extensions.findByName('buildTypes') + def flavorsExt = project.extensions.findByName('flavors') + def buildTypes = buildTypesExt ? buildTypesExt.names : [] if (buildTypes.isEmpty()) buildTypes = ['debug', 'release'] - def flavors = project.extensions.flavors.names + def flavors = flavorsExt ? flavorsExt.names : [] if (flavors.isEmpty()) { variants = buildTypes } else { diff --git a/src/main/groovy/FlycheckAndroidKotlinTask.groovy b/src/main/groovy/FlycheckAndroidKotlinTask.groovy index 1a2c6b5..6ef87cd 100644 --- a/src/main/groovy/FlycheckAndroidKotlinTask.groovy +++ b/src/main/groovy/FlycheckAndroidKotlinTask.groovy @@ -19,9 +19,11 @@ class FlycheckAndroidKotlinTask extends DefaultTask { } else if (android && android.class.simpleName == 'LibraryExtension_Decorated') { variants = android.libraryVariants.collect { it.name } } else { - def buildTypes = project.extensions.buildTypes.names + def buildTypesExt = project.extensions.findByName('buildTypes') + def flavorsExt = project.extensions.findByName('flavors') + def buildTypes = buildTypesExt ? buildTypesExt.names : [] if (buildTypes.isEmpty()) buildTypes = ['debug', 'release'] - def flavors = project.extensions.flavors.names + def flavors = flavorsExt ? flavorsExt.names : [] if (flavors.isEmpty()) { variants = buildTypes } else { -- cgit v1.2.3-70-g09d2