Skip to content

Commit 3dd8eb0

Browse files
committed
Fix gradle task default output filename, Bump Renamer to 2.0.5
1 parent 1a400d2 commit 3dd8eb0

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

renamer-gradle/src/main/java/net/minecraftforge/renamer/gradle/RenameJar.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,16 @@
2727
import org.gradle.api.tasks.PathSensitive;
2828
import org.gradle.api.tasks.PathSensitivity;
2929
import org.gradle.api.tasks.SourceSet;
30+
import org.gradle.api.tasks.TaskAction;
3031
import org.gradle.api.tasks.TaskDependency;
3132
import org.gradle.api.tasks.TaskProvider;
3233
import org.gradle.api.tasks.bundling.AbstractArchiveTask;
34+
import org.gradle.process.ExecResult;
3335
import org.jspecify.annotations.Nullable;
3436

3537
import javax.inject.Inject;
3638
import java.io.File;
39+
import java.io.IOException;
3740
import java.util.Date;
3841
import java.util.Set;
3942

@@ -72,10 +75,14 @@ public RenameJar(RenamerExtensionImpl renamer) {
7275
int idx = file.getName().lastIndexOf('.');
7376
var inputName = file.getName().substring(0, idx);
7477
var ext = file.getName().substring(idx);
78+
79+
if (classifier.isEmpty())
80+
classifier = "renamed";
81+
7582
name = inputName + '-' + classifier + ext;
7683

7784
if (name.equals(file.getName()))
78-
name = inputName + classifier + "-renamed" + ext;
85+
name = inputName + '-' + classifier + "-renamed" + ext;
7986
}
8087
return new File(file.getParentFile(), name);
8188
})).orElse(this.getDefaultOutputFile())
@@ -86,6 +93,12 @@ public RenameJar(RenamerExtensionImpl renamer) {
8693
this.getArchiveDate().convention(this.getInput().map(input -> new Date(input.getAsFile().lastModified())));
8794
}
8895

96+
@Override
97+
@TaskAction
98+
protected ExecResult exec() throws IOException {
99+
return super.exec().assertNormalExitValue().rethrowFailure();
100+
}
101+
89102
public void from(AbstractArchiveTask task) {
90103
this.from(getProject().getTasks().named(task.getName(), AbstractArchiveTask.class));
91104
}

renamer-gradle/src/main/java/net/minecraftforge/renamer/gradle/Tools.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
final class Tools {
1010
private Tools() { }
1111

12-
static final Tool RENAMER = Tool.ofForge("classes", "net.minecraftforge:renamer:2.0.1:all", 8);
12+
static final Tool RENAMER = Tool.ofForge("classes", "net.minecraftforge:renamer:2.0.5:all", 8);
1313
}

0 commit comments

Comments
 (0)