Fix error when configuration cache enabled and support gradle 6.6 above

build.gradle

@@ -23,7 +23,7 @@ buildscript {
             truth: 'com.google.truth:truth:0.36',
             robolectric: 'org.robolectric:robolectric:2.4',
             compiletesting: 'com.google.testing.compile:compile-testing:0.12',
-            spotless: 'com.diffplug.spotless:spotless-plugin-gradle:3.6.0',
+            spotless: 'com.diffplug.spotless:spotless-plugin-gradle:4.5.1',
     ]
 
     repositories {
@@ -48,10 +48,10 @@ subprojects {
 
     apply plugin: "com.diffplug.gradle.spotless"
 
-    def checkSubTask = project.tasks.findByName('check')
-    if(checkSubTask) {
-        tasks['check'].dependsOn checkSubTask
-    }
+//    def checkSubTask = project.tasks.findByName('check')
+//    if(checkSubTask) {
+//        tasks['check'].dependsOn checkSubTask
+//    }
     def installSubTask = project.tasks.findByName('install')
     if(installSubTask) {
         tasks['install'].dependsOn installSubTask

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Dec 06 17:59:39 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

henson-plugin/src/main/java/dart/henson/plugin/internal/GenerateHensonNavigatorTask.java

@@ -17,11 +17,8 @@
 
 package dart.henson.plugin.internal;
 
-import static com.android.build.gradle.internal.publishing.AndroidArtifacts.ARTIFACT_TYPE;
 import static java.util.Collections.singletonList;
 
-import com.android.build.gradle.api.BaseVariant;
-import com.android.build.gradle.internal.publishing.AndroidArtifacts;
 import com.google.common.collect.Streams;
 import dart.henson.plugin.generator.HensonNavigatorGenerator;
 import java.io.File;
@@ -34,45 +31,29 @@
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import org.gradle.api.Action;
+
 import org.gradle.api.DefaultTask;
-import org.gradle.api.Project;
-import org.gradle.api.attributes.AttributeContainer;
+
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.internal.file.UnionFileCollection;
+
 import org.gradle.api.logging.Logger;
 import org.gradle.api.tasks.CacheableTask;
+
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
+
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.TaskProvider;
-import org.gradle.api.tasks.compile.JavaCompile;
+
 
 @CacheableTask
 public class GenerateHensonNavigatorTask extends DefaultTask {
   @InputFiles
   @Classpath
   FileCollection getJarDependencies() {
-    //Thanks to Xavier Durcrohet for this
-    //https://android.googlesource.com/platform/tools/base/+/gradle_3.0.0/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/scope/VariantScopeImpl.java#1037
-    Action<AttributeContainer> attributes =
-        container ->
-            container.attribute(ARTIFACT_TYPE, AndroidArtifacts.ArtifactType.CLASSES.getType());
-    boolean lenientMode = false;
-    return variant
-        .getCompileConfiguration()
-        .getIncoming()
-        .artifactView(
-            config -> {
-              config.attributes(attributes);
-              config.lenient(lenientMode);
-            })
-        .getArtifacts()
-        .getArtifactFiles();
+    return jarDependencies;
   }
-
   @Input String hensonNavigatorPackageName;
 
   File destinationFolder;
@@ -85,22 +66,19 @@ public File getHensonNavigatorSourceFile() {
     return new File(generatedFolder, "HensonNavigator.java");
   }
 
-  BaseVariant variant;
-  Project project;
+
+  FileCollection jarDependencies;
   Logger logger;
+
   HensonNavigatorGenerator hensonNavigatorGenerator;
 
   @TaskAction
   public void generateHensonNavigator() {
-    TaskProvider<JavaCompile> javaCompiler = variant.getJavaCompileProvider();
     FileCollection variantCompileClasspath = getJarDependencies();
-    FileCollection uft =
-        new UnionFileCollection(
-            javaCompiler.get().getSource(), project.fileTree(destinationFolder));
-    javaCompiler.get().setSource(uft);
-    logger.debug("Analyzing configuration: " + variantCompileClasspath.getFiles());
+
+    logger.debug("Analyzing configuration: " + jarDependencies.getFiles());
     Set<String> targetActivities = new HashSet<>();
-    Streams.stream(variantCompileClasspath)
+    Streams.stream(jarDependencies)
         .forEach(
             dependency -> {
               logger.debug("Detected dependency: {}", dependency.getAbsolutePath());

henson-plugin/src/main/java/dart/henson/plugin/internal/TaskManager.java

@@ -17,15 +17,25 @@
 
 package dart.henson.plugin.internal;
 
+import static com.android.build.gradle.internal.publishing.AndroidArtifacts.ARTIFACT_TYPE;
 import static dart.henson.plugin.util.StringUtil.capitalize;
 
 import com.android.build.gradle.api.BaseVariant;
+import com.android.build.gradle.internal.publishing.AndroidArtifacts;
+
 import dart.henson.plugin.generator.HensonNavigatorGenerator;
+
 import java.io.File;
+
 import org.gradle.api.Action;
 import org.gradle.api.Project;
+import org.gradle.api.attributes.AttributeContainer;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.internal.file.FileCollectionInternal;
+import org.gradle.api.internal.file.UnionFileCollection;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.tasks.TaskProvider;
+import org.gradle.api.tasks.compile.JavaCompile;
 
 public class TaskManager {
 
@@ -57,6 +67,19 @@ public TaskManager(Project project, Logger logger) {
    */
   public TaskProvider<GenerateHensonNavigatorTask> createHensonNavigatorGenerationTask(
       BaseVariant variant, String hensonNavigatorPackageName, File destinationFolder) {
+    Action<AttributeContainer> attributes =
+        container ->
+            container.attribute(ARTIFACT_TYPE, AndroidArtifacts.ArtifactType.CLASSES.getType());
+
+
+    TaskProvider<JavaCompile> javaCompiler = variant.getJavaCompileProvider();
+
+    FileCollection uft =
+        new UnionFileCollection(
+            (FileCollectionInternal) javaCompiler.get().getSource(), (FileCollectionInternal) project.fileTree(destinationFolder));
+
+    javaCompiler.get().setSource(uft);
+
     TaskProvider<GenerateHensonNavigatorTask> generateHensonNavigatorTask =
         project
             .getTasks()
@@ -67,10 +90,18 @@ public TaskProvider<GenerateHensonNavigatorTask> createHensonNavigatorGeneration
                     generateHensonNavigatorTask1 -> {
                       generateHensonNavigatorTask1.hensonNavigatorPackageName =
                           hensonNavigatorPackageName;
+                      generateHensonNavigatorTask1.jarDependencies = variant
+                          .getCompileConfiguration()
+                          .getIncoming()
+                          .artifactView(
+                              config -> {
+                                config.attributes(attributes);
+                                config.lenient(false);
+                              })
+                          .getArtifacts()
+                          .getArtifactFiles();
                       generateHensonNavigatorTask1.destinationFolder = destinationFolder;
-                      generateHensonNavigatorTask1.variant = variant;
                       generateHensonNavigatorTask1.logger = logger;
-                      generateHensonNavigatorTask1.project = project;
                       generateHensonNavigatorTask1.hensonNavigatorGenerator =
                           hensonNavigatorGenerator;
                     });