diff --git a/build.gradle b/build.gradle
index 4e69ee78..67437cd3 100644
--- a/build.gradle
+++ b/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
diff --git a/dart-processor-test/build.gradle b/dart-processor-test/build.gradle
new file mode 100644
index 00000000..34b6de1b
--- /dev/null
+++ b/dart-processor-test/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'java-library'
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+tasks.withType(JavaCompile) {
+    options.annotationProcessorPath = configurations.annotationProcessor
+}
+
+dependencies {
+    implementation project(':dart-annotations')
+    implementation project(':dart-common')
+    implementation project(':dart')
+    implementation deps.javapoet
+    implementation deps.parceler.runtime
+    compileOnly deps.android.runtime
+    annotationProcessor project(':dart-processor')
+    implementation project(':dart-processor')
+
+    testImplementation files(org.gradle.internal.jvm.Jvm.current().getToolsJar())
+    testImplementation deps.junit
+    testImplementation deps.compiletesting
+    testImplementation deps.truth
+    testImplementation deps.fest
+    testImplementation deps.android.runtime
+}
diff --git a/dart-processor-test/gradle.properties b/dart-processor-test/gradle.properties
new file mode 100644
index 00000000..b1b62a30
--- /dev/null
+++ b/dart-processor-test/gradle.properties
@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=dart-processor
+POM_NAME=Dart Annotation Processor
+POM_PACKAGING=jar
\ No newline at end of file
diff --git a/dart-processor/src/test/java/dart/processor/BindExtraTest.java b/dart-processor-test/src/test/java/dart/processor/BindExtraTest.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/BindExtraTest.java
rename to dart-processor-test/src/test/java/dart/processor/BindExtraTest.java
diff --git a/dart-processor/src/test/java/dart/processor/BindExtraWithParcelerTest.java b/dart-processor-test/src/test/java/dart/processor/BindExtraWithParcelerTest.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/BindExtraWithParcelerTest.java
rename to dart-processor-test/src/test/java/dart/processor/BindExtraWithParcelerTest.java
diff --git a/dart-processor/src/test/java/dart/processor/BindExtraWithoutParcelerTest.java b/dart-processor-test/src/test/java/dart/processor/BindExtraWithoutParcelerTest.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/BindExtraWithoutParcelerTest.java
rename to dart-processor-test/src/test/java/dart/processor/BindExtraWithoutParcelerTest.java
diff --git a/dart-processor/src/test/java/dart/processor/BindNavigationModelTest.java b/dart-processor-test/src/test/java/dart/processor/BindNavigationModelTest.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/BindNavigationModelTest.java
rename to dart-processor-test/src/test/java/dart/processor/BindNavigationModelTest.java
diff --git a/dart-processor/src/test/java/dart/processor/ExtraBinderGeneratorTest.java b/dart-processor-test/src/test/java/dart/processor/ExtraBinderGeneratorTest.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/ExtraBinderGeneratorTest.java
rename to dart-processor-test/src/test/java/dart/processor/ExtraBinderGeneratorTest.java
diff --git a/dart-processor/src/test/java/dart/processor/ProcessorTestUtilities.java b/dart-processor-test/src/test/java/dart/processor/ProcessorTestUtilities.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/ProcessorTestUtilities.java
rename to dart-processor-test/src/test/java/dart/processor/ProcessorTestUtilities.java
diff --git a/dart-processor/src/test/java/dart/processor/data/ActivityWithNavigationModelField.java b/dart-processor-test/src/test/java/dart/processor/data/ActivityWithNavigationModelField.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/data/ActivityWithNavigationModelField.java
rename to dart-processor-test/src/test/java/dart/processor/data/ActivityWithNavigationModelField.java
diff --git a/dart-processor/src/test/java/dart/processor/data/ActivityWithNavigationModelFieldNavigationModel.java b/dart-processor-test/src/test/java/dart/processor/data/ActivityWithNavigationModelFieldNavigationModel.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/data/ActivityWithNavigationModelFieldNavigationModel.java
rename to dart-processor-test/src/test/java/dart/processor/data/ActivityWithNavigationModelFieldNavigationModel.java
diff --git a/dart-processor/src/test/java/dart/processor/data/SubActivityWithNavigationModelField.java b/dart-processor-test/src/test/java/dart/processor/data/SubActivityWithNavigationModelField.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/data/SubActivityWithNavigationModelField.java
rename to dart-processor-test/src/test/java/dart/processor/data/SubActivityWithNavigationModelField.java
diff --git a/dart-processor/src/test/java/dart/processor/data/SubActivityWithNavigationModelFieldNavigationModel.java b/dart-processor-test/src/test/java/dart/processor/data/SubActivityWithNavigationModelFieldNavigationModel.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/data/SubActivityWithNavigationModelFieldNavigationModel.java
rename to dart-processor-test/src/test/java/dart/processor/data/SubActivityWithNavigationModelFieldNavigationModel.java
diff --git a/dart-processor/src/test/java/dart/processor/data/SubActivityWithNoNavigationModelField.java b/dart-processor-test/src/test/java/dart/processor/data/SubActivityWithNoNavigationModelField.java
similarity index 100%
rename from dart-processor/src/test/java/dart/processor/data/SubActivityWithNoNavigationModelField.java
rename to dart-processor-test/src/test/java/dart/processor/data/SubActivityWithNoNavigationModelField.java
diff --git a/dart-processor/build.gradle b/dart-processor/build.gradle
index 57b151ce..e6ea94a1 100644
--- a/dart-processor/build.gradle
+++ b/dart-processor/build.gradle
@@ -12,11 +12,4 @@ dependencies {
     implementation deps.javapoet
     implementation deps.parceler.runtime
     compileOnly deps.android.runtime
-
-    testImplementation files(org.gradle.internal.jvm.Jvm.current().getToolsJar())
-    testImplementation deps.junit
-    testImplementation deps.compiletesting
-    testImplementation deps.truth
-    testImplementation deps.fest
-    testImplementation deps.android.runtime
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b9774259..94336fca 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0589484f..12d38de6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
diff --git a/gradlew.bat b/gradlew.bat
index f9553162..e95643d6 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
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 333449f6..535f9281 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
@@ -39,6 +39,7 @@
 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.CacheableTask;
@@ -95,9 +96,9 @@ 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);
+                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/resources/build.properties b/henson-plugin/src/main/resources/build.properties
index f8e6c215..122db121 100644
--- a/henson-plugin/src/main/resources/build.properties
+++ b/henson-plugin/src/main/resources/build.properties
@@ -1,2 +1,2 @@
-#Tue Jul 02 10:47:11 PDT 2019
+#Mon Sep 21 11:41:47 WIB 2020
 dart.version=3.1.4-SNAPSHOT
diff --git a/settings.gradle b/settings.gradle
index 9d09ee89..6fa0eb2d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,7 @@ include 'dart-annotations'
 include 'dart-common'
 include 'dart'
 include 'dart-processor'
+include 'dart-processor-test'
 include 'henson'
 include 'henson-processor'
 include 'henson-plugin'