imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 21:47:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Export runtime jars from companion projects.

Browse Source
This commit is contained in:
modmuss50
2025-10-22 23:20:14 +01:00
parent 2a47c835d1
commit e67de3f9af
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/fabricmc/loom/util/gradle/GradleUtils.java
View File

@@ -32,6 +32,7 @@ import org.gradle.api.file.RegularFileProperty;
import org.gradle.api.invocation.Gradle;
import org.gradle.api.provider.Provider;
import net.fabricmc.loom.LoomCompanionGradlePlugin;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.LoomGradlePlugin;
@@ -63,6 +64,10 @@ public final class GradleUtils {
return project.getPluginManager().hasPlugin(LoomGradlePlugin.NAME);
}
public static boolean isLoomCompanionProject(Project project) {
return project.getPluginManager().hasPlugin(LoomCompanionGradlePlugin.NAME);
}
public static Provider<Boolean> getBooleanPropertyProvider(Project project, String key) {
LoomGradleExtension extension = LoomGradleExtension.get(project);

7
src/main/java/net/fabricmc/loom/util/gradle/SourceSetHelper.java
View File

@@ -42,6 +42,7 @@ import javax.xml.xpath.XPathFactory;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.SourceSetContainer;
@@ -140,8 +141,10 @@ public final class SourceSetHelper {
}
// Add dev jars from dependency projects if the source set is "main".
if (forExport && SourceSet.MAIN_SOURCE_SET_NAME.equals(reference.sourceSet().getName()) && GradleUtils.isLoomProject(reference.project())) {
final Configuration namedElements = reference.project().getConfigurations().getByName(Constants.Configurations.NAMED_ELEMENTS);
if (forExport && SourceSet.MAIN_SOURCE_SET_NAME.equals(reference.sourceSet().getName()) && GradleUtils.isLoomCompanionProject(reference.project())) {
String configurationName = GradleUtils.isLoomProject(reference.project())
? Constants.Configurations.NAMED_ELEMENTS : JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME;
final Configuration namedElements = reference.project().getConfigurations().getByName(configurationName);
// Note: We're not looking at the artifacts from configuration variants. It's probably not needed
// (certainly not with Loom's setup), but technically someone could add child variants that add additional