Bump the min Gradle and Java requirements to 7.3 and 17

Author: Goooler

.github/workflows/ci.yml

@@ -102,37 +102,3 @@ jobs:
           check_name: JUnit ${{ matrix.kind }} ${{ matrix.jre }} ${{ matrix.os }}
           report_paths: '*/build/test-results/*/TEST-*.xml'
           check_retries: true
-
-  # Gradle 9 requires Java 17 or higher, we use Gradle 8.14 (instead of gradlew) to build on Java 11.
-  build-on-java-11:
-    needs: sanityCheck
-    strategy:
-      fail-fast: false
-      matrix:
-        kind: [maven, gradle]
-        jre: [11]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: "temurin"
-          java-version: ${{ matrix.jre }}
-      - uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-version: 8.14.2
-      - name: build (maven-only)
-        if: matrix.kind == 'maven'
-        run: gradle :plugin-maven:build -x spotlessCheck
-      - name: build (everything-but-maven)
-        if: matrix.kind == 'gradle'
-        run: gradle build -x spotlessCheck -PSPOTLESS_EXCLUDE_MAVEN=true
-      - name: junit result
-        uses: mikepenz/action-junit-report@v5
-        if: always() # always run even if the previous step fails
-        with:
-          check_name: JUnit ${{ matrix.kind }} ${{ matrix.jre }} ${{ matrix.os }}
-          report_paths: '*/build/test-results/*/TEST-*.xml'
-          check_retries: true

lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java

@@ -15,11 +15,8 @@
  */
 package com.diffplug.spotless.extra.cpp;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_17;
