Unit Tests fixed for now

Author: shartte

src/main/java/net/neoforged/moddevgradle/dsl/ImmutableModdingVersions.java

@@ -2,7 +2,6 @@
 
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.tasks.SourceSet;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class ModdingVersionSettings {
@@ -12,6 +11,14 @@ public abstract class ModdingVersionSettings {
     @Nullable
     private String neoFormVersion;
 
+    public @Nullable String getNeoForgeVersion() {
+        return neoForgeVersion;
+    }
+
+    public @Nullable String getNeoFormVersion() {
+        return neoFormVersion;
+    }
+
     /**
      * NeoForge version number. You have to set either this or {@link #setNeoFormVersion}.
      */
@@ -33,9 +40,4 @@ public void setNeoFormVersion(String version) {
      * Defaults to the main source set, but can also be set to an empty list.
      */
     public abstract ListProperty<SourceSet> getEnabledSourceSets();
-
-    @ApiStatus.Internal
-    public ImmutableModdingVersions toImmutable() {
-        return new ImmutableModdingVersions(neoForgeVersion, neoFormVersion);
-    }
 }

src/main/java/net/neoforged/moddevgradle/dsl/ModdingVersionSettings.java

@@ -54,21 +54,14 @@ public void enableModding(Action<ModdingVersionSettings> customizer) {
         var modDevPlugin = project.getPlugins().getPlugin(ModDevPlugin.class);
 
         var settings = project.getObjects().newInstance(ModdingVersionSettings.class);
-        // By default enable modding deps only for the main source set
+        // By default, enable modding deps only for the main source set
         settings.getEnabledSourceSets().convention(project.provider(() -> {
             var sourceSets = ExtensionUtils.getSourceSets(project);
             return List.of(sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME));
         }));
         customizer.execute(settings);
 
-        var versions = settings.toImmutable();
-
-        modDevPlugin.enableModding(
-                project,
-                settings.getEnabledSourceSets().get(),
-                versions.neoForgeVersion(),
-                versions.neoFormVersion()
-        );
+        modDevPlugin.enableModding(project, settings);
     }
 
     /**

src/main/java/net/neoforged/moddevgradle/dsl/NeoForgeExtension.java

@@ -147,7 +147,9 @@ private void publishDataFiles(String groupId,
                 group = "{0}"
                 version = "{1}"
                 neoForge {
-                    version = "{DEFAULT_NEOFORGE_VERSION}"
+                    enableModding {
+                        neoForgeVersion = "{DEFAULT_NEOFORGE_VERSION}"
+                    }
                 }
                 publishing {
                     publications {

src/main/java/net/neoforged/moddevgradle/internal/ModDevPlugin.java

@@ -28,7 +28,7 @@ public void testApplyInEmptyProject() throws IOException {
                 .withArguments("tasks", "--all")
                 .build();
 
-        assertThat(result.getOutput()).contains("createMinecraftArtifacts");
+        assertThat(result.getOutput()).doesNotContain("createMinecraftArtifacts");
         assertEquals(TaskOutcome.SUCCESS, result.task(":tasks").getOutcome());
     }
 

src/test/java/net/neoforged/moddevgradle/functional/DataFileCollectionFunctionalTest.java

@@ -34,7 +34,7 @@ public void testApplyInEmptyProject() throws IOException {
                 .withArguments("tasks", "--all")
                 .build();
 
-        assertThat(result.getOutput()).contains("createMinecraftArtifacts");
+        assertThat(result.getOutput()).doesNotContain("createMinecraftArtifacts");
         assertEquals(TaskOutcome.SUCCESS, result.task(":tasks").getOutcome());
     }
 }

src/test/java/net/neoforged/moddevgradle/functional/GroovyScriptTest.java

@@ -24,6 +24,8 @@ void setup() {
         project.getPlugins().apply(ModDevPlugin.class);
 
         extension = ExtensionUtils.getExtension(project, "neoForge", NeoForgeExtension.class);
+
+        extension.enableModding(settings -> settings.setNeoForgeVersion("1.2.3"));
     }
 
     @Test