Skip to content

Commit a8b08cb

Browse files
committed
Bump minimum Gradle to 8.1
1 parent 2b945b8 commit a8b08cb

File tree

6 files changed

+8
-18
lines changed

6 files changed

+8
-18
lines changed

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
public class SpotlessPlugin implements Plugin<Project> {
2929
static final String SPOTLESS_MODERN = "spotlessModern";
30-
static final String VER_GRADLE_MIN = "7.3";
30+
static final String VER_GRADLE_MIN = "8.1";
3131
static final String VER_GRADLE_MIN_VERSION_FOR_CUSTOM = "8.4";
3232
private static final int MINIMUM_JRE = 17;
3333

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2024 DiffPlug
2+
* Copyright 2020-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.
@@ -24,8 +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-
setFile("settings.gradle").toContent("enableFeaturePreview(\"STABLE_CONFIGURATION_CACHE\")");
28-
return super.gradleRunner().withGradleVersion(GradleVersionSupport.STABLE_CONFIGURATION_CACHE.version);
27+
return super.gradleRunner().withGradleVersion(GradleVersionSupport.MINIMUM.version);
2928
}
3029

3130
@Test

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ public class GradleIntegrationHarness extends ResourceHarness {
4646
public enum GradleVersionSupport {
4747
MINIMUM(SpotlessPlugin.VER_GRADLE_MIN),
4848

49-
// https://docs.gradle.org/7.5/userguide/configuration_cache.html#config_cache:stable
50-
STABLE_CONFIGURATION_CACHE("7.5"),
51-
5249
CUSTOM_STEPS(SpotlessPlugin.VER_GRADLE_MIN_VERSION_FOR_CUSTOM),
5350

5451
;
@@ -59,7 +56,8 @@ public enum GradleVersionSupport {
5956
String minVersionForRunningJRE;
6057
switch (Jvm.version()) {
6158
case 25:
62-
// TODO: https://docs.gradle.org/current/userguide/compatibility.html
59+
minVersionForRunningJRE = "9.1.0";
60+
break;
6361
case 24:
6462
minVersionForRunningJRE = "8.14";
6563
break;
@@ -75,12 +73,6 @@ public enum GradleVersionSupport {
7573
case 20:
7674
minVersionForRunningJRE = "8.3";
7775
break;
78-
case 19:
79-
minVersionForRunningJRE = "7.6";
80-
break;
81-
case 18:
82-
minVersionForRunningJRE = "7.5";
83-
break;
8476
default:
8577
minVersionForRunningJRE = null;
8678
break;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +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-
setFile("settings.gradle").toContent("enableFeaturePreview(\"STABLE_CONFIGURATION_CACHE\")");
92-
return super.gradleRunner().withGradleVersion(GradleVersionSupport.STABLE_CONFIGURATION_CACHE.version);
91+
return super.gradleRunner().withGradleVersion(GradleVersionSupport.MINIMUM.version);
9392
} else {
9493
File gradleProps = new File(rootFolder(), "gradle.properties");
9594
if (gradleProps.exists()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ 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");
185185
BuildResult spotlessApply = gradleRunner()
186-
.withGradleVersion(GradleVersionSupport.STABLE_CONFIGURATION_CACHE.version)
186+
.withGradleVersion(GradleVersionSupport.MINIMUM.version)
187187
.withArguments("--stacktrace", "--configuration-cache", "spotlessApply").build();
188188
Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
189189
assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");

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.STABLE_CONFIGURATION_CACHE.version);
47+
return super.gradleRunner().withGradleVersion(GradleVersionSupport.MINIMUM.version);
4848
} else {
4949
return super.gradleRunner();
5050
}

0 commit comments

Comments
 (0)