Declare TARGET_JVM_ENVIRONMENT_ATTRIBUTE attr for resolving Guava

Goooler · Goooler · commit 073a762e4eaf · 2023-11-27T16:05:17.000+08:00
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GradleProvisioner.java
@@ -28,7 +28,9 @@
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.attributes.Bundling;
 import org.gradle.api.attributes.Category;
+import org.gradle.api.attributes.java.TargetJvmEnvironment;
 import org.gradle.api.initialization.dsl.ScriptHandler;
+import org.gradle.util.GradleVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -124,6 +126,10 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 				config.attributes(attr -> {
 					attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
 					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
+					// TARGET_JVM_ENVIRONMENT_ATTRIBUTE has been added in Gradle 7.0
+					if (GradleVersion.current().compareTo(GradleVersion.version(SpotlessPlugin.VER_GRADLE_7)) >= 0) {
+						attr.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, project.getObjects().named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM));
+					}
 				});
 				return config.resolve();
 			} catch (Exception e) {
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,6 +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_7 = "7.0";
 	static final String VER_GRADLE_javaPluginExtension = "7.1";
 	private static final int MINIMUM_JRE = 11;
 
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
@@ -33,7 +33,9 @@
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
 import org.gradle.api.attributes.Bundling;
 import org.gradle.api.attributes.Category;
+import org.gradle.api.attributes.java.TargetJvmEnvironment;
 import org.gradle.testfixtures.ProjectBuilder;
+import org.gradle.util.GradleVersion;
 
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.base.StandardSystemProperty;
@@ -73,6 +75,10 @@ private static Provisioner createWithRepositories(Consumer<RepositoryHandler> re
 			config.attributes(attr -> {
 				attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
 				attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
+				// TARGET_JVM_ENVIRONMENT_ATTRIBUTE has been added in Gradle 7.0
+				if (GradleVersion.current().compareTo(GradleVersion.version("7.0")) >= 0) {
+					attr.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, project.getObjects().named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM));
+				}
 			});
 			try {
 				return config.resolve();
