diff --git a/dart-sample-2/build.gradle b/dart-sample-2/build.gradle
index f9d1555..b00bc57 100644
--- a/dart-sample-2/build.gradle
+++ b/dart-sample-2/build.gradle
@@ -8,7 +8,8 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:7.4.2"
 //        classpath fileTree(include: ['*.jar'], dir: 'libs')
-        classpath files('libs/henson-pluginx.jar')
+//        classpath files('libs/henson-pluginx.jar')
+        classpath files('../henson-plugin/build/libs/henson-plugin.jar')
 //        classpath "com.f2prateek.dart:henson-plugin:3.1.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
diff --git a/dart-sample-2/gradle.properties b/dart-sample-2/gradle.properties
index d95d576..152f972 100644
--- a/dart-sample-2/gradle.properties
+++ b/dart-sample-2/gradle.properties
@@ -20,5 +20,7 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
+org.gradle.configuration-cache.problems=warn
+org.gradle.configuration-cache=true
 #org.gradle.unsafe.configuration-cache=true
 #org.gradle.unsafe.configuration-cache-problems=warn
\ No newline at end of file
diff --git a/dart-sample-2/gradle/wrapper/gradle-wrapper.properties b/dart-sample-2/gradle/wrapper/gradle-wrapper.properties
index cafcfda..d17e89d 100644
--- a/dart-sample-2/gradle/wrapper/gradle-wrapper.properties
+++ b/dart-sample-2/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
diff --git a/dart-sample-2/libs/henson-plugin-1.0.0-SNAPSHOT.jar b/dart-sample-2/libs/henson-plugin-1.0.0-SNAPSHOT.jar
deleted file mode 100644
index aca3657..0000000
Binary files a/dart-sample-2/libs/henson-plugin-1.0.0-SNAPSHOT.jar and /dev/null differ
diff --git a/dart-sample-2/libs/henson-pluginx.jar b/dart-sample-2/libs/henson-pluginx.jar
deleted file mode 100644
index 5315fd4..0000000
Binary files a/dart-sample-2/libs/henson-pluginx.jar and /dev/null differ
diff --git a/henson-plugin/src/main/java/dart/henson/plugin/internal/GenerateHensonNavigatorTask.java b/henson-plugin/src/main/java/dart/henson/plugin/internal/GenerateHensonNavigatorTask.java
index f75ee00..7e5c1a2 100644
--- a/henson-plugin/src/main/java/dart/henson/plugin/internal/GenerateHensonNavigatorTask.java
+++ b/henson-plugin/src/main/java/dart/henson/plugin/internal/GenerateHensonNavigatorTask.java
@@ -79,20 +79,17 @@ public File getHensonNavigatorSourceFile() {
     return new File(generatedFolder, "HensonNavigator.java");
   }
 
-  BaseVariant variant;
+//  BaseVariant variant;
   Project project;
   FileCollection artifactCollection;
   Logger logger;
-  TaskProvider<JavaCompile> javaCompiler;
+//  TaskProvider<JavaCompile> javaCompiler;
   HensonNavigatorGenerator hensonNavigatorGenerator;
 
   @TaskAction
   public void generateHensonNavigator() {
     FileCollection variantCompileClasspath = getJarDependencies();
-    FileCollection uft = (FileCollectionInternal) javaCompiler.get().getSource().plus(project.fileTree(destinationFolder));
-//                new UnionFileCollection(
-//                        ,(FileCollectionInternal) javaCompiler.get().getSource(), (FileCollectionInternal) project.fileTree(destinationFolder));
-       javaCompiler.get().setSource(uft);
+
     logger.debug("Analyzing configuration: " + variantCompileClasspath.getFiles());
     Set<String> targetActivities = new HashSet<>();
     Streams.stream(variantCompileClasspath)
diff --git a/henson-plugin/src/main/java/dart/henson/plugin/internal/TaskManager.java b/henson-plugin/src/main/java/dart/henson/plugin/internal/TaskManager.java
index 57c5c9d..1c03e32 100644
--- a/henson-plugin/src/main/java/dart/henson/plugin/internal/TaskManager.java
+++ b/henson-plugin/src/main/java/dart/henson/plugin/internal/TaskManager.java
@@ -30,6 +30,8 @@
 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.logging.Logger;
 import org.gradle.api.tasks.TaskProvider;
 
@@ -67,6 +69,8 @@ public TaskProvider<GenerateHensonNavigatorTask> createHensonNavigatorGeneration
         Action<AttributeContainer> attributes =
                 container ->
                         container.attribute(ARTIFACT_TYPE, AndroidArtifacts.ArtifactType.CLASSES.getType());
+        FileCollection uft = (FileCollectionInternal) variant.getJavaCompileProvider().get().getSource().plus(project.fileTree(destinationFolder));
+        variant.getJavaCompileProvider().get().setSource(uft);
         TaskProvider<GenerateHensonNavigatorTask> generateHensonNavigatorTask =
                 project
                         .getTasks()
@@ -88,8 +92,9 @@ public TaskProvider<GenerateHensonNavigatorTask> createHensonNavigatorGeneration
                                                     .getArtifacts()
                                                     .getArtifactFiles();
                                             generateHensonNavigatorTask1.destinationFolder = destinationFolder;
-                                            generateHensonNavigatorTask1.javaCompiler = variant.getJavaCompileProvider();
+//                                            generateHensonNavigatorTask1.javaCompiler = variant.getJavaCompileProvider();
                                             generateHensonNavigatorTask1.logger = logger;
+
                                             generateHensonNavigatorTask1.project = project;
                                             generateHensonNavigatorTask1.hensonNavigatorGenerator =
                                                     hensonNavigatorGenerator;
diff --git a/henson-plugin/src/main/resources/build.properties b/henson-plugin/src/main/resources/build.properties
index b877641..9cbbd8b 100644
--- a/henson-plugin/src/main/resources/build.properties
+++ b/henson-plugin/src/main/resources/build.properties
@@ -1,2 +1,2 @@
-#Tue Jun 13 13:24:24 WIB 2023
+#Mon Aug 28 19:54:52 WIB 2023
 dart.version=unspecified