Skip to content

Fix reobfuscate always using the configurations of the main source set #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shartte merged 2 commits into from
May 26, 2025
Merged

Fix reobfuscate always using the configurations of the main source set #256

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f95582c
Fix reobfuscate always using the configurations of the main source set
Technici4n May 25, 2025
0b1f2f5
Remove spots
Technici4n May 26, 2025
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
3 changes: 1 addition & 2 deletions src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.gradle.api.component.ConfigurationVariantDetails;
import org.gradle.api.file.FileCollection;
import org.gradle.api.file.RegularFileProperty;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.TaskProvider;
Expand Down Expand Up @@ -123,7 +122,7 @@ public TaskProvider<RemapJar> reobfuscate(TaskProvider<? extends AbstractArchive
// Replace the publication of the jar task with the reobfuscated jar
var configurations = project.getConfigurations();
var java = (AdhocComponentWithVariants) project.getComponents().getByName("java");
for (var configurationName : List.of(JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME, JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME)) {
for (var configurationName : List.of(sourceSet.getRuntimeElementsConfigurationName(), sourceSet.getApiElementsConfigurationName())) {
var config = configurations.getByName(configurationName);
// Mark the original configuration as NAMED to be able to disambiguate between it and the reobfuscated jar,
// this is used for example by the JarJar configuration.
Expand Down
Loading