Skip to content

Commit 331ce26

Browse files
committed
Align Gradle test version with minimum supported version
Closes gh-97
1 parent 17b319d commit 331ce26

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

develocity-conventions-gradle-plugin/src/test/java/io/spring/develocity/conventions/gradle/DevelocityConventionsPluginIntegrationTests.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ class DevelocityConventionsPluginIntegrationTests {
4747
@Test
4848
void whenThePluginIsAppliedThenBuildScanConventionsAreApplied(@TempDir File projectDir) {
4949
prepareProject(projectDir);
50-
BuildResult result = build(projectDir, "6.0.1", "verifyBuildScanConfig");
50+
BuildResult result = build(projectDir, "verifyBuildScanConfig");
5151
assertThat(result.getOutput()).contains("Build scan server: https://ge.spring.io");
5252
assertThat(result.getOutput()).contains("Capture task input files: true");
5353
}
5454

5555
@Test
5656
void whenThePluginIsAppliedThenBuildCacheConventionsAreApplied(@TempDir File projectDir) {
5757
prepareProject(projectDir);
58-
BuildResult result = build(projectDir, "6.0.1", "verifyBuildCacheConfig");
58+
BuildResult result = build(projectDir, "verifyBuildCacheConfig");
5959
assertThat(result.getOutput()).contains("Build cache server: https://ge.spring.io");
6060
}
6161

6262
@Test
6363
void whenThePluginIsAppliedAndBuildScansAreDisabledThenBuildScanConventionsAreNotApplied(@TempDir File projectDir) {
6464
prepareProject(projectDir);
65-
BuildResult result = build(projectDir, "6.0.1", "verifyBuildScanConfig", "--no-scan");
65+
BuildResult result = build(projectDir, "verifyBuildScanConfig", "--no-scan");
6666
assertThat(result.getOutput()).contains("Build scan server: null");
6767
assertThat(result.getOutput()).contains("Capture task input files: false");
6868
}
@@ -72,7 +72,7 @@ void whenThePluginIsAppliedAndTheSpringBuildTypeIsNotOssThenBuildScanConventions
7272
@TempDir File projectDir) {
7373
prepareProject(projectDir);
7474
write(new File(projectDir, "gradle.properties"), (writer) -> writer.println("spring.build-type=other"));
75-
BuildResult result = build(projectDir, "6.0.1", "verifyBuildScanConfig");
75+
BuildResult result = build(projectDir, "verifyBuildScanConfig");
7676
assertThat(result.getOutput()).contains("Build scan server: null");
7777
assertThat(result.getOutput()).contains("Capture task input files: false");
7878
}
@@ -81,7 +81,7 @@ void whenThePluginIsAppliedAndTheSpringBuildTypeIsNotOssThenBuildScanConventions
8181
void whenThePluginIsAppliedAndTheSpringBuildTypeIsOssThenBuildScanConventionsAreApplied(@TempDir File projectDir) {
8282
prepareProject(projectDir);
8383
write(new File(projectDir, "gradle.properties"), (writer) -> writer.println("spring.build-type=oss"));
84-
BuildResult result = build(projectDir, "6.0.1", "verifyBuildScanConfig");
84+
BuildResult result = build(projectDir, "verifyBuildScanConfig");
8585
assertThat(result.getOutput()).contains("Build scan server: https://ge.spring.io");
8686
assertThat(result.getOutput()).contains("Capture task input files: true");
8787
}
@@ -90,7 +90,7 @@ void whenThePluginIsAppliedAndTheSpringBuildTypeIsOssThenBuildScanConventionsAre
9090
void whenThePluginIsAppliedAndPropertiesTaskIsExecutedThenBuildScanConventionsAreNotApplied(
9191
@TempDir File projectDir) {
9292
prepareProject(projectDir);
93-
BuildResult result = build(projectDir, "6.0.1", "properties", "verifyBuildScanConfig", "--no-scan");
93+
BuildResult result = build(projectDir, "properties", "verifyBuildScanConfig", "--no-scan");
9494
assertThat(result.getOutput()).contains("Build scan server: null");
9595
assertThat(result.getOutput()).contains("Capture task input files: false");
9696
}
@@ -99,23 +99,23 @@ void whenThePluginIsAppliedAndPropertiesTaskIsExecutedThenBuildScanConventionsAr
9999
void givenMultiProjectBuildWhenThePluginIsAppliedAndPropertiesTaskIsExecutedThenBuildScanConventionsAreNotApplied(
100100
@TempDir File projectDir) {
101101
prepareMultiModuleProject(projectDir);
102-
BuildResult result = build(projectDir, "6.0.1", "sub:properties", "sub:verifyBuildScanConfig", "--no-scan");
102+
BuildResult result = build(projectDir, "sub:properties", "sub:verifyBuildScanConfig", "--no-scan");
103103
assertThat(result.getOutput()).contains("Build scan server: null");
104104
assertThat(result.getOutput()).contains("Capture task input files: false");
105105
}
106106

