Skip to content

Commit 6db6335

Browse files
committed
Fix compatibility tests
1 parent 7def050 commit 6db6335

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2024 DiffPlug
2+
* Copyright 2016-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,8 +44,6 @@
4444
public class GradleIntegrationHarness extends ResourceHarness {
4545
public enum GradleVersionSupport {
4646
JRE_11("5.0"), MINIMUM(SpotlessPlugin.VER_GRADLE_min), CUSTOM_STEPS(SpotlessPlugin.VER_GRADLE_minVersionForCustom),
47-
// technically, this API exists in 6.5, but the flags for it change in 6.6, so we build to that
48-
CONFIGURATION_CACHE("6.6"),
4947
// https://docs.gradle.org/7.5/userguide/configuration_cache.html#config_cache:stable
5048
STABLE_CONFIGURATION_CACHE("7.5");
5149

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class NativeCmdWithConfigCacheTest extends GradleIntegrationHarness implements N
5353
public GradleRunner gradleRunner() throws IOException {
5454
setFile("gradle.properties").toLines("org.gradle.unsafe.configuration-cache=true",
5555
"org.gradle.configuration-cache=true");
56-
return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
56+
return super.gradleRunner();
5757
}
5858
}
5959
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void redirectPluginOldGradle() throws IOException {
5454
" > We have moved from 'com.diffplug.gradle.spotless'",
5555
" to 'com.diffplug.spotless'",
5656
" To migrate:",
57-
" - Upgrade Gradle to 6.1.1 or newer (you're on 5.0)",
57+
" - Upgrade Gradle to 7.1 or newer (you're on 5.0)",
5858
" - Test your build with: id 'com.diffplug.gradle.spotless' version '4.5.1'"));
5959
}
6060

@@ -68,6 +68,6 @@ void realPluginOldGradle() throws IOException {
6868
Assertions.assertThat(gradleRunner().withGradleVersion(GradleVersionSupport.JRE_11.version)
6969
.buildAndFail().getOutput().replace("\r", ""))
7070
.contains(StringPrinter.buildStringFromLines(
71-
"Spotless requires Gradle 6.1.1 or newer, this was 5.0"));
71+
"Spotless requires Gradle 7.1 or newer, this was 5.0"));
7272
}
7373
}

0 commit comments

Comments
 (0)