Implement support for version catalogs using DependencyCollectors.

gradle.properties

@@ -10,7 +10,7 @@ group=net.neoforged.gradle
 java_version=8
 
 #Dependency versions
-groovy_version=3.0.21
+groovy_version=3.0.17
 commons_io_version=2.11.0
 commons_codec_version=1.15
 gson_version=2.9.0
@@ -36,4 +36,4 @@ spock_version=2.1
 spock_groovy_version=3.0
 mockito_version=4.11.0
 jimfs_version=1.2
-trainingwheels_version=1.0.42
+trainingwheels_version=1.0.43

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

@@ -2,6 +2,8 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
     }
+
+    includeBuild '../TrainingWheels'
 }
 
 plugins {

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

@@ -11,11 +11,6 @@ class RunTests extends BuilderBasedTestSpecification {
         injectIntoAllProject = true;
     }
 
-    @Override
-    protected File getTestTempDirectory() {
-        return new File("build/runsTest");
-    }
-
     def "userdev supports custom run dependencies"() {
         given:
         def project = create("run_with_custom_dependencies", {
@@ -37,24 +32,147 @@ class RunTests extends BuilderBasedTestSpecification {
             runs {
                 client {
                     dependencies {
-                        runtime 'org.jgrapht:jgrapht:1.5.1'
+                        runtime 'org.jgrapht:jgrapht-core:+'
+                    }
+                    
+                    modSource project.sourceSets.main
+                }
+            }
+            """)
+            it.withToolchains()
+        })
+
+        when:
+        def run = project.run {
+            it.tasks(':writeMinecraftClasspathClient')
+        }
+
+        then:
+        run.task(':writeMinecraftClasspathClient').outcome == TaskOutcome.SUCCESS
+
+        def neoformDir = run.file(".gradle/configuration/neoForm")
+        def versionedNeoformDir = neoformDir.listFiles()[0]
+        def stepsDir = new File(versionedNeoformDir, "steps")
+        def stepDir = new File(stepsDir, "writeMinecraftClasspathClient")
+        def classpathFile = new File(stepDir, "classpath.txt")
+
+        classpathFile.exists()
+
+        classpathFile.text.contains("org.jgrapht/jgrapht-core")
+    }
+
+    def "userdev supports custom run dependencies from configuration"() {
+        given:
+        def project = create("run_with_custom_dependencies_from_configuration", {
+            it.build("""
+            java {
+                toolchain {
+                    languageVersion = JavaLanguageVersion.of(21)
+                }
+            }
+            
+            repositories {
+                mavenCentral()
+            }
+            
+            configurations {
+                runRuntime
+            }
+            
+            dependencies {
+                implementation 'net.neoforged:neoforge:+'
+                runRuntime 'org.jgrapht:jgrapht-core:+'
+            }
+            
+            runs {
+                client {
+                    dependencies {
+                        runtime project.configurations.runRuntime
                     }
                     
                     modSource project.sourceSets.main
                 }
             }
             """)
             it.withToolchains()
-            it.maxMemory("4g")
         })
 
         when:
         def run = project.run {
             it.tasks(':writeMinecraftClasspathClient')
-            it.debug()
         }
 
         then:
         run.task(':writeMinecraftClasspathClient').outcome == TaskOutcome.SUCCESS
+
+        def neoformDir = run.file(".gradle/configuration/neoForm")
+        def versionedNeoformDir = neoformDir.listFiles()[0]
+        def stepsDir = new File(versionedNeoformDir, "steps")
+        def stepDir = new File(stepsDir, "writeMinecraftClasspathClient")
+        def classpathFile = new File(stepDir, "classpath.txt")
+
+        classpathFile.exists()
+
+        classpathFile.text.contains("org.jgrapht/jgrapht-core")
+    }
+
+    def "userdev supports custom run dependencies from catalog"() {
+        given:
+        def project = create("run_with_custom_dependencies_from_configuration", {
+            it.file("gradle/libs.versions.toml",
+                    """
+                    [libraries]
+                    jgrapht = { group = "org.jgrapht", name = "jgrapht-core", version = "+" }
+                    """.trim())
+
+            it.build("""
+            java {
+                toolchain {
+                    languageVersion = JavaLanguageVersion.of(21)
+                }
+            }
+            
+            repositories {
+                mavenCentral()
+            }
+            
+            configurations {
+                runRuntime
+            }
+            
+            dependencies {
+                implementation 'net.neoforged:neoforge:+'
+            }
+            
+            runs {
+                client {
+                    dependencies {
+                        runtime libs.jgrapht
+                    }
+                    
+                    modSource project.sourceSets.main
+                }
+            }
+            """)
+            it.withToolchains()
+        })
+
+        when:
+        def run = project.run {
+            it.tasks(':writeMinecraftClasspathClient')
+        }
+
+        then:
+        run.task(':writeMinecraftClasspathClient').outcome == TaskOutcome.SUCCESS
+
+        def neoformDir = run.file(".gradle/configuration/neoForm")
+        def versionedNeoformDir = neoformDir.listFiles()[0]
+        def stepsDir = new File(versionedNeoformDir, "steps")
+        def stepDir = new File(stepsDir, "writeMinecraftClasspathClient")
+        def classpathFile = new File(stepDir, "classpath.txt")
+
+        classpathFile.exists()
+
+        classpathFile.text.contains("org.jgrapht/jgrapht-core")
     }
 }

userdev/src/main/java/net/neoforged/gradle/userdev/runtime/tasks/ClasspathSerializer.java

@@ -29,8 +29,6 @@ public void run() throws Exception {
                         .collect(Collectors.toSet()),
                 StandardCharsets.UTF_8
         );
-
-        getLogger().lifecycle("Serialized classpath to: {}", out.getAbsolutePath());
     }
 
     @InputFiles