Merge branch 'develop'

evant · Mar 31, 2015 · e23ea55 · e23ea55
2 parents 8a278a7 + 8b346e4
commit e23ea55
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/groovy/me/tatarka/RetrolambdaPluginAndroid.groovy b/src/main/groovy/me/tatarka/RetrolambdaPluginAndroid.groovy
@@ -90,7 +90,12 @@ public class RetrolambdaPluginAndroid implements Plugin<Project> {
                     }
 
                     retrolambdaTask.doFirst {
-                        retrolambdaTask.classpath += project.files(var.javaCompile.options.bootClasspath)
+                        if (var.javaCompile.options.bootClasspath) {
+                            retrolambdaTask.classpath += project.files(var.javaCompile.options.bootClasspath)
+                        } else {
+                            // If this is null it means the javaCompile task didn't need to run, don't bother running retrolambda either.
+                            retrolambdaTask.enabled = false
+                        }
                     }
 
                     var.javaCompile.finalizedBy(retrolambdaTask)