From b32c6f044ee18229bc0a42cd111989ce06f43893 Mon Sep 17 00:00:00 2001 From: coehlrich Date: Wed, 28 Aug 2024 17:40:13 +1200 Subject: [PATCH] Fix downgrading libraries (#240) --- .../extensions/DynamicProjectExtension.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java b/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java index f60004e8..eb854865 100644 --- a/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java +++ b/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java @@ -386,10 +386,17 @@ public void runtime(final String neoFormVersion, Directory patches, Directory re launcherProfile.getArguments().set(arguments); }); + final Configuration installerRuntimeLibrariesConfiguration = ConfigurationUtils.temporaryUnhandledConfiguration( + project.getConfigurations(), + "InstallerRuntimeLibraries" + ); + installerRuntimeLibrariesConfiguration.extendsFrom(installerConfiguration); + installerRuntimeLibrariesConfiguration.shouldResolveConsistentlyWith(runtimeClasspath); + final ListProperty repoCollection = new RepositoryCollection(project.getProviders(), project.getObjects(), project.getRepositories()).getURLs(); final TaskProvider createLauncherJson = project.getTasks().register("createLauncherJson", CreateLauncherJson.class, task -> { task.getProfile().set(launcherProfile); - task.getLibraries().from(installerConfiguration); + task.getLibraries().from(installerRuntimeLibrariesConfiguration); task.getLibraries().from(pluginLayerLibraryConfiguration); task.getLibraries().from(gameLayerLibraryConfiguration); task.getLibraries().from(moduleOnlyConfiguration); @@ -540,7 +547,7 @@ public void runtime(final String neoFormVersion, Directory patches, Directory re final TaskProvider createWindowsServerArgsFile = project.getTasks().register("createWindowsServerArgsFile", CreateClasspathFiles.class, task -> { task.getModulePath().from(moduleOnlyConfiguration); - task.getClasspath().from(installerConfiguration); + task.getClasspath().from(installerRuntimeLibrariesConfiguration); task.getClasspath().from(gameLayerLibraryConfiguration); task.getClasspath().from(pluginLayerLibraryConfiguration); task.getPathSeparator().set(";"); @@ -554,7 +561,7 @@ public void runtime(final String neoFormVersion, Directory patches, Directory re final TaskProvider createUnixServerArgsFile = project.getTasks().register("createUnixServerArgsFile", CreateClasspathFiles.class, task -> { task.getModulePath().from(moduleOnlyConfiguration); - task.getClasspath().from(installerConfiguration); + task.getClasspath().from(installerRuntimeLibrariesConfiguration); task.getClasspath().from(gameLayerLibraryConfiguration); task.getClasspath().from(pluginLayerLibraryConfiguration); task.getPathSeparator().set(":");