imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-30 13:05:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace Deprecated .getBuildDir with .getLayout().getBuildDirectory() and make Lazy (#978)

Browse Source 
* replace Deprecated .getBuildDir with .getLayout().getBuildDirectory().getAsFile().get()

Signed-off-by: Joseph T. McQuigg <J.T.McQuigg12@gmail.com>

* Make lazy

Co-authored-by: modmuss <modmuss50@gmail.com>

* MORE

Signed-off-by: Joseph T. McQuigg <J.T.McQuigg12@gmail.com>

* remove file import

Signed-off-by: Joseph T. McQuigg <J.T.McQuigg12@gmail.com>

---------

Signed-off-by: Joseph T. McQuigg <J.T.McQuigg12@gmail.com>
Co-authored-by: modmuss <modmuss50@gmail.com>
This commit is contained in:
J.T. McQuigg
2023-12-08 04:00:34 -05:00
committed by GitHub
parent 229b3b3800
commit 53112fb0b5
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/fabricmc/loom/extension/LoomFilesProjectImpl.java
View File

@@ -53,6 +53,6 @@ public final class LoomFilesProjectImpl extends LoomFilesBaseImpl {
@Override
protected File getBuildDir() {
return project.getBuildDir();
return project.getLayout().getBuildDirectory().getAsFile().get();
}
}

6
src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
View File

@@ -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);