Skip to content

Commit e01febc

Browse files
committed
Relax types on SharedUtil#contains
I need to be able to read through a filtered container set.
1 parent 524546a commit e01febc

File tree

1 file changed

+7
-7
lines changed
  • gradleutils-shared/src/main/java/net/minecraftforge/gradleutils/shared

1 file changed

+7
-7
lines changed

gradleutils-shared/src/main/java/net/minecraftforge/gradleutils/shared/SharedUtil.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
import org.gradle.TaskExecutionRequest;
1313
import org.gradle.api.Action;
1414
import org.gradle.api.DomainObjectCollection;
15+
import org.gradle.api.NamedDomainObjectSet;
1516
import org.gradle.api.Project;
1617
import org.gradle.api.Transformer;
1718
import org.gradle.api.artifacts.Configuration;
18-
import org.gradle.api.artifacts.ConfigurationContainer;
1919
import org.gradle.api.artifacts.Dependency;
2020
import org.gradle.api.artifacts.FileCollectionDependency;
2121
import org.gradle.api.artifacts.ModuleVersionSelector;
@@ -251,7 +251,7 @@ public List<String> getArgs() {
251251
/// declared in one of the `test` source set's dependency-scope configurations)
252252
/// @param dependency The dependency to find
253253
/// @return If the source set contains the dependency
254-
public static boolean contains(ConfigurationContainer configurations, SourceSet sourceSet, boolean transitive, Dependency dependency) {
254+
public static boolean contains(NamedDomainObjectSet<Configuration> configurations, SourceSet sourceSet, boolean transitive, Dependency dependency) {
255255
return contains(configurations, sourceSet, transitive, dependency::equals);
256256
}
257257

@@ -264,7 +264,7 @@ public static boolean contains(ConfigurationContainer configurations, SourceSet
264264
/// declared in one of the `test` source set's dependency-scope configurations)
265265
/// @param dependency The dependency to find
266266
/// @return If the source set contains the dependency
267-
public static boolean contains(ConfigurationContainer configurations, SourceSet sourceSet, boolean transitive, Spec<? super Dependency> dependency) {
267+
public static boolean contains(NamedDomainObjectSet<Configuration> configurations, SourceSet sourceSet, boolean transitive, Spec<? super Dependency> dependency) {
268268
return contains(configurations, sourceSet.getCompileOnlyConfigurationName(), transitive, dependency) ||
269269
contains(configurations, sourceSet.getCompileOnlyApiConfigurationName(), transitive, dependency) ||
270270
contains(configurations, sourceSet.getCompileClasspathConfigurationName(), transitive, dependency) ||
@@ -277,7 +277,7 @@ public static boolean contains(ConfigurationContainer configurations, SourceSet
277277
contains(configurations, sourceSet.getRuntimeElementsConfigurationName(), transitive, dependency);
278278
}
279279

280-
private static boolean contains(ConfigurationContainer configurations, String configurationName, boolean transitive, Spec<? super Dependency> dependency) {
280+
private static boolean contains(NamedDomainObjectSet<Configuration> configurations, String configurationName, boolean transitive, Spec<? super Dependency> dependency) {
281281
var configuration = configurations.findByName(configurationName);
282282
return configuration != null && !(transitive ? configuration.getAllDependencies() : configuration.getDependencies()).matching(dependency).isEmpty();
283283
}
@@ -291,7 +291,7 @@ private static boolean contains(ConfigurationContainer configurations, String co
291291
/// declared in one of the `test` source set's dependency-scope configurations)
292292
/// @param dependency The dependency to find
293293
/// @return The set containing the filtered dependencies
294-
public static Set<Dependency> collect(ConfigurationContainer configurations, SourceSet sourceSet, boolean transitive, Predicate<? super Dependency> dependency) {
294+
public static Set<Dependency> collect(NamedDomainObjectSet<Configuration> configurations, SourceSet sourceSet, boolean transitive, Predicate<? super Dependency> dependency) {
295295
return Stream
296296
.of(
297297
configurations.findByName(sourceSet.getCompileOnlyConfigurationName()),
@@ -320,7 +320,7 @@ private static <T> void guardCheck(T t) { }
320320
/// @param sourceSet The source set
321321
/// @param action The action to run
322322
/// @see #forEach(DomainObjectCollection, Action)
323-
public static void forEachClasspath(ConfigurationContainer configurations, SourceSet sourceSet, Action<? super Configuration> action) {
323+
public static void forEachClasspath(NamedDomainObjectSet<Configuration> configurations, SourceSet sourceSet, Action<? super Configuration> action) {
324324
forEach(configurations.named(
325325
name -> name.equals(sourceSet.getCompileClasspathConfigurationName())
326326
|| name.equals(sourceSet.getRuntimeClasspathConfigurationName())
@@ -333,7 +333,7 @@ public static void forEachClasspath(ConfigurationContainer configurations, Sourc
333333
/// @param sourceSet The source set
334334
/// @param action The action to run
335335
/// @see #forEachEagerly(DomainObjectCollection, Action)
336-
public static void forEachClasspathEagerly(ConfigurationContainer configurations, SourceSet sourceSet, Action<? super Configuration> action) {
336+
public static void forEachClasspathEagerly(NamedDomainObjectSet<Configuration> configurations, SourceSet sourceSet, Action<? super Configuration> action) {
337337
forEachEagerly(configurations.named(
338338
name -> name.equals(sourceSet.getCompileClasspathConfigurationName())
339339
|| name.equals(sourceSet.getRuntimeClasspathConfigurationName())

0 commit comments

Comments
 (0)