Bump the min Gradle requirement to 7.1 and test on 9.0.0-rc-1

Goooler · Goooler · commit 3b66bf038a27 · 2025-07-08T09:22:38.000+08:00
diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml
@@ -10,10 +10,9 @@ jobs:
     name: changelogPrint
     steps:
       - uses: actions/checkout@v4
-      - name: jdk 11
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,11 +23,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Install JDK 11
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 11
+          java-version: 21
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v4
       - name: spotlessCheck
@@ -41,33 +40,32 @@ jobs:
       matrix:
         kind: [maven, gradle]
         # Test on the latest Java version once Gradle & Maven support it.
-        jre: [11, 17, 21, 23]
+        jre: [17, 21, 23]
         os: [ubuntu-latest]
         include:
           # test windows at the diagonals of the above matrix
           - kind: maven
-            jre: 11
+            jre: 17
             os: windows-latest
           - kind: gradle
             jre: 17
             os: windows-latest
           # npm on linux only (crazy slow on windows)
           - kind: npm
-            jre: 11
+            jre: 17
             os: ubuntu-latest
           - kind: shfmt
-            jre: 11
+            jre: 17
             os: ubuntu-latest
             shfmt-version: v3.8.0
           - kind: idea
-            jre: 11
+            jre: 17
             os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
@@ -111,3 +109,37 @@ 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
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -38,10 +38,9 @@ jobs:
       ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }}
     steps:
       - uses: actions/checkout@v4
-      - name: jdk 11
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v4
diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,7 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
 
 name=spotless
 description=Spotless - keep your code spotless with Gradle
@@ -32,4 +33,4 @@ VER_JGIT=6.10.1.202505221210-r
 VER_JUNIT=5.13.1
 VER_ASSERTJ=3.27.3
 VER_MOCKITO=5.18.0
-VER_SELFIE=2.5.3
+VER_SELFIE=2.5.3
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -1,3 +1,5 @@
+import org.gradle.util.GradleVersion
+
 plugins {
 	id 'java-library'
 	id 'io.github.davidburstrom.version-compatibility'
@@ -147,6 +149,11 @@ tasks.withType(Test).configureEach {
 		// https://docs.gradle.org/7.5/userguide/upgrading_version_7.html#removes_implicit_add_opens_for_test_workers
 		jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
 	}
+
+	if (GradleVersion.current() >= GradleVersion.version('9.0')) {
+		// https://github.com/gradle/gradle/issues/33619
+		failOnNoDiscoveredTests = false
+	}
 }
 
 jar {
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
@@ -4,6 +4,9 @@ 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))
+
 ## [7.1.0] - 2025-07-07
 ### Added
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 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.
@@ -18,11 +18,8 @@
 import javax.inject.Inject;
 
 import org.gradle.api.GradleException;
-import org.gradle.api.internal.plugins.DslObject;
 import org.gradle.api.plugins.GroovyBasePlugin;
 import org.gradle.api.tasks.GroovySourceDirectorySet;
-import org.gradle.api.tasks.GroovySourceSet;
-import org.gradle.util.GradleVersion;
 
 import com.diffplug.spotless.generic.LicenseHeaderStep;
 
