diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
index 8b365cab..4fc80739 100644
--- a/.settings/org.eclipse.buildship.core.prefs
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -2,7 +2,7 @@ arguments=
 auto.sync=false
 build.commands=org.eclipse.jdt.core.javabuilder
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(4.10.2))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.4))
 connection.project.dir=
 containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
 derived.resources=.gradle,build
diff --git a/.travis.yml b/.travis.yml
index 4f9b19ae..cd8af767 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ env:
   - LIB_GRADLE_VERSION=4.8.1
   - LIB_GRADLE_VERSION=4.10.2
   - LIB_GRADLE_VERSION=7.2 DEPLOY=true
-  - LIB_GRADLE_VERSION=8.0 DEPLOY=true
+  - LIB_GRADLE_VERSION=8.4 DEPLOY=true
   global:
     # The next declaration is the encrypted gradlePublishKey
   - secure: tzRoJbjW38G0YcSRuf53+koo/ZixIrA1vHJ9StOfafZOJzKyoASkbFa2EpUKmp3CXBWvUSTVo59j7ywUSyWW+L+G+CRnYqkDTktySJ/LAHjR0CH5dJCUodwcwtZkBje/RQZ//ZuPO2I7wY/aqHfj/E8pg2h9Y+nOd2v9R904/5b5gck9nM1Tr74YE2dJDm3h0QKrMqx6/oT7KVTWQpTNeLxcdrdNn5yxllqn4YDF70gEksoSuJeFR2l5lwSlTTseKI7Q7mGYI1Tg/PSZoxlPz3DGFmSe+9sewRnN9ZnjQDEY06/GmrGQHGv9MV1azvenlFHrt9lIbHnEo0GBqxNpeFfMd4+B9oeEmL8roapNSq0TCgVvOzda/G5KyY8TgLEi+k7WrZaWGvbW+AorU5ntenWEzSWz3b5lpwnwXxrPyyRnaKd3R5mRYj+LL10hlHAiWpvXn+v6ptD2OunE6l3JEm+wln+6wZjJBqBhl1jsv3LOd5siezFGqqOzC6FN6UgkTZqsgMfROzoqklFv3Ko8fU4e6oo9VzI/cJGcFHFO4M+dOHyYZbKl8hfvi1Bf44UpYo914sdwmWGIAZ8J6V2xtCqTnyN1bi/EQuKAkE2400laduCt/rnGyR8IefcM6iFxjufR5jCXpXBhbQ0cQ//pUT0eW4ssjqKvt9RrJmt/Mew=
diff --git a/build.gradle b/build.gradle
index fea15390..d1824c66 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ apply from: "${buildscript.sourceFile.parentFile}/scripts/javapreprocessor.gradl
 group = 'de.inetsoftware'
 
 def LIB_GRADLE_VERSION = System.getenv('LIB_GRADLE_VERSION') ?: '8.1.0'     // Gradle version for the wrapper
-def buildVersion    = '20'                                                  // build version
+def buildVersion    = '21'                                                  // build version
 def baseVersion     = '8.0'                                                 // Base Version to build, depends on gradle version.
 
 wrapper.gradleVersion = LIB_GRADLE_VERSION
diff --git a/scripts/SetupBuilderVersion.gradle b/scripts/SetupBuilderVersion.gradle
index 3fca6c78..0ca165d7 100644
--- a/scripts/SetupBuilderVersion.gradle
+++ b/scripts/SetupBuilderVersion.gradle
@@ -15,6 +15,6 @@ ext.setupBuilderVersion = { buildVersion = '+' ->
     if( gVersion >= VersionNumber.parse( '4.5' ) ) version = '4.5'
     if( gVersion >= VersionNumber.parse( '4.8' ) ) version = '4.8'
     if( gVersion >= VersionNumber.parse( '7.2' ) ) version = '7.2'
-    if( gVersion >= VersionNumber.parse( '8.0' ) ) version = '8.0'
+    if( gVersion >= VersionNumber.parse( '8.0' ) ) version = '8.4'
     return version + '.' + buildVersion
 }
diff --git a/src/com/inet/gradle/setup/abstracts/SetupSources.java b/src/com/inet/gradle/setup/abstracts/SetupSources.java
index 4f0e785c..3fed7eb9 100644
--- a/src/com/inet/gradle/setup/abstracts/SetupSources.java
+++ b/src/com/inet/gradle/setup/abstracts/SetupSources.java
@@ -28,7 +28,6 @@
 import org.gradle.api.file.FileTree;
 import org.gradle.api.file.FileTreeElement;
 import org.gradle.api.internal.file.copy.CopySpecSource;
-import org.gradle.api.provider.Property;
 import org.gradle.api.specs.Spec;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.Internal;
@@ -44,6 +43,7 @@
 
 ////if gradleVersion >= 8.0
 import org.gradle.api.file.ConfigurableFilePermissions;
+import org.gradle.api.provider.Property;
 ////endif
 
 /**