Skip to content

Commit 67a9044

Browse files
committed
Stop pinning Gradle version in tests
1 parent a8b08cb commit 67a9044

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class ConfigurationCacheTest extends GradleIntegrationHarness {
2424
@Override
2525
public GradleRunner gradleRunner() throws IOException {
2626
setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
27-
return super.gradleRunner().withGradleVersion(GradleVersionSupport.MINIMUM.version);
27+
return super.gradleRunner();
2828
}
2929

3030
@Test

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/IdeHookTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private void runWith(boolean configurationCache, String... arguments) throws IOE
8888
protected GradleRunner gradleRunner(boolean configurationCache) throws IOException {
8989
if (configurationCache) {
9090
setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
91-
return super.gradleRunner().withGradleVersion(GradleVersionSupport.MINIMUM.version);
91+
return super.gradleRunner();
9292
} else {
9393
File gradleProps = new File(rootFolder(), "gradle.properties");
9494
if (gradleProps.exists()) {

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,7 @@ void useNpmNextToConfiguredNodePluginFromNodeGradlePlugin() throws Exception {
182182
public void supportsConfigurationCache() throws Exception {
183183
setFile("build.gradle").toResource("com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle");
184184
setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
185-
BuildResult spotlessApply = gradleRunner()
186-
.withGradleVersion(GradleVersionSupport.MINIMUM.version)
187-
.withArguments("--stacktrace", "--configuration-cache", "spotlessApply").build();
185+
BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "--configuration-cache", "spotlessApply").build();
188186
Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
189187
assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
190188
}

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ToggleOffOnTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public GradleRunner gradleRunner() throws IOException {
4444
if (useConfigCache) {
4545
setFile("gradle.properties").toLines("org.gradle.unsafe.configuration-cache=true",
4646
"org.gradle.configuration-cache=true");
47-
return super.gradleRunner().withGradleVersion(GradleVersionSupport.MINIMUM.version);
47+
return super.gradleRunner();
4848
} else {
4949
return super.gradleRunner();
5050
}

0 commit comments

Comments
 (0)