107107
@Test
108108
void whenThePluginIsAppliedAndScanIsSpecifiedThenServerIsNotCustomized(@TempDir File projectDir) {
109109
prepareProject(projectDir);
110-
BuildResult result = build(projectDir, "6.0.1", "verifyBuildScanConfig", "--scan");
110+
BuildResult result = build(projectDir, "verifyBuildScanConfig", "--scan");
111111
assertThat(result.getOutput()).contains("Build scan server: null");
112112
assertThat(result.getOutput()).contains("Capture task input files: true");
113113
}
114114

115115
@Test
116116
void whenThePluginIsAppliedAndBuildCacheIsDisabledThenBuildCacheConventionsAreNotApplied(@TempDir File projectDir) {
117117
prepareProject(projectDir);
118-
BuildResult result = build(projectDir, "6.0.1", "verifyBuildCacheConfig", "--no-build-cache");
118+
BuildResult result = build(projectDir, "verifyBuildCacheConfig", "--no-build-cache");
119119
assertThat(result.getOutput()).contains("Build cache server: null");
120120
}
121121

@@ -124,15 +124,15 @@ void whenThePluginIsAppliedAndTheSpringBuildTypeIsNotOssThenBuildCacheConvention
124124
@TempDir File projectDir) {
125125
prepareProject(projectDir);
126126
write(new File(projectDir, "gradle.properties"), (writer) -> writer.println("spring.build-type=other"));
127-
BuildResult result = build(projectDir, "6.0.1", "verifyBuildCacheConfig");
127+
BuildResult result = build(projectDir, "verifyBuildCacheConfig");
128128
assertThat(result.getOutput()).contains("Build cache server: null");
129129
}
130130

131131
@Test
132132
void whenThePluginIsAppliedAndTheSpringBuildTypeIsOssThenBuildCacheConventionsAreApplied(@TempDir File projectDir) {
133133
prepareProject(projectDir);
134134
write(new File(projectDir, "gradle.properties"), (writer) -> writer.println("spring.build-type=oss"));
135-
BuildResult result = build(projectDir, "6.0.1", "verifyBuildCacheConfig");
135+
BuildResult result = build(projectDir, "verifyBuildCacheConfig");
136136
assertThat(result.getOutput()).contains("Build cache server: https://ge.spring.io");
137137
}
138138

@@ -206,15 +206,14 @@ private String version() {
206206
}
207207
}
208208

209-
private BuildResult build(File projectDir, String gradleVersion, String... arguments) {
209+
private BuildResult build(File projectDir, String... arguments) {
210210
List<File> classpath = Arrays.asList(new File("bin/main"), new File("build/classes/java/main"),
211211
new File("build/resources/main"),
212212
new File(DevelocityPlugin.class.getProtectionDomain().getCodeSource().getLocation().getFile()),
213213
new File(ConfigurableBuildScan.class.getProtectionDomain().getCodeSource().getLocation().getFile()));
214214
List<String> augmentedArguments = new ArrayList<>(Arrays.asList(arguments));
215215
augmentedArguments.add("--stacktrace");
216216
return GradleRunner.create()
217-
.withGradleVersion(gradleVersion)
218217
.withProjectDir(projectDir)
219218
.withPluginClasspath(classpath)
220219
.withArguments(augmentedArguments)

0 commit comments

Comments
 (0)