Use the owned dependency collector.

Author: marchermans

modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/JarJarProjectPlugin.java

@@ -8,7 +8,6 @@
 import com.ldtteam.tableau.neogradle.NeoGradlePlugin;
 import com.ldtteam.tableau.sourceset.management.extensions.SourceSetExtension;
 import net.neoforged.gradle.common.tasks.JarJar;
-import net.neoforged.gradle.common.util.DependencyCollectorInjector;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
@@ -78,8 +77,8 @@ private void configureContainedConfiguration(Project project) {
         sourceSets.matching(sourceSet -> SourceSet.isMain(sourceSet.getSourceSet()))
                 .configureEach(sourceSet -> {
                     final SourceSetExtension.SourceSetConfiguration main = sourceSets.maybeCreate(SourceSet.MAIN_SOURCE_SET_NAME);
-                    final net.neoforged.gradle.common.util.DependencyCollectorInjector
-                        inject = project.getObjects().newInstance(net.neoforged.gradle.common.util.DependencyCollectorInjector.class);
+                    final DependencyCollectorInjector
+                        inject = project.getObjects().newInstance(DependencyCollectorInjector.class);
                     final DependencyCollector collector = inject.getDependencyCollector();
                     main.getDependencies().getExtensions().add(CONTAINED_CONFIGURATION_NAME, collector);
 

modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java

@@ -84,10 +84,12 @@ private void configureContainedConfiguration(Project project) {
         sourceSets.matching(sourceSet -> SourceSet.isMain(sourceSet.getSourceSet()))
                 .configureEach(sourceSet -> {
                     final SourceSetExtension.SourceSetConfiguration main = sourceSets.maybeCreate(SourceSet.MAIN_SOURCE_SET_NAME);
-                    final DependencyCollector dependencies = project.getObjects().dependencyCollector();
-                    main.getDependencies().getExtensions().add(CONTAINED_CONFIGURATION_NAME, dependencies);
+                    final DependencyCollectorInjector
+                        inject = project.getObjects().newInstance(DependencyCollectorInjector.class);
+                    final DependencyCollector collector = inject.getDependencyCollector();
+                    main.getDependencies().getExtensions().add(CONTAINED_CONFIGURATION_NAME, collector);
 
-                    configuration.fromDependencyCollector(dependencies);
+                    configuration.fromDependencyCollector(collector);
                 });
     }
 
@@ -130,4 +132,9 @@ private void configureShadowJarTask(Project project) {
             shadowing.getRenamedNamespaces().get().forEach(shadowJar::relocate);
         });
     }
+
+    public interface DependencyCollectorInjector
+    {
+        DependencyCollector getDependencyCollector();
+    }
 }