From 71ea8db3ae4db5810c72584dd777bfba468a8412 Mon Sep 17 00:00:00 2001
From: Joel Klinghed <the_jk@opera.com>
Date: Thu, 16 May 2019 12:37:34 +0200
Subject: Support new properties used by Android Gradle plugin 3.4.0

---
 src/main/groovy/FlycheckAndroidJavaTask.groovy | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/main/groovy')

diff --git a/src/main/groovy/FlycheckAndroidJavaTask.groovy b/src/main/groovy/FlycheckAndroidJavaTask.groovy
index da7da31..582b007 100644
--- a/src/main/groovy/FlycheckAndroidJavaTask.groovy
+++ b/src/main/groovy/FlycheckAndroidJavaTask.groovy
@@ -42,7 +42,12 @@ class FlycheckAndroidJavaTask extends DefaultTask {
                 if (compile) {
                     try {
                         def cp = compile.classpath.asPath
-                        def bootcp = compile.options.bootClasspath ?: ''
+                        def bootcp = ''
+                        if (compile.options.hasProperty('bootClasspath')) {
+                            bootcp = compile.options.bootClasspath
+                        } else if (compile.options.hasProperty('bootstrapClasspath')) {
+                            bootcp = compile.options.bootstrapClasspath.asPath
+                        }
                         println '***'
                         println 'variant=' + variant
                         println 'args=' + compile.options.compilerArgs.findAll {
-- 
cgit v1.2.3-70-g09d2