Skip to content

Commit 2f3c0dc

Browse files
committed
Use Set instead of Stream for dependency collection
1 parent d01ee7a commit 2f3c0dc

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

gradleutils-shared/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
id 'idea'
88
id 'eclipse'
99
id 'maven-publish'
10-
//id 'io.freefair.javadoc-links'
10+
id 'io.freefair.javadoc-links'
1111
id 'net.minecraftforge.gradleutils'
1212
alias libs.plugins.licenser
1313
alias libs.plugins.shadow
@@ -22,7 +22,7 @@ group = 'net.minecraftforge'
2222
java {
2323
toolchain.languageVersion = JavaLanguageVersion.of(17)
2424
withSourcesJar()
25-
//withJavadocJar()
25+
withJavadocJar()
2626
}
2727

2828
dependencies {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import java.util.Set;
4848
import java.util.function.Consumer;
4949
import java.util.function.Predicate;
50+
import java.util.stream.Collectors;
5051
import java.util.stream.Stream;
5152

5253
/// Shared utilities for Gradle plugins.
@@ -282,7 +283,7 @@ private static boolean contains(ConfigurationContainer configurations, String co
282283
/// declared in one of the `test` source set's dependency-scope configurations)
283284
/// @param dependency The dependency to find
284285
/// @return The set containing the filtered dependencies
285-
public static Stream<Dependency> collect(ConfigurationContainer configurations, SourceSet sourceSet, boolean transitive, Predicate<? super Dependency> dependency) {
286+
public static Set<Dependency> collect(ConfigurationContainer configurations, SourceSet sourceSet, boolean transitive, Predicate<? super Dependency> dependency) {
286287
return Stream
287288
.of(
288289
configurations.findByName(sourceSet.getCompileOnlyConfigurationName()),
@@ -299,7 +300,8 @@ public static Stream<Dependency> collect(ConfigurationContainer configurations,
299300
.filter(Objects::nonNull)
300301
.flatMap(configuration -> transitive ? configuration.getAllDependencies().stream() : configuration.getDependencies().stream())
301302
.distinct()
302-
.filter(dependency);
303+
.filter(dependency)
304+
.collect(Collectors.toSet());
303305
}
304306

305307
private static <T> void guardCheck(T t) { }

0 commit comments

Comments
 (0)