Skip to content

Commit

Permalink
Fix the issue where installer libraries are not properly collected du…
Browse files Browse the repository at this point in the history
…e to extendsFrom on detachedConfigurations not properly using all dependencies.
  • Loading branch information
marchermans committed Nov 18, 2024
1 parent b14ef7f commit c596aef
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
15 changes: 15 additions & 0 deletions .run/Remote.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Remote" type="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5005" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
import org.gradle.util.internal.GUtil;

import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.function.Function;

public class ConfigurationUtils {
Expand All @@ -39,8 +36,8 @@ private ConfigurationUtils() {
public static void extendsFrom(final Project project, final Configuration target, final Configuration... configurations) {
for (Configuration configuration : configurations) {
//We treat each configuration as a dependency collector in and of it-self, and copy the dependencies and dependency constraints to the target configuration.
target.getDependencies().addAllLater(project.provider(configuration::getDependencies));
target.getDependencyConstraints().addAllLater(project.provider(configuration::getDependencyConstraints));
target.getDependencies().addAllLater(project.provider(configuration::getAllDependencies));
target.getDependencyConstraints().addAllLater(project.provider(configuration::getAllDependencyConstraints));
}
}

Expand Down

0 comments on commit c596aef

Please sign in to comment.