imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix SpecContext always resolving mod dependencies with the runtime attribute. (#1378)

Browse Source 
Likely fixes #1334
This commit is contained in:
modmuss
2025-10-01 14:23:05 +01:00
committed by GitHub
parent 5f513b0efc
commit 103db759f6
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/fabricmc/loom/configuration/processors/SpecContextImpl.java
View File

@@ -97,7 +97,7 @@ public record SpecContextImpl(
}
}
return sorted(AsyncCache.joinList(futures));
return distinctSorted(AsyncCache.joinList(futures));
}
private static Stream<Project> getDependentProjects(SpecContextProjectView projectView) {
@@ -129,6 +129,7 @@ public record SpecContextImpl(
private static List<ModHolder> getCompileRuntimeModsFromRemapConfigs(SpecContextProjectView projectView, AsyncCache<List<FabricModJson>> fmjCache) {
// A set of mod ids from all remap configurations that are considered for dependency transforms.
final Set<String> runtimeModIds = getModIds(
SpecContextProjectView.ArtifactUsage.RUNTIME,
projectView,
fmjCache,
projectView.extension().getRuntimeRemapConfigurations().stream()
@@ -138,6 +139,7 @@ public record SpecContextImpl(
// A set of mod ids that are found on one or more remap configurations that target the common source set.
// Null when split source sets are not enabled, meaning all mods are common.
final Set<String> commonRuntimeModIds = projectView.extension().areEnvironmentSourceSetsSplit() ? getModIds(
SpecContextProjectView.ArtifactUsage.RUNTIME,
projectView,
fmjCache,
projectView.extension().getRuntimeRemapConfigurations().stream()
@@ -146,6 +148,7 @@ public record SpecContextImpl(
: null;
Stream<FabricModJson> compileMods = getMods(
SpecContextProjectView.ArtifactUsage.COMPILE,
projectView,
fmjCache,
projectView.extension().getCompileRemapConfigurations().stream()
@@ -161,14 +164,14 @@ public record SpecContextImpl(
.toList();
}
private static Stream<FabricModJson> getMods(SpecContextProjectView projectView, AsyncCache<List<FabricModJson>> fmjCache, Stream<RemapConfigurationSettings> stream) {
return stream.flatMap(projectView.resolveArtifacts(true))
private static Stream<FabricModJson> getMods(SpecContextProjectView.ArtifactUsage artifactUsage, SpecContextProjectView projectView, AsyncCache<List<FabricModJson>> fmjCache, Stream<RemapConfigurationSettings> stream) {
return stream.flatMap(projectView.resolveArtifacts(artifactUsage))
.map(modFromZip(fmjCache))
.filter(Objects::nonNull);
}
private static Set<String> getModIds(SpecContextProjectView projectView, AsyncCache<List<FabricModJson>> fmjCache, Stream<RemapConfigurationSettings> stream) {
return getMods(projectView, fmjCache, stream)
private static Set<String> getModIds(SpecContextProjectView.ArtifactUsage artifactUsage, SpecContextProjectView projectView, AsyncCache<List<FabricModJson>> fmjCache, Stream<RemapConfigurationSettings> stream) {
return getMods(artifactUsage, projectView, fmjCache, stream)
.map(FabricModJson::getId)
.collect(Collectors.toSet());
}
@@ -198,8 +201,11 @@ public record SpecContextImpl(
}
// Sort to ensure stable caching
private static List<FabricModJson> sorted(List<FabricModJson> mods) {
return mods.stream().sorted(Comparator.comparing(FabricModJson::getId)).toList();
private static List<FabricModJson> distinctSorted(List<FabricModJson> mods) {
return mods.stream()
.distinct()
.sorted(Comparator.comparing(FabricModJson::getId))
.toList();
}
@Override

17
src/main/java/net/fabricmc/loom/configuration/processors/SpecContextProjectView.java
View File

@@ -49,12 +49,23 @@ public interface SpecContextProjectView {
// Returns a list of Loom Projects found in the specified Configuration
Stream<Project> getLoomProjectDependencies(String name);
Function<RemapConfigurationSettings, Stream<Path>> resolveArtifacts(boolean runtime);
Function<RemapConfigurationSettings, Stream<Path>> resolveArtifacts(ArtifactUsage artifactUsage);
List<FabricModJson> getMods();
boolean disableProjectDependantMods();
enum ArtifactUsage {
RUNTIME(Usage.JAVA_RUNTIME),
COMPILE(Usage.JAVA_API);
private final String gradleUsage;
ArtifactUsage(String gradleUsage) {
this.gradleUsage = gradleUsage;
}
}
record Impl(Project project, LoomGradleExtension extension) implements SpecContextProjectView {
@Override
public Stream<Project> getLoomProjectDependencies(String name) {
@@ -67,8 +78,8 @@ public interface SpecContextProjectView {
}
@Override
public Function<RemapConfigurationSettings, Stream<Path>> resolveArtifacts(boolean runtime) {
final Usage usage = project.getObjects().named(Usage.class, runtime ? Usage.JAVA_RUNTIME : Usage.JAVA_API);
public Function<RemapConfigurationSettings, Stream<Path>> resolveArtifacts(ArtifactUsage artifactUsage) {
final Usage usage = project.getObjects().named(Usage.class, artifactUsage.gradleUsage);
return settings -> {
final Configuration configuration = settings.getSourceConfiguration().get().copyRecursive();

11
src/test/groovy/net/fabricmc/loom/test/unit/SpecContextTest.groovy
View File

@@ -73,8 +73,8 @@ class SpecContextTest extends Specification {
when(projectView.extension()).thenReturn(extension)
when(extension.getRemapConfigurations()).thenReturn(remapConfigurations)
when(projectView.resolveArtifacts(true)).thenReturn(resolve(runtimeArtifacts))
when(projectView.resolveArtifacts(false)).thenReturn(resolve(apiArtifacts))
when(projectView.resolveArtifacts(SpecContextProjectView.ArtifactUsage.RUNTIME)).thenReturn(resolve(runtimeArtifacts))
when(projectView.resolveArtifacts(SpecContextProjectView.ArtifactUsage.COMPILE)).thenReturn(resolve(apiArtifacts))
implementation = createConfigurationSettings("implementation")
runtimeOnly = createConfigurationSettings("runtimeOnly")
@@ -165,7 +165,6 @@ class SpecContextTest extends Specification {
specContext.allMods().size() == 1
}
// TODO I believe this test is testing broken behaviour
def "compile only runtime only dependency"() {
setup:
def test1 = mod("test1")
@@ -179,11 +178,11 @@ class SpecContextTest extends Specification {
def specContext = SpecContextImpl.create(projectView)
then:
specContext.modDependencies().size() == 2
specContext.modDependencies().size() == 1
specContext.localMods().size() == 0
specContext.modDependenciesCompileRuntime().size() == 0
specContext.modDependenciesCompileRuntime().size() == 1
specContext.modDependenciesCompileRuntimeClient().size() == 0
specContext.allMods().size() == 2
specContext.allMods().size() == 1
}
private void dependencies(Map<Object, List<Path>> files) {