Skip to content

Commit e2d3d63

Browse files
committed
Remove the workaround for Guava issue 6801
1 parent 8d4cd28 commit e2d3d63

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

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

Lines changed: 1 addition & 5 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.
@@ -26,7 +26,6 @@
2626
import org.gradle.api.artifacts.Configuration;
2727
import org.gradle.api.artifacts.ConfigurationContainer;
2828
import org.gradle.api.artifacts.dsl.DependencyHandler;
29-
import org.gradle.api.attributes.Attribute;
3029
import org.gradle.api.attributes.Bundling;
3130
import org.gradle.api.attributes.Category;
3231
import org.gradle.api.initialization.dsl.ScriptHandler;
@@ -125,9 +124,6 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
125124
config.attributes(attr -> {
126125
attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
127126
attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
128-
// TODO: This is a copy-paste from org.gradle.api.attributes.java.TargetJvmEnvironment which is added in Gradle 7.0, remove this once we drop support for Gradle 6.x.
129-
// Add this attribute for resolving Guava dependency, see https://github.com/google/guava/issues/6801.
130-
attr.attribute(Attribute.of("org.gradle.jvm.environment", String.class), "standard-jvm");
131127
});
132128
return config.resolve();
133129
} catch (Exception e) {

0 commit comments

Comments
 (0)