summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoel Klinghed <the_jk@opera.com>2024-04-19 12:52:56 +0200
committerJoel Klinghed <the_jk@opera.com>2024-04-19 12:52:56 +0200
commit118fd7daeff4ac0d35c67c39aa66944c3db9240e (patch)
tree6a645e13898e0720e4335a0e159b7022e1a2dcaf /src
parent78abdf80d5ab99d6e84f2b5e2a4a6cc629fb4638 (diff)
Bumped to 0.3.16
Support for android projects that doesn't declare buildTypes or flavors extensions (com.android.test for example).
Diffstat (limited to 'src')
-rw-r--r--src/main/groovy/FlycheckAndroidJavaTask.groovy6
-rw-r--r--src/main/groovy/FlycheckAndroidKotlinTask.groovy6
2 files changed, 8 insertions, 4 deletions
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 {