@@ -66,12 +63,7 @@ protected void setupTask(SpotlessTask task) {
 			target = getSources(getProject(),
 					message,
 					sourceSet -> {
-						if (GradleVersion.current().compareTo(GradleVersion.version(SpotlessPlugin.VER_GRADLE_javaPluginExtension)) >= 0) {
-							return sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class);
-						} else {
-							final GroovySourceSet groovySourceSet = new DslObject(sourceSet).getConvention().getPlugin(GroovySourceSet.class);
-							return groovySourceSet.getGroovy();
-						}
+						return sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class);
 					},
 					file -> {
 						final String name = file.getName();
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,31 +22,20 @@
 import org.gradle.api.Project;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.SourceDirectorySet;
-import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.specs.Spec;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
-import org.gradle.util.GradleVersion;
 
 interface JvmLang {
 
 	default FileCollection getSources(Project project, String message, Function<SourceSet, SourceDirectorySet> sourceSetSourceDirectory, Spec<? super File> filterSpec) {
-		final SourceSetContainer sourceSets;
 		FileCollection union = project.files();
-		if (GradleVersion.current().compareTo(GradleVersion.version(SpotlessPlugin.VER_GRADLE_javaPluginExtension)) >= 0) {
-			final JavaPluginExtension javaPluginExtension = project.getExtensions().findByType(JavaPluginExtension.class);
-			if (javaPluginExtension == null) {
-				throw new GradleException(message);
-			}
-			sourceSets = javaPluginExtension.getSourceSets();
-		} else {
-			final JavaPluginConvention javaPluginConvention = project.getConvention().findPlugin(JavaPluginConvention.class);
-			if (javaPluginConvention == null) {
-				throw new GradleException(message);
-			}
-			sourceSets = javaPluginConvention.getSourceSets();
+		final JavaPluginExtension javaPluginExtension = project.getExtensions().findByType(JavaPluginExtension.class);
+		if (javaPluginExtension == null) {
+			throw new GradleException(message);
 		}
+		final SourceSetContainer sourceSets = javaPluginExtension.getSourceSets();
 		for (SourceSet sourceSet : sourceSets) {
 			union = union.plus(sourceSetSourceDirectory.apply(sourceSet).filter(filterSpec));
 		}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java
@@ -27,8 +27,7 @@
 
 public class SpotlessPlugin implements Plugin<Project> {
 	static final String SPOTLESS_MODERN = "spotlessModern";
-	static final String VER_GRADLE_min = "6.1.1";
-	static final String VER_GRADLE_javaPluginExtension = "7.1";
+	static final String VER_GRADLE_min = "7.1";
 	static final String VER_GRADLE_minVersionForCustom = "8.4";
 	private static final int MINIMUM_JRE = 11;
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.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.
@@ -44,8 +44,6 @@
 public class GradleIntegrationHarness extends ResourceHarness {
 	public enum GradleVersionSupport {
 		JRE_11("5.0"), MINIMUM(SpotlessPlugin.VER_GRADLE_min), CUSTOM_STEPS(SpotlessPlugin.VER_GRADLE_minVersionForCustom),
-		// technically, this API exists in 6.5, but the flags for it change in 6.6, so we build to that
-		CONFIGURATION_CACHE("6.6"),
 		// https://docs.gradle.org/7.5/userguide/configuration_cache.html#config_cache:stable
 		STABLE_CONFIGURATION_CACHE("7.5");
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java
@@ -53,7 +53,7 @@ class NativeCmdWithConfigCacheTest extends GradleIntegrationHarness implements N
 		public GradleRunner gradleRunner() throws IOException {
 			setFile("gradle.properties").toLines("org.gradle.unsafe.configuration-cache=true",
 					"org.gradle.configuration-cache=true");
-			return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
+			return super.gradleRunner();
 		}
 	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ void redirectPluginOldGradle() throws IOException {
 						"   > We have moved from 'com.diffplug.gradle.spotless'",
 						"                     to 'com.diffplug.spotless'",
 						"     To migrate:",
-						"     - Upgrade Gradle to 6.1.1 or newer (you're on 5.0)",
+						"     - 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'"));
 	}
 
@@ -68,6 +68,6 @@ void realPluginOldGradle() throws IOException {
 		Assertions.assertThat(gradleRunner().withGradleVersion(GradleVersionSupport.JRE_11.version)
 				.buildAndFail().getOutput().replace("\r", ""))
 				.contains(StringPrinter.buildStringFromLines(
-						"Spotless requires Gradle 6.1.1 or newer, this was 5.0"));
+						"Spotless requires Gradle 7.1 or newer, this was 5.0"));
 	}
 }
diff --git a/testlib/build.gradle b/testlib/build.gradle
@@ -7,7 +7,7 @@ apply from: rootProject.file('gradle/java-setup.gradle')
 
 dependencies {
 	api projects.lib
-	api files(projects.lib.dependencyProject.sourceSets.sortPom.output.classesDirs)
+	api files(project(projects.lib.path).sourceSets.sortPom.output.classesDirs)
 	api "com.diffplug.durian:durian-core:${VER_DURIAN}"
 	api "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 	api "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.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.
@@ -82,7 +82,7 @@ private static Provisioner createWithRepositories(Consumer<RepositoryHandler> re
 				return config.resolve();
 			} catch (ResolveException e) {
 				/* Provide Maven coordinates in exception message instead of static string 'detachedConfiguration' */
-				throw new ResolveException(config.getDescription(), e);
+				throw new RuntimeException("Error resolving configuration: " + config.getDescription(), e);
 			} finally {
 				// delete the temp dir
 				try {
