Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ public RegularFileProperty getInputJar() {
// Multiversion stuff

public void multiversion(Action<? super MultiversionConfiguration> action) {
Action<? super Project> afterEvaluateAction = _ -> action.execute(multiversionConfiguration = new MultiversionConfiguration(getObjects()));
Action<? super Project> afterEvaluateAction = _ -> action.execute(multiversionConfiguration = new MultiversionConfiguration(getObjects(), rootProject));
if (rootProject.getState().getExecuted()) {
afterEvaluateAction.execute(rootProject);
return;
Expand All @@ -287,15 +287,42 @@ public void multiversion(Action<? super MultiversionConfiguration> action) {
}

public static class MultiversionConfiguration {
@SuppressWarnings("FieldMayBeFinal") // We use afterEvaluate so this can't be final
private FileCollection inputJars;
private final Project rootProject;
private final Property<String> archiveBaseName;
private final Property<String> archiveClassifier;
private final Property<String> archiveVersion;
private final Property<Directory> destinationDirectory;

@SuppressWarnings("FieldMayBeFinal") // We use afterEvaluate so this can't be final
private Property<FileCollection> inputJars;

@Inject
public MultiversionConfiguration(ObjectFactory objects) {
this.inputJars = objects.fileCollection();
public MultiversionConfiguration(ObjectFactory objects, Project rootProject) {
this.rootProject = rootProject;
this.inputJars = objects.property(FileCollection.class);
this.archiveBaseName = objects.property(String.class);
this.archiveClassifier = objects.property(String.class);
this.archiveVersion = objects.property(String.class);
this.destinationDirectory = objects.directoryProperty();
}

public Property<String> getArchiveBaseName() {
return archiveBaseName.convention(rootProject.getName());
}

public Property<String> getArchiveClassifier() {
return archiveClassifier.convention("multi");
}

public Property<String> getArchiveVersion() {
return archiveVersion.convention(rootProject.getVersion().toString());
}

public Property<Directory> getDestinationDirectory() {
return destinationDirectory.convention(rootProject.getLayout().getBuildDirectory().dir("forgix/multiversion"));
}

public FileCollection getInputJars() {
public Property<FileCollection> getInputJars() {
return inputJars;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,18 @@ public abstract class MergeVersionsTask extends Jar {

@Inject
public MergeVersionsTask() {
// Configure archive properties
archiveBaseName.set(settings.archiveBaseName);
archiveClassifier.set(settings.archiveClassifier);
archiveVersion.set(project.provider(() -> "${settings.archiveVersion.get()}-multi"));
destinationDirectory.set(settings.destinationDirectory.get().dir("multiversion"));

// Set up input files
if (settings.multiversionConfiguration != null) inputJarFiles.setFrom(settings.multiversionConfiguration.inputJars);
var multiversion = settings.multiversionConfiguration;

if (multiversion != null) {
// Configure archive properties
archiveBaseName.set(multiversion.archiveBaseName);
archiveClassifier.set(multiversion.archiveClassifier);
archiveVersion.set(multiversion.archiveVersion);
destinationDirectory.set(multiversion.getDestinationDirectory());

// Set up input files
inputJarFiles.setFrom(multiversion.getInputJars());
}
}

void mergeVersions() {
Expand All @@ -38,9 +42,9 @@ void mergeVersions() {
// Validate input
if (inputJarFiles.getFiles().size() < 2) {
throw new IllegalStateException("""
At least 2 jars must be selected in order for multiversion.
Please configure the forgix extension in your build.gradle file to specify the jars for multiversion.
See https://github.com/PacifistMC/Forgix for more information.""");
At least 2 jars must be selected in order for multiversion.
Please configure the forgix extension in your build.gradle file to specify the jars for multiversion.
See https://github.com/PacifistMC/Forgix for more information.""");
}

// Perform the merge operation
Expand Down