Skip to content

Refactor DependencyCollectorInjector method names for clarity #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marchermans merged 2 commits into from
Nov 4, 2025
Merged

Refactor DependencyCollectorInjector method names for clarity #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3cbc2f
Refactor DependencyCollectorInjector method names for clarity
marchermans Nov 4, 2025
ae6dd0e
Simplify DependencyCollectorInjector by removing redundant access mod…
marchermans Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions common/src/main/java/net/neoforged/gradle/common/util/DependencyCollectorInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@

public interface DependencyCollectorInjector
{

@Inject
public DependencyCollector dependencyCollector();
DependencyCollector getDependencyCollector();
}
2 changes: 1 addition & 1 deletion common/src/main/java/net/neoforged/gradle/common/util/ToolUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static Provider<File> resolveTool(final Project project, final Provider<S
//the project that converts the string to a dependency.
//This breaks the configuration cache as Projects can not be serialized.
final DependencyCollectorInjector inject = project.getObjects().newInstance(DependencyCollectorInjector.class);
final DependencyCollector collector = inject.dependencyCollector();
final DependencyCollector collector = inject.getDependencyCollector();
collector.add(tool.map(project.getDependencies()::create));
final Configuration config = ConfigurationUtils.temporaryUnhandledConfiguration(
project.getConfigurations(),
Expand Down
2 changes: 1 addition & 1 deletion userdev/src/main/java/net/neoforged/gradle/userdev/dependency/UserDevDependencyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private void registerUnitTestDependencyMapping(Project project) {
.flatMap(TransformerUtils.combineAllLists(project, String.class, Function.identity()))
.map(dependencyCoordinates -> {
final DependencyCollectorInjector injector = project.getObjects().newInstance(DependencyCollectorInjector.class);
final DependencyCollector collector = injector.dependencyCollector();
final DependencyCollector collector = injector.getDependencyCollector();
dependencyCoordinates.forEach(collector::add);
return collector;
})
Expand Down
Loading