diff --git a/.gitignore b/.gitignore
index 44284544..1e372033 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,5 @@ build-info-go.exe
 bi
 bi.exe
 
-# Dependency directories (remove the comment below to include it)
-# vendor/
+# Gradle
+.gradle
diff --git a/build/gradle.go b/build/gradle.go
index 4534dd76..ae7b4b54 100644
--- a/build/gradle.go
+++ b/build/gradle.go
@@ -1,23 +1,38 @@
 package build
 
 import (
+	"bytes"
+	_ "embed"
+	"errors"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strings"
 
 	"github.com/jfrog/build-info-go/utils"
+	"github.com/jfrog/gofrog/version"
 )
 
 const (
-	extractorPropsDir                = "BUILDINFO_PROPFILE"
-	GradleExtractorFileName          = "build-info-extractor-gradle-%s-uber.jar"
-	gradleInitScriptTemplate         = "gradle.init"
-	GradleExtractorRemotePath        = "org/jfrog/buildinfo/build-info-extractor-gradle/%s"
-	GradleExtractorDependencyVersion = "4.32.0"
+	extractorPropsDir                 = "BUILDINFO_PROPFILE"
+	gradleExtractorFileName           = "build-info-extractor-gradle-%s-uber.jar"
+	gradleInitScriptTemplate          = "gradle.init"
+	gradleExtractorRemotePath         = "org/jfrog/buildinfo/build-info-extractor-gradle/%s"
+	gradleExtractor4DependencyVersion = "4.32.0"
+	gradleExtractor5DependencyVersion = "5.1.0"
 )
 