-
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -33,7 +30,6 @@ public EclipseCdtFormatterStepTest() {
 
 	@ParameterizedTest
 	@MethodSource
-	@EnabledForJreRange(min = JAVA_17)
 	void formatWithVersion(String version) throws Exception {
 		harnessFor(version).test("main.c",
 				"#include <a.h>;\nint main(int argc,   \nchar *argv[]) {}",

plugin-gradle/CHANGES.md

@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 
 ### Changed
-* Bump the min Gradle requirement from `6.1.1` to `7.1`. ([#2540](https://github.com/diffplug/spotless/pull/2540))
+* Bump the min Gradle and Java requirements to `7.3` and `17`. ([#2540](https://github.com/diffplug/spotless/pull/2540))
 
 ## [7.1.0] - 2025-07-07
 ### Added

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

@@ -27,9 +27,9 @@
 
 public class SpotlessPlugin implements Plugin<Project> {
 	static final String SPOTLESS_MODERN = "spotlessModern";
-	static final String VER_GRADLE_min = "7.1";
+	static final String VER_GRADLE_min = "7.3";
 	static final String VER_GRADLE_minVersionForCustom = "8.4";
-	private static final int MINIMUM_JRE = 11;
+	private static final int MINIMUM_JRE = 17;
 
 	@Override
 	public void apply(Project project) {

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

@@ -43,9 +43,14 @@
 
 public class GradleIntegrationHarness extends ResourceHarness {
 	public enum GradleVersionSupport {
-		JRE_11("5.0"), MINIMUM(SpotlessPlugin.VER_GRADLE_min), CUSTOM_STEPS(SpotlessPlugin.VER_GRADLE_minVersionForCustom),
+		MINIMUM(SpotlessPlugin.VER_GRADLE_min),
+
 		// https://docs.gradle.org/7.5/userguide/configuration_cache.html#config_cache:stable
-		STABLE_CONFIGURATION_CACHE("7.5");
+		STABLE_CONFIGURATION_CACHE("7.5"),
+
+		CUSTOM_STEPS(SpotlessPlugin.VER_GRADLE_minVersionForCustom),
+
+		;
 
 		final String version;
 
@@ -72,18 +77,6 @@ public enum GradleVersionSupport {
 			case 18:
 				minVersionForRunningJRE = "7.5";
 				break;
-			case 17:
-				minVersionForRunningJRE = "7.3";
-				break;
-			case 16:
-				minVersionForRunningJRE = "7.0";
-				break;
-			case 15:
-				minVersionForRunningJRE = "6.7";
-				break;
-			case 14:
-				minVersionForRunningJRE = "6.3";
-				break;
 			default:
 				minVersionForRunningJRE = null;
 				break;

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

@@ -15,13 +15,10 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-
 import java.io.IOException;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 import com.diffplug.common.base.StringPrinter;
 
@@ -39,35 +36,4 @@ void redirectPluginModernGradle() throws IOException {
 						"     To migrate:",
 						"     - Test your build with: id 'com.diffplug.gradle.spotless' version '4.5.1'"));
 	}
-
-	@Test
-	@EnabledForJreRange(max = JAVA_11)
-	void redirectPluginOldGradle() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.gradle.spotless'",
-				"}");
-		Assertions.assertThat(gradleRunner().withGradleVersion(GradleVersionSupport.JRE_11.version)
-				.buildAndFail().getOutput().replace("\r", ""))
-				.contains(StringPrinter.buildStringFromLines(
-						"> Failed to apply plugin [id 'com.diffplug.gradle.spotless']",
-						"   > We have moved from 'com.diffplug.gradle.spotless'",
-						"                     to 'com.diffplug.spotless'",
-						"     To migrate:",
-						"     - Upgrade Gradle to 7.1 or newer (you're on 5.0)",
-						"     - Test your build with: id 'com.diffplug.gradle.spotless' version '4.5.1'"));
-	}
-
-	@Test
-	@EnabledForJreRange(max = JAVA_11)
-	void realPluginOldGradle() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}");
-		Assertions.assertThat(gradleRunner().withGradleVersion(GradleVersionSupport.JRE_11.version)
-				.buildAndFail().getOutput().replace("\r", ""))
-				.contains(StringPrinter.buildStringFromLines(
-						"Spotless requires Gradle 7.1 or newer, this was 5.0"));
-	}
 }

testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.java;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_13;
-import static org.junit.jupiter.api.condition.JRE.JAVA_15;
 import static org.junit.jupiter.api.condition.JRE.JAVA_20;
 import static org.junit.jupiter.api.condition.JRE.JAVA_21;
 
@@ -33,15 +31,13 @@
 class GoogleJavaFormatStepTest extends ResourceHarness {
 
 	@Test
-	@EnabledForJreRange(min = JAVA_13)
 	void jvm13Features() throws Exception {
 		try (StepHarness step = StepHarness.forStep(GoogleJavaFormatStep.create(TestProvisioner.mavenCentral()))) {
 			step.testResource("java/googlejavaformat/TextBlock.dirty", "java/googlejavaformat/TextBlock.clean");
 		}
 	}
 
 	@Test
-	@EnabledForJreRange(max = JAVA_15) // google-java-format requires JRE 11+
 	void behavior18() throws Exception {
 		FormatterStep step = GoogleJavaFormatStep.create("1.8", TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)

testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java

@@ -15,10 +15,7 @@
  */
 package com.diffplug.spotless.java;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_13;
-
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
@@ -29,7 +26,6 @@
 class PalantirJavaFormatStepTest extends ResourceHarness {
 
 	@Test
-	@EnabledForJreRange(min = JAVA_13)
 	void jvm13Features() throws Exception {
 		try (StepHarness step = StepHarness.forStep(PalantirJavaFormatStep.create(TestProvisioner.mavenCentral()))) {
 			step.testResource("java/palantirjavaformat/TextBlock.dirty", "java/palantirjavaformat/TextBlock.clean");

testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 DiffPlug
+ * Copyright 2024-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package com.diffplug.spotless.rdf;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_17;
-
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -27,7 +25,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.params.provider.Arguments;
 import org.opentest4j.AssertionFailedError;
 
@@ -52,15 +49,13 @@ private static FormatterStep forTurtleFormatterVersionAndStyle(String version, M
 	public RdfFormatterTest() {}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_17)
 	void testTurtleFormatter_1_2_12_DefaultStyle() throws IOException, ClassNotFoundException {
 		String inputDir = "/rdf/ttl/input/";
 		String expectedOutputDir = "/rdf/ttl/expected/v1.2.12-default/";
 		testBeforeAfterFolders(inputDir, expectedOutputDir, StepHarness.forStep(forTurtleFormatterVersion("1.2.12")));
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_17)
 	void testTurtleFormatter_1_2_12_style01() throws IOException, ClassNotFoundException {
 		String inputDir = "/rdf/ttl/input/";
 		String expectedOutputDir = "/rdf/ttl/expected/v1.2.12-style01/";