Fix an issue with recompile dependency order (now we use MDC before ARDs).

gradle.properties

@@ -37,6 +37,6 @@ spock_version=2.1
 spock_groovy_version=3.0
 mockito_version=4.11.0
 jimfs_version=1.2
-trainingwheels_version=2.0.7
+trainingwheels_version=2.0.10
 
 githubCiTesting=true

neoform/src/main/java/net/neoforged/gradle/neoform/runtime/extensions/NeoFormRuntimeExtension.java

@@ -595,7 +595,7 @@ protected void bakeDefinition(NeoFormRuntimeDefinition definition)
         ).orElseThrow(() -> new IllegalStateException("No input for recompile task due to pre-task adapters"));
 
         final FileCollection recompileDependencies =
-            definition.getAdditionalRecompileDependencies().plus(spec.getProject().files(definition.getMinecraftDependenciesConfiguration()));
+            definition.getMinecraftDependenciesConfiguration().plus(spec.getProject().files(definition.getAdditionalRecompileDependencies()));
 
         final TaskProvider<? extends Runtime> recompileTask =
             createRecompileTask(definition, recompileInput, recompileDependencies, task -> {

settings.gradle

@@ -1,12 +1,12 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven { url = 'https://maven.neoforged.net/' }
+        maven { url = 'https://maven.neoforged.net/releases' }
     }
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 rootProject.name = 'NeoGradle'

test-utils/src/main/groovy/net/neoforged/gradle/utils/test/extensions/RuntimeBuilderExtensions.groovy

@@ -8,6 +8,10 @@ import net.neoforged.trainingwheels.gradle.functional.builder.Runtime
  */
 class RuntimeBuilderExtensions {
 
+    static File withTemporaryGlobalCacheDirectory(final Runtime.Builder self) {
+        return withGlobalCacheDirectory(self, self.tempDir)
+    }
+
     /**
      * Sets the global cache directory to the given {@param testProjectDir}.
      *

userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/AccessTransformerTests.groovy

@@ -3,6 +3,7 @@ package net.neoforged.gradle.userdev
 import groovy.json.JsonSlurper
 import net.neoforged.trainingwheels.gradle.functional.BuilderBasedTestSpecification
 import org.gradle.testkit.runner.TaskOutcome
+import net.neoforged.gradle.userdev.constants.TestConstants
 
 import java.util.zip.ZipFile
 
@@ -18,7 +19,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
         given:
         def project = create("userdev_supports_ats_from_file", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -58,7 +59,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
         given:
         def project = create("userdev_supports_ats_from_file_decompiler_disabled", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -99,7 +100,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
         given:
         def project = create("userdev_supports_ats_from_file", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:+'
@@ -137,7 +138,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
         given:
         def project = create("userdev_supports_ats_in_multiple_distinctly_named_files", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer2.cfg')
@@ -178,7 +179,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
         given:
         def project = create("userdev_supports_ats_in_files_named_the_same", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
             minecraft.accessTransformers.file rootProject.file('src/main/resources/accesstransformer.cfg')
@@ -219,7 +220,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
         given:
         def consumedProject = create("u_e_iis_publisher", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             group = "n.n.n.u.t.p"
             version = "1.0.0"
@@ -255,7 +256,7 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
         and:
         def consumingProject = create("u_e_iis_consuming", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             group = "n.n.n.u.t.g"
             version = "1.0.0"

userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/AdvancedFmlTests.groovy

@@ -2,6 +2,7 @@ package net.neoforged.gradle.userdev
 
 import net.neoforged.trainingwheels.gradle.functional.BuilderBasedTestSpecification
 import org.gradle.testkit.runner.TaskOutcome
+import net.neoforged.gradle.userdev.constants.TestConstants
 
 class AdvancedFmlTests extends BuilderBasedTestSpecification {
 
@@ -15,7 +16,7 @@ class AdvancedFmlTests extends BuilderBasedTestSpecification {
         given:
         def project = create("running_patch_task_is_possible", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             repositories {
                 mavenLocal()
@@ -43,7 +44,7 @@ class AdvancedFmlTests extends BuilderBasedTestSpecification {
         given:
         def project = create("running_compile_in_ci", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             repositories {
                 mavenLocal()
@@ -84,7 +85,7 @@ class AdvancedFmlTests extends BuilderBasedTestSpecification {
         given:
         def project = create("running_compile_with_compiler_disabled", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:[21.11,21.12)'
@@ -120,28 +121,13 @@ class AdvancedFmlTests extends BuilderBasedTestSpecification {
     def "a mod using a disabled decompiler should be able to run the game"() {
         given:
         def project = create("disabled_decompiler_runs_game", {
-            it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
-
-            repositories {
-                mavenCentral()
-            }
-
-            dependencies {
-                implementation 'net.neoforged:neoforge:+'
-            }
-            """)
-
-            it.withMod()
-            it.withToolchains()
-            it.withGlobalCacheDirectory(tempDir)
+            it.withRun()
             it.property("neogradle.subsystems.decompiler.enabled", "false")
         })
 
         when:
         def run = project.run {
-            it.tasks(':runClientData')
-            it.stacktrace()
+            it.run()
         }
 
         then:
@@ -153,7 +139,7 @@ class AdvancedFmlTests extends BuilderBasedTestSpecification {
         given:
         def project = create("enabled_decompiler_uses_setup", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             repositories {
                 mavenCentral()

userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/CentralCacheTests.groovy

@@ -4,6 +4,7 @@ import net.neoforged.gradle.common.services.caching.CachedExecutionService
 import net.neoforged.gradle.common.services.caching.locking.IOControlledFileBasedLock
 import net.neoforged.trainingwheels.gradle.functional.BuilderBasedTestSpecification
 import org.gradle.testkit.runner.TaskOutcome
+import net.neoforged.gradle.userdev.constants.TestConstants
 
 import java.nio.file.Files
 
@@ -19,7 +20,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
         given:
         def project = create("caching_is_enabled_by_default", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:+'
@@ -45,7 +46,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
         File cacheDir;
         def project = create("cache_supports_cleanup_and_take_over_of_failed_lock", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:+'
@@ -84,7 +85,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
         given:
         def project = create("cache_can_be_disabled", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:+'
@@ -110,7 +111,7 @@ class CentralCacheTests extends BuilderBasedTestSpecification {
         given:
         def project = create("userdev_supports_ats_from_file", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
 

userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationCacheTests.groovy

@@ -1,8 +1,8 @@
 package net.neoforged.gradle.userdev
 
-
 import net.neoforged.trainingwheels.gradle.functional.BuilderBasedTestSpecification
 import org.gradle.testkit.runner.TaskOutcome
+import net.neoforged.gradle.userdev.constants.TestConstants;
 
 class ConfigurationCacheTests extends BuilderBasedTestSpecification {
 
@@ -16,7 +16,7 @@ class ConfigurationCacheTests extends BuilderBasedTestSpecification {
         given:
         def project = create("compile_supports_configuration_cache_build", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:+'
@@ -41,7 +41,7 @@ class ConfigurationCacheTests extends BuilderBasedTestSpecification {
         given:
         def project = create("compile_supports_configuration_cache_build_and_is_reused", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:+'
@@ -90,48 +90,15 @@ class ConfigurationCacheTests extends BuilderBasedTestSpecification {
     def "run_tasks_supports_configuration_cache_build"() {
         given:
         def project = create("compile_supports_configuration_cache_build", {
-            it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
-
-            dependencies {
-                implementation 'net.neoforged:neoforge:+'
-            }
-
-            runs {
-                clientData { }
-            }
-
-            afterEvaluate {
-                //We don't care for the error here, we just want to run the task so that the config cache is created
-                tasks.withType(JavaExec).named('runClientData') {
-                    ignoreExitValue = true
-                    group = 'run'
-                }
-            }
-            """)
-            it.file("src/main/java/net/neoforged/gradle/userdev/ConfigurationCacheTests.java", """
-                package net.neoforged.gradle.userdev;
-
-                import net.minecraft.client.Minecraft;
-
-                public class ConfigurationCacheTests {
-                    public static void main(String[] args) {
-                        System.out.println(Minecraft.getInstance().getClass().toString());
-                    }
-                }
-            """)
-            it.withToolchains()
-            it.withGlobalCacheDirectory(tempDir)
-            it.enableLocalBuildCache()
+            it.withRun()
         })
 
         when:
         def run = project.run {
-            it.tasks('runClientData')
-
+            it.run()
         }
 
         then:
-        run.task(':runClientData').outcome == TaskOutcome.SUCCESS
+        run.checkModLoading()
     }
 }

userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationTests.groovy

@@ -3,6 +3,7 @@ package net.neoforged.gradle.userdev
 
 import net.neoforged.trainingwheels.gradle.functional.BuilderBasedTestSpecification
 import org.gradle.testkit.runner.TaskOutcome
+import net.neoforged.gradle.userdev.constants.TestConstants
 
 class ConfigurationTests extends BuilderBasedTestSpecification {
 
@@ -16,7 +17,7 @@ class ConfigurationTests extends BuilderBasedTestSpecification {
         given:
         def project = create("userdev_in_implementation_does_not_leak", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:+'
@@ -81,7 +82,7 @@ class ConfigurationTests extends BuilderBasedTestSpecification {
         def project = create("userdev_in_implementation_does_not_leak_via_publishing", {
             it.plugin('maven-publish')
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:+'
@@ -132,7 +133,7 @@ class ConfigurationTests extends BuilderBasedTestSpecification {
         def project = create("userdev_with_delayed_config_works", {
             it.plugin('maven-publish')
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:+'

userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/DepreciationTests.groovy

@@ -3,6 +3,7 @@ package net.neoforged.gradle.userdev
 
 import net.neoforged.trainingwheels.gradle.functional.BuilderBasedTestSpecification
 import org.gradle.testkit.runner.TaskOutcome
+import net.neoforged.gradle.userdev.constants.TestConstants
 
 class DepreciationTests extends BuilderBasedTestSpecification {
 
@@ -17,7 +18,7 @@ class DepreciationTests extends BuilderBasedTestSpecification {
         given:
         def project = create("apply_supports_configuration_cache_build", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
             """)
             it.withToolchains()
             it.withGlobalCacheDirectory(tempDir)
@@ -37,7 +38,7 @@ class DepreciationTests extends BuilderBasedTestSpecification {
         given:
         def project = create("compile_supports_configuration_cache_build", {
             it.build("""
-            java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+            java.toolchain.languageVersion = JavaLanguageVersion.of(${TestConstants.Latest.JavaVersion})
 
             dependencies {
                 implementation 'net.neoforged:neoforge:+'