Commit b9764838 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.4.x'

Closes gh-26330
parents 6df3a829 c0fe2318
...@@ -51,7 +51,7 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex ...@@ -51,7 +51,7 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
GRADLE_VERSIONS = Arrays.asList("7.0"); GRADLE_VERSIONS = Arrays.asList("7.0");
} }
else { else {
GRADLE_VERSIONS = Arrays.asList("current", "7.0"); GRADLE_VERSIONS = Arrays.asList("current", "6.9-rc-1", "7.0");
} }
} }
......
...@@ -175,6 +175,7 @@ public class GradleBuild { ...@@ -175,6 +175,7 @@ public class GradleBuild {
scriptContent = scriptContent.replace("{" + property.getKey() + "}", property.getValue()); scriptContent = scriptContent.replace("{" + property.getKey() + "}", property.getValue());
} }
FileCopyUtils.copy(scriptContent, new FileWriter(new File(this.projectDir, "build" + this.dsl.getExtension()))); FileCopyUtils.copy(scriptContent, new FileWriter(new File(this.projectDir, "build" + this.dsl.getExtension())));
new File(this.projectDir, "settings.gradle").createNewFile();
FileSystemUtils.copyRecursively(new File("src/test/resources/repository"), FileSystemUtils.copyRecursively(new File("src/test/resources/repository"),
new File(this.projectDir, "repository")); new File(this.projectDir, "repository"));
GradleRunner gradleRunner = GradleRunner.create().withProjectDir(this.projectDir) GradleRunner gradleRunner = GradleRunner.create().withProjectDir(this.projectDir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment