From 18e512491934e692833abaf899fb9e71088443a6 Mon Sep 17 00:00:00 2001 From: shartte Date: Tue, 19 Dec 2023 07:50:29 +0100 Subject: [PATCH] Fix extended-from Configurations not ending up in the Minecraft Classpath (#82) ClasspathSerializer for some reason doesn't seem to consider configuration inheritance. Manually add the super-configurations to the input-files instead (mirroring what is done for additional userdev dependencies) --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../userdev/runtime/definition/UserDevRuntimeDefinition.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 309b4e18d..829e1a5a9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/userdev/src/main/java/net/neoforged/gradle/userdev/runtime/definition/UserDevRuntimeDefinition.java b/userdev/src/main/java/net/neoforged/gradle/userdev/runtime/definition/UserDevRuntimeDefinition.java index 0121e9d99..509383163 100644 --- a/userdev/src/main/java/net/neoforged/gradle/userdev/runtime/definition/UserDevRuntimeDefinition.java +++ b/userdev/src/main/java/net/neoforged/gradle/userdev/runtime/definition/UserDevRuntimeDefinition.java @@ -138,7 +138,9 @@ protected Map buildRunInterpolationData(RunImpl run) { task.getInputFiles().from(this.additionalUserDevDependencies); task.getInputFiles().from(neoformRuntimeDefinition.getMinecraftDependenciesConfiguration()); - task.getInputFiles().from(run.getDependencies().get().getConfiguration()); + Configuration userDependencies = run.getDependencies().get().getConfiguration(); + userDependencies.getExtendsFrom().forEach(task.getInputFiles()::from); + task.getInputFiles().from(userDependencies); } ); configureAssociatedTask(minecraftClasspathSerializer);