From 53112fb0b56dc86177b71db3ff4f9454279a2ff7 Mon Sep 17 00:00:00 2001 From: "J.T. McQuigg" Date: Fri, 8 Dec 2023 04:00:34 -0500 Subject: [PATCH] Replace Deprecated .getBuildDir with .getLayout().getBuildDirectory() and make Lazy (#978) * replace Deprecated .getBuildDir with .getLayout().getBuildDirectory().getAsFile().get() Signed-off-by: Joseph T. McQuigg * Make lazy Co-authored-by: modmuss * MORE Signed-off-by: Joseph T. McQuigg * remove file import Signed-off-by: Joseph T. McQuigg --------- Signed-off-by: Joseph T. McQuigg Co-authored-by: modmuss --- .../net/fabricmc/loom/extension/LoomFilesProjectImpl.java | 2 +- .../java/net/fabricmc/loom/task/RemapTaskConfiguration.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/extension/LoomFilesProjectImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomFilesProjectImpl.java index 3a5897e5..4c8811b7 100644 --- a/src/main/java/net/fabricmc/loom/extension/LoomFilesProjectImpl.java +++ b/src/main/java/net/fabricmc/loom/extension/LoomFilesProjectImpl.java @@ -53,6 +53,6 @@ public final class LoomFilesProjectImpl extends LoomFilesBaseImpl { @Override protected File getBuildDir() { - return project.getBuildDir(); + return project.getLayout().getBuildDirectory().getAsFile().get(); } } diff --git a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java index cbd3630a..a6303454 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java +++ b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java @@ -24,8 +24,6 @@ package net.fabricmc.loom.task; -import java.io.File; - import javax.inject.Inject; import org.gradle.api.Project; @@ -92,7 +90,7 @@ public abstract class RemapTaskConfiguration implements Runnable { // Configure the default jar task getTasks().named(JavaPlugin.JAR_TASK_NAME, AbstractArchiveTask.class).configure(task -> { task.getArchiveClassifier().convention("dev"); - task.getDestinationDirectory().set(new File(getProject().getBuildDir(), "devlibs")); + task.getDestinationDirectory().set(getProject().getLayout().getBuildDirectory().map(directory -> directory.dir("devlibs"))); }); getTasks().named(BasePlugin.ASSEMBLE_TASK_NAME).configure(task -> task.dependsOn(remapJarTask)); @@ -139,7 +137,7 @@ public abstract class RemapTaskConfiguration implements Runnable { } sourcesJarTask.getArchiveClassifier().convention("dev-sources"); - sourcesJarTask.getDestinationDirectory().set(new File(getProject().getBuildDir(), "devlibs")); + sourcesJarTask.getDestinationDirectory().set(getProject().getLayout().getBuildDirectory().map(directory -> directory.dir("devlibs"))); task.getArchiveClassifier().convention("sources"); task.dependsOn(sourcesJarTask);