diff options
| author | Joel Klinghed <the_jk@opera.com> | 2024-04-19 12:52:56 +0200 |
|---|---|---|
| committer | Joel Klinghed <the_jk@opera.com> | 2024-04-19 12:52:56 +0200 |
| commit | 118fd7daeff4ac0d35c67c39aa66944c3db9240e (patch) | |
| tree | 6a645e13898e0720e4335a0e159b7022e1a2dcaf | |
| parent | 78abdf80d5ab99d6e84f2b5e2a4a6cc629fb4638 (diff) | |
Bumped to 0.3.16
Support for android projects that doesn't declare buildTypes or
flavors extensions (com.android.test for example).
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | flycheck-android-experimental-pkg.el | 2 | ||||
| -rw-r--r-- | src/main/groovy/FlycheckAndroidJavaTask.groovy | 6 | ||||
| -rw-r--r-- | src/main/groovy/FlycheckAndroidKotlinTask.groovy | 6 |
5 files changed, 13 insertions, 9 deletions
@@ -44,7 +44,7 @@ initscript { } } dependencies { - classpath 'org.thejk:flycheck-android-experimental:0.3.15' + classpath 'org.thejk:flycheck-android-experimental:0.3.16' } } @@ -113,4 +113,4 @@ Build the gradle plugin jar and upload the "../repo" repository by default. ./gradle packageList Build the Emacs package placing it in -build/flycheck-android-experimental-0.3.15.tar +build/flycheck-android-experimental-0.3.16.tar diff --git a/build.gradle b/build.gradle index e446456..3a70a96 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ dependencies { } group = 'org.thejk' -version = '0.3.15' +version = '0.3.16' publishing { repositories { @@ -75,5 +75,5 @@ class PackageTask extends DefaultTask { } task packageLisp(type: PackageTask) { - packageName 'flycheck-android-experimental-0.3.15' + packageName 'flycheck-android-experimental-0.3.16' } diff --git a/flycheck-android-experimental-pkg.el b/flycheck-android-experimental-pkg.el index 335378f..bc842d6 100644 --- a/flycheck-android-experimental-pkg.el +++ b/flycheck-android-experimental-pkg.el @@ -1,4 +1,4 @@ (define-package "flycheck-android-experimental" - "0.3.15" + "0.3.16" "A package with flycheck for android experimental gradle plugin.") 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 { |