+var versionRegex = regexp.MustCompile(`Gradle (\d+\.\d+(?:\.\d+|-\w+-\d+)?)`)
+
+//go:embed init-gradle-extractor-4.gradle
+var gradleInitScriptExtractor4 string
+
+//go:embed init-gradle-extractor-5.gradle
+var gradleInitScriptExtractor5 string
+
 type GradleModule struct {
 	// The build which contains the gradle module.
 	containingBuild *Build
@@ -47,21 +62,15 @@ type gradleExtractorDetails struct {
 
 // Add a new Gradle module to a given build.
 func newGradleModule(containingBuild *Build, srcPath string) (*GradleModule, error) {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return nil, err
-	}
-	extractorLocalPath := filepath.Join(home, dependenciesDirName, "gradle", GradleExtractorDependencyVersion)
 	return &GradleModule{
 		srcPath:         srcPath,
 		containingBuild: containingBuild,
 		gradleExtractorDetails: &gradleExtractorDetails{
-			localPath: extractorLocalPath,
-			tasks:     []string{"artifactoryPublish"},
-			propsDir:  filepath.Join(containingBuild.tempDirPath, PropertiesTempFolderName),
-			props:     map[string]string{},
+			tasks:    []string{"artifactoryPublish"},
+			propsDir: filepath.Join(containingBuild.tempDirPath, PropertiesTempFolderName),
+			props:    map[string]string{},
 		},
-	}, err
+	}, nil
 }
 
 func (gm *GradleModule) SetExtractorDetails(localExtractorPath, extractorPropsDir string, tasks []string, useWrapper, usePlugin bool, downloadExtractorFunc func(downloadTo, downloadFrom string) error, props map[string]string) *GradleModule {
@@ -78,35 +87,94 @@ func (gm *GradleModule) SetExtractorDetails(localExtractorPath, extractorPropsDi
 // Generates Gradle build-info.
 func (gm *GradleModule) CalcDependencies() (err error) {
 	gm.containingBuild.logger.Info("Running gradle...")
-	if gm.srcPath == "" {
-		if gm.srcPath, err = os.Getwd(); err != nil {
+	wd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+	if gm.srcPath != "" {
+		if err = os.Chdir(gm.srcPath); err != nil {
 			return
 		}
+		defer func() {
+			err = errors.Join(err, os.Chdir(wd))
+		}()
 	}
 
-	if err = downloadGradleDependencies(gm.gradleExtractorDetails.localPath, gm.gradleExtractorDetails.downloadExtractorFunc, gm.containingBuild.logger); err != nil {
-		return err
+	gradleExecPath, err := GetGradleExecPath(gm.gradleExtractorDetails.useWrapper)
+	if err != nil {
+		return
 	}
 	if !gm.gradleExtractorDetails.usePlugin {
-		gradlePluginFilename := fmt.Sprintf(GradleExtractorFileName, GradleExtractorDependencyVersion)
-
-		gm.gradleExtractorDetails.initScript, err = getInitScript(gm.gradleExtractorDetails.localPath, gradlePluginFilename)
-		if err != nil {
+		if err := gm.downloadGradleExtractor(gradleExecPath); err != nil {
 			return err
 		}
 	}
-	gradleRunConfig, err := gm.createGradleRunConfig()
+	gradleRunConfig, err := gm.createGradleRunConfig(gradleExecPath)
 	if err != nil {
 		return err
 	}
-	return gradleRunConfig.runCmd()
+	return gradleRunConfig.runCmd(os.Stdout, os.Stderr)
 }
 
-func (gm *GradleModule) createGradleRunConfig() (*gradleRunConfig, error) {
-	gradleExecPath, err := GetGradleExecPath(gm.gradleExtractorDetails.useWrapper)
+func (gm *GradleModule) downloadGradleExtractor(gradleExecPath string) (err error) {
+	gradleExtractorVersion, initScriptPattern, err := gm.getExtractorVersionAndInitScript(gradleExecPath)
 	if err != nil {
-		return nil, err
+		return err
+	}
+	gm.containingBuild.logger.Debug("Using Gradle build-info extractor", gradleExtractorVersion)
+
+	dependencyLocalPath := filepath.Join(gm.gradleExtractorDetails.localPath, gradleExtractorVersion)
+	if err = downloadGradleDependencies(dependencyLocalPath, gradleExtractorVersion, gm.gradleExtractorDetails.downloadExtractorFunc, gm.containingBuild.logger); err != nil {
+		return err
 	}
+	gradlePluginFilename := fmt.Sprintf(gradleExtractorFileName, gradleExtractorVersion)
+
+	gm.gradleExtractorDetails.initScript, err = getInitScript(initScriptPattern, dependencyLocalPath, gradlePluginFilename)
+	return
+}
+
+// Return the Gradle extractor version and the relevant init script according to the Gradle version:
+// For Gradle >= 6.8.1 use Gradle extractor 5
+// For Gradle < 6.8.1 use Gradle extractor 4
+// gradleExecPath - The Gradle binary path
+func (gm *GradleModule) getExtractorVersionAndInitScript(gradleExecPath string) (string, string, error) {
+	gradleRunConfig := &gradleRunConfig{
+		gradle: gradleExecPath,
+		tasks:  "--version",
+		logger: gm.containingBuild.logger,
+	}
+
+	outBuffer := new(bytes.Buffer)
+	errBuffer := new(bytes.Buffer)
+	if err := gradleRunConfig.runCmd(outBuffer, errBuffer); err != nil {
+		return "", "", err
+	}
+	if errBuffer.Len() > 0 {
+		return "", "", errors.New("unexpected error occurred during attempt to get the Gradle version: " + errBuffer.String())
+	}
+
+	gradleVersion, err := parseGradleVersion(outBuffer.String())
+	if err != nil {
+		return "", "", err
+	}
+	gm.containingBuild.logger.Info("Using Gradle version:", gradleVersion)
+	if gradleVersion.AtLeast("6.8.1") {
+		return gradleExtractor5DependencyVersion, gradleInitScriptExtractor5, nil
+	}
+	return gradleExtractor4DependencyVersion, gradleInitScriptExtractor4, nil
+}
+
+// Parse the 'gradle --version' output and return the Gradle version.
+// versionOutput - The 'gradle --version' output
+func parseGradleVersion(versionOutput string) (*version.Version, error) {
+	match := versionRegex.FindStringSubmatch(versionOutput)
+	if len(match) == 0 {
+		return nil, errors.New("couldn't parse the Gradle version: " + versionOutput)
+	}
+	return version.NewVersion(match[1]), nil
+}
+
+func (gm *GradleModule) createGradleRunConfig(gradleExecPath string) (*gradleRunConfig, error) {
 	buildInfoPath, err := createEmptyBuildInfoFile(gm.containingBuild)
 	if err != nil {
 		return nil, err
@@ -125,13 +193,13 @@ func (gm *GradleModule) createGradleRunConfig() (*gradleRunConfig, error) {
 	}, nil
 }
 
-func downloadGradleDependencies(downloadTo string, downloadExtractorFunc func(downloadTo, downloadPath string) error, logger utils.Log) error {
-	filename := fmt.Sprintf(GradleExtractorFileName, GradleExtractorDependencyVersion)
-	filePath := fmt.Sprintf(GradleExtractorRemotePath, GradleExtractorDependencyVersion)
+func downloadGradleDependencies(downloadTo, gradleExtractorVersion string, downloadExtractorFunc func(downloadTo, downloadPath string) error, logger utils.Log) error {
+	filename := fmt.Sprintf(gradleExtractorFileName, gradleExtractorVersion)
+	filePath := fmt.Sprintf(gradleExtractorRemotePath, gradleExtractorVersion)
 	return utils.DownloadDependencies(downloadTo, filename, filePath, downloadExtractorFunc, logger)
 }
 
-func getInitScript(gradleDependenciesDir, gradlePluginFilename string) (string, error) {
+func getInitScript(initScriptPattern, gradleDependenciesDir, gradlePluginFilename string) (string, error) {
 	gradleDependenciesDir, err := filepath.Abs(gradleDependenciesDir)
 	if err != nil {
 		return "", err
@@ -145,7 +213,7 @@ func getInitScript(gradleDependenciesDir, gradlePluginFilename string) (string,
 
 	gradlePluginPath := filepath.Join(gradleDependenciesDir, gradlePluginFilename)
 	gradlePluginPath = strings.ReplaceAll(gradlePluginPath, "\\", "\\\\")
-	initScriptContent := strings.ReplaceAll(GradleInitScript, "${pluginLibDir}", gradlePluginPath)
+	initScriptContent := strings.ReplaceAll(initScriptPattern, "${pluginLibDir}", gradlePluginPath)
 	if !utils.IsPathExists(gradleDependenciesDir) {
 		err = os.MkdirAll(gradleDependenciesDir, 0777)
 		if err != nil {
@@ -192,54 +260,14 @@ func (config *gradleRunConfig) GetCmd() *exec.Cmd {
 	return exec.Command(cmd[0], cmd[1:]...)
 }
 
-func (config *gradleRunConfig) runCmd() error {
+func (config *gradleRunConfig) runCmd(stdout, stderr io.Writer) error {
 	command := config.GetCmd()
 	command.Env = os.Environ()
 	for k, v := range config.env {
 		command.Env = append(command.Env, k+"="+v)
 	}
 	command.Env = append(command.Env, extractorPropsDir+"="+config.extractorPropsFile)
-	command.Stderr = os.Stderr
-	command.Stdout = os.Stderr
+	command.Stderr = stderr
+	command.Stdout = stdout
 	return command.Run()
 }
-
-const GradleInitScript = `import org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin
-import org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask
-
-initscript {
-    dependencies {
-        classpath fileTree('${pluginLibDir}')
-    }
-}
-
-addListener(new BuildInfoPluginListener())
-class BuildInfoPluginListener extends BuildAdapter {
-
-    def void projectsLoaded(Gradle gradle) {
-        Map<String, String> projectProperties = new HashMap<String, String>(gradle.startParameter.getProjectProperties())
-        projectProperties.put("build.start", Long.toString(System.currentTimeMillis()))
-        gradle.startParameter.setProjectProperties(projectProperties)
-
-        Project root = gradle.getRootProject()
-        root.logger.debug("Artifactory plugin: projectsEvaluated: ${root.name}")
-        if (!"buildSrc".equals(root.name)) {
-            root.allprojects {
-                apply {
-                    apply plugin: ArtifactoryPlugin
-                }
-            }
-        }
-
-        // Set the "mavenJava" and "ivyJava" publications or
-        // "archives" configuration to all Artifactory tasks.
-        for (Project p : root.getAllprojects()) {
-            Task t = p.getTasks().findByName(ArtifactoryTask.ARTIFACTORY_PUBLISH_TASK_NAME)
-            if (t != null) {
-                ArtifactoryTask task = (ArtifactoryTask) t
-                task.setCiServerBuild()
-            }
-        }
-    }
-}
-`
diff --git a/build/gradle_test.go b/build/gradle_test.go
index 0711081d..5d5179a9 100644
--- a/build/gradle_test.go
+++ b/build/gradle_test.go
@@ -6,22 +6,99 @@ import (
 	"testing"
 
 	"github.com/jfrog/build-info-go/utils"
+	"github.com/jfrog/gofrog/version"
 	"github.com/stretchr/testify/assert"
 )
 
+const gradleVersionPattern = `------------------------------------------------------------
+Gradle %s
+------------------------------------------------------------
+
+Build time:   2019-11-01 20:42:00 UTC
+Revision:     dd870424f9bd8e195d614dc14bb140f43c22da98
+
+Kotlin:       1.3.41
+Groovy:       2.5.4
+Ant:          Apache Ant(TM) version 1.9.14 compiled on March 12 2019
+JVM:          11.0.10 (AdoptOpenJDK 11.0.10+9)
+OS:           Mac OS X 10.16 x86_64
+`
+
+var downloadExtractorsFromReleasesCases = []struct {
+	extractorVersion string
+}{
+	{extractorVersion: gradleExtractor4DependencyVersion},
+	{extractorVersion: gradleExtractor5DependencyVersion},
+}
+
 func TestDownloadExtractorsFromReleases(t *testing.T) {
-	tempDirPath, err := utils.CreateTempDir()
-	assert.NoError(t, err)
-	defer func() {
-		assert.NoError(t, utils.RemoveTempDir(tempDirPath))
-		assert.NoError(t, utils.CleanOldDirs())
-	}()
+	for _, testCase := range downloadExtractorsFromReleasesCases {
+		t.Run(testCase.extractorVersion, func(t *testing.T) {
+			tempDirPath, err := utils.CreateTempDir()
+			assert.NoError(t, err)
+			defer func() {
+				assert.NoError(t, utils.RemoveTempDir(tempDirPath))
+				assert.NoError(t, utils.CleanOldDirs())
+			}()
+
+			// Download JAR
+			err = downloadGradleDependencies(tempDirPath, testCase.extractorVersion, nil, &utils.NullLog{})
+			assert.NoError(t, err)
+
+			// Make sure the Gradle build-info extractor JAR exist
+			expectedJarPath := filepath.Join(tempDirPath, fmt.Sprintf(gradleExtractorFileName, testCase.extractorVersion))
+			assert.FileExists(t, expectedJarPath)
+		})
+	}
+}
+
+var getExtractorVersionAndInitScriptCases = []struct {
+	projectName               string
+	expectedExtractorVersion  string
+	expectedInitScriptPattern string
+}{
+	{projectName: "gradle-6.8", expectedExtractorVersion: gradleExtractor4DependencyVersion, expectedInitScriptPattern: gradleInitScriptExtractor4},
+	{projectName: "gradle-6.8.1", expectedExtractorVersion: gradleExtractor5DependencyVersion, expectedInitScriptPattern: gradleInitScriptExtractor5},
+	{projectName: "gradle-7.0", expectedExtractorVersion: gradleExtractor5DependencyVersion, expectedInitScriptPattern: gradleInitScriptExtractor5},
+}
 
-	// Download JAR
-	err = downloadGradleDependencies(tempDirPath, nil, &utils.NullLog{})
+func TestGetExtractorVersionAndInitScript(t *testing.T) {
+	gradleModule := &GradleModule{containingBuild: &Build{logger: &utils.NullLog{}}}
+	gradleExe, err := GetGradleExecPath(true)
 	assert.NoError(t, err)
+	for _, testCase := range getExtractorVersionAndInitScriptCases {
+		t.Run(testCase.projectName, func(t *testing.T) {
+			projectPath := filepath.Join("testdata", "gradle", testCase.projectName, gradleExe)
+			gradleExtractorVersion, initScriptPattern, err := gradleModule.getExtractorVersionAndInitScript(projectPath)
+			assert.NoError(t, err)
+			assert.Equal(t, testCase.expectedExtractorVersion, gradleExtractorVersion)
+			assert.Equal(t, testCase.expectedInitScriptPattern, initScriptPattern)
+		})
+	}
+}
+
+func TestGetGradlePluginVersionError(t *testing.T) {
+	gradleModule := &GradleModule{containingBuild: &Build{logger: &utils.NullLog{}}}
+	_, _, err := gradleModule.getExtractorVersionAndInitScript("non-exist")
+	assert.ErrorContains(t, err, "executable file not found")
+}
+
+var parseGradleVersionCases = []struct {
+	versionOutput   string
+	expectedVersion *version.Version
+}{
+	{versionOutput: "1.2", expectedVersion: version.NewVersion("1.2")},
+	{versionOutput: "1.2.3", expectedVersion: version.NewVersion("1.2.3")},
+	{versionOutput: "1.23.4", expectedVersion: version.NewVersion("1.23.4")},
+	{versionOutput: "1.2-rc-1", expectedVersion: version.NewVersion("1.2-rc-1")},
+}
 
-	// Make sure the Gradle build-info extractor JAR exist
-	expectedJarPath := filepath.Join(tempDirPath, fmt.Sprintf(GradleExtractorFileName, GradleExtractorDependencyVersion))
-	assert.FileExists(t, expectedJarPath)
+func TestParseGradleVersion(t *testing.T) {
+	for _, testCase := range parseGradleVersionCases {
+		t.Run(testCase.expectedVersion.GetVersion(), func(t *testing.T) {
+			actualVersion, err := parseGradleVersion(fmt.Sprintf(gradleVersionPattern, testCase.versionOutput))
+			assert.NoError(t, err)
+			assert.Equal(t, testCase.expectedVersion, actualVersion)
+		})
+	}
 }
diff --git a/build/init-gradle-extractor-4.gradle b/build/init-gradle-extractor-4.gradle
new file mode 100644
index 00000000..41844883
--- /dev/null
+++ b/build/init-gradle-extractor-4.gradle
@@ -0,0 +1,38 @@
+import org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin
+import org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask
+
+initscript {
+    dependencies {
+        classpath fileTree('${pluginLibDir}')
+    }
+}
+
+addListener(new BuildInfoPluginListener())
+
+class BuildInfoPluginListener extends BuildAdapter {
+
+    def void projectsLoaded(Gradle gradle) {
+        Map<String, String> projectProperties = new HashMap<String, String>(gradle.startParameter.getProjectProperties())
+        projectProperties.put("build.start", Long.toString(System.currentTimeMillis()))
+        gradle.startParameter.setProjectProperties(projectProperties)
+        Project root = gradle.getRootProject()
+        root.logger.debug("Artifactory plugin: projectsEvaluated: ${root.name}")
+        if (!"buildSrc".equals(root.name)) {
+            root.allprojects {
+                apply {
+                    apply plugin: ArtifactoryPlugin
+                }
+            }
+        }
+
+        // Set the "mavenJava" and "ivyJava" publications or
+        // "archives" configuration to all Artifactory tasks.
+        for (Project p : root.getAllprojects()) {
+            Task t = p.getTasks().findByName(ArtifactoryTask.ARTIFACTORY_PUBLISH_TASK_NAME)
+            if (t != null) {
+                ArtifactoryTask task = (ArtifactoryTask) t
+                task.setCiServerBuild()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build/init-gradle-extractor-5.gradle b/build/init-gradle-extractor-5.gradle
new file mode 100644
index 00000000..0292259a
--- /dev/null
+++ b/build/init-gradle-extractor-5.gradle
@@ -0,0 +1,48 @@
+import org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin
+import org.jfrog.gradle.plugin.artifactory.ArtifactoryPluginSettings
+import org.jfrog.gradle.plugin.artifactory.Constant
+import org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask
+
+initscript {
+    dependencies {
+        classpath fileTree('${pluginLibDir}')
+    }
+}
+
+addListener(new BuildInfoPluginListener())
+
+class BuildInfoPluginListener extends BuildAdapter {
+
+    @Override
+    void beforeSettings(Settings settings) {
+        settings.apply plugin: ArtifactoryPluginSettings
+    }
+
+    @Override
+    void projectsLoaded(Gradle gradle) {
+        Map<String, String> projectProperties = new HashMap<String, String>(gradle.startParameter.getProjectProperties())
+        projectProperties.put("build.start", Long.toString(System.currentTimeMillis()))
+        gradle.startParameter.setProjectProperties(projectProperties)
+        Project root = gradle.getRootProject()
+        root.logger.debug("Artifactory plugin: projectsEvaluated: ${root.name}")
+        if (!"buildSrc".equals(root.name)) {
+            root.allprojects {
+                apply {
+                    apply plugin: ArtifactoryPlugin
+                }
+            }
+        }
+
+        // Set the CI Server mode to all Artifactory tasks.
+        for (Project p : root.getAllprojects()) {
+            try {
+                TaskProvider<? extends Task> subCollectInfoTask = p.getTasks().named(Constant.ARTIFACTORY_PUBLISH_TASK_NAME, ArtifactoryTask.class);
+                subCollectInfoTask.configure { task ->
+                    task.setCiServerBuild()
+                }
+            } catch (UnknownTaskException e) {
+                root.logger.debug("Can't find sub project configured for {}", p.getPath());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build/testdata/gradle/gradle-6.8.1/.gitattributes b/build/testdata/gradle/gradle-6.8.1/.gitattributes
new file mode 100644
index 00000000..00a51aff
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8.1/.gitattributes
@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+
diff --git a/build/testdata/gradle/gradle-6.8.1/.gitignore b/build/testdata/gradle/gradle-6.8.1/.gitignore
new file mode 100644
index 00000000..1b6985c0
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8.1/.gitignore
@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
diff --git a/build/testdata/gradle/gradle-6.8.1/build.gradle b/build/testdata/gradle/gradle-6.8.1/build.gradle
new file mode 100644
index 00000000..5ade3e05
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8.1/build.gradle
@@ -0,0 +1,6 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This is a general purpose Gradle build.
+ * Learn more about Gradle by exploring our samples at https://docs.gradle.org/6.9.3/samples
+ */
diff --git a/build/testdata/gradle/gradle-6.8.1/gradle/wrapper/gradle-wrapper.jar b/build/testdata/gradle/gradle-6.8.1/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..e708b1c0
Binary files /dev/null and b/build/testdata/gradle/gradle-6.8.1/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/build/testdata/gradle/gradle-6.8.1/gradle/wrapper/gradle-wrapper.properties b/build/testdata/gradle/gradle-6.8.1/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..1c4bcc29
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8.1/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/build/testdata/gradle/gradle-6.8.1/gradlew b/build/testdata/gradle/gradle-6.8.1/gradlew
new file mode 100755
index 00000000..1b6c7873
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8.1/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/build/testdata/gradle/gradle-6.8.1/gradlew.bat b/build/testdata/gradle/gradle-6.8.1/gradlew.bat
new file mode 100644
index 00000000..107acd32
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8.1/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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 Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@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="-Xmx64m" "-Xms64m"
+
+@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 execute
+
+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 execute
+
+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
+
+: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 %*
+
+: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/build/testdata/gradle/gradle-6.8.1/settings.gradle b/build/testdata/gradle/gradle-6.8.1/settings.gradle
new file mode 100644
index 00000000..ddd4b7b6
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8.1/settings.gradle
@@ -0,0 +1,10 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user manual at https://docs.gradle.org/6.9.3/userguide/multi_project_builds.html
+ */
+
+rootProject.name = 'gradle-6.8.1'
diff --git a/build/testdata/gradle/gradle-6.8/.gitattributes b/build/testdata/gradle/gradle-6.8/.gitattributes
new file mode 100644
index 00000000..00a51aff
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8/.gitattributes
@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+
diff --git a/build/testdata/gradle/gradle-6.8/.gitignore b/build/testdata/gradle/gradle-6.8/.gitignore
new file mode 100644
index 00000000..1b6985c0
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8/.gitignore
@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
diff --git a/build/testdata/gradle/gradle-6.8/build.gradle.kts b/build/testdata/gradle/gradle-6.8/build.gradle.kts
new file mode 100644
index 00000000..5ade3e05
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8/build.gradle.kts
@@ -0,0 +1,6 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This is a general purpose Gradle build.
+ * Learn more about Gradle by exploring our samples at https://docs.gradle.org/6.9.3/samples
+ */
diff --git a/build/testdata/gradle/gradle-6.8/gradle/wrapper/gradle-wrapper.jar b/build/testdata/gradle/gradle-6.8/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..e708b1c0
Binary files /dev/null and b/build/testdata/gradle/gradle-6.8/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/build/testdata/gradle/gradle-6.8/gradle/wrapper/gradle-wrapper.properties b/build/testdata/gradle/gradle-6.8/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..80cf08e7
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/build/testdata/gradle/gradle-6.8/gradlew b/build/testdata/gradle/gradle-6.8/gradlew
new file mode 100755
index 00000000..1b6c7873
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/build/testdata/gradle/gradle-6.8/gradlew.bat b/build/testdata/gradle/gradle-6.8/gradlew.bat
new file mode 100644
index 00000000..107acd32
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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 Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@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="-Xmx64m" "-Xms64m"
+
+@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 execute
+
+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 execute
+
+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
+
+: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 %*
+
+: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/build/testdata/gradle/gradle-6.8/settings.gradle.kts b/build/testdata/gradle/gradle-6.8/settings.gradle.kts
new file mode 100644
index 00000000..04b0ce23
--- /dev/null
+++ b/build/testdata/gradle/gradle-6.8/settings.gradle.kts
@@ -0,0 +1,10 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user manual at https://docs.gradle.org/6.9.3/userguide/multi_project_builds.html
+ */
+
+rootProject.name = "gradle-6.8"
diff --git a/build/testdata/gradle/gradle-7.0/.gitattributes b/build/testdata/gradle/gradle-7.0/.gitattributes
new file mode 100644
index 00000000..00a51aff
--- /dev/null
+++ b/build/testdata/gradle/gradle-7.0/.gitattributes
@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+
diff --git a/build/testdata/gradle/gradle-7.0/.gitignore b/build/testdata/gradle/gradle-7.0/.gitignore
new file mode 100644
index 00000000..1b6985c0
--- /dev/null
+++ b/build/testdata/gradle/gradle-7.0/.gitignore
@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
diff --git a/build/testdata/gradle/gradle-7.0/build.gradle.kts b/build/testdata/gradle/gradle-7.0/build.gradle.kts
new file mode 100644
index 00000000..5ade3e05
--- /dev/null
+++ b/build/testdata/gradle/gradle-7.0/build.gradle.kts
@@ -0,0 +1,6 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This is a general purpose Gradle build.
+ * Learn more about Gradle by exploring our samples at https://docs.gradle.org/6.9.3/samples
+ */
diff --git a/build/testdata/gradle/gradle-7.0/gradle/wrapper/gradle-wrapper.jar b/build/testdata/gradle/gradle-7.0/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..e708b1c0
Binary files /dev/null and b/build/testdata/gradle/gradle-7.0/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/build/testdata/gradle/gradle-7.0/gradle/wrapper/gradle-wrapper.properties b/build/testdata/gradle/gradle-7.0/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..3c4101c3
--- /dev/null
+++ b/build/testdata/gradle/gradle-7.0/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/build/testdata/gradle/gradle-7.0/gradlew b/build/testdata/gradle/gradle-7.0/gradlew
new file mode 100755
index 00000000..1b6c7873
--- /dev/null
+++ b/build/testdata/gradle/gradle-7.0/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/build/testdata/gradle/gradle-7.0/gradlew.bat b/build/testdata/gradle/gradle-7.0/gradlew.bat
new file mode 100644
index 00000000..107acd32
--- /dev/null
+++ b/build/testdata/gradle/gradle-7.0/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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 Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@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="-Xmx64m" "-Xms64m"
+
+@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 execute
+
+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 execute
+
+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
+
+: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 %*
+
+: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/build/testdata/gradle/gradle-7.0/settings.gradle.kts b/build/testdata/gradle/gradle-7.0/settings.gradle.kts
new file mode 100644
index 00000000..5437fef6
--- /dev/null
+++ b/build/testdata/gradle/gradle-7.0/settings.gradle.kts
@@ -0,0 +1,10 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user manual at https://docs.gradle.org/6.9.3/userguide/multi_project_builds.html
+ */
+
+rootProject.name = "gradle-7.0"