Skip to content

Commit 21a0900

Browse files
committed
Gradle: Update gradleutils-shared to disable transitive dependencies on the tool
Change main output to INFO level. Fix default filename not having hyphen
1 parent 00efe2c commit 21a0900

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

renamer-gradle/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ gradle.beforeProject { Project project ->
1919

2020
//@formatter:off
2121
dependencyResolutionManagement.versionCatalogs.register('libs') {
22-
version 'gradleutils', '3.4.1'
22+
version 'gradleutils', '3.4.3'
2323

2424
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
2525
plugin 'gradleutils', 'net.minecraftforge.gradleutils' versionRef 'gradleutils' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
package net.minecraftforge.renamer.gradle;
66

77
import net.minecraftforge.gradleutils.shared.ToolExecBase;
8-
import org.gradle.api.Task;
98
import org.gradle.api.artifacts.Dependency;
109
import org.gradle.api.artifacts.PublishArtifact;
1110
import org.gradle.api.artifacts.dsl.DependencyFactory;
1211
import org.gradle.api.file.ConfigurableFileCollection;
1312
import org.gradle.api.file.FileCollection;
1413
import org.gradle.api.file.RegularFileProperty;
15-
import org.gradle.api.internal.tasks.DefaultTaskDependency;
16-
import org.gradle.api.internal.tasks.TaskDependencyFactory;
14+
import org.gradle.api.logging.LogLevel;
1715
import org.gradle.api.plugins.JavaPluginExtension;
1816
import org.gradle.api.provider.Property;
1917
import org.gradle.api.provider.Provider;
@@ -60,6 +58,8 @@ public abstract class RenameJar extends ToolExecBase<RenamerProblems> implements
6058
@Inject
6159
public RenameJar() {
6260
super(Tools.RENAMER);
61+
// We don't want the default runs to log to the main task output
62+
this.getStandardOutputLogLevel().convention(LogLevel.INFO);
6363

6464
// As a reminder, this is overridden by manually calling one of the #mappings methods
6565
this.getMap().convention(getProviders().provider(() -> {
@@ -78,7 +78,7 @@ public RenameJar() {
7878
int idx = file.getName().lastIndexOf('.');
7979
var inputName = file.getName().substring(0, idx);
8080
var ext = file.getName().substring(idx);
81-
name = inputName + classifier + ext;
81+
name = inputName + '-' + classifier + ext;
8282

8383
if (name.equals(file.getName()))
8484
name = inputName + classifier + "-renamed" + ext;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import org.gradle.api.model.ObjectFactory;
1414
import org.gradle.api.provider.Provider;
1515
import org.gradle.api.tasks.TaskProvider;
16-
import org.gradle.api.tasks.bundling.AbstractArchiveTask;
17-
1816
import javax.inject.Inject;
1917

2018
abstract class RenamerExtensionImpl implements RenamerExtensionInternal {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
import org.gradle.api.Task;
1111
import org.gradle.api.problems.Severity;
12-
import org.gradle.api.tasks.TaskProvider;
13-
import org.gradle.api.tasks.bundling.AbstractArchiveTask;
14-
1512
import java.io.Serial;
1613

1714
abstract class RenamerProblems extends EnhancedProblems {

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.0:all", 8);
12+
static final Tool RENAMER = Tool.ofForge("classes", "net.minecraftforge:renamer:2.0.1:all", 8);
1313
}

0 commit comments

Comments
 (0)