working raaa

Signed-off-by: Jade Turner <spacey-sooty@proton.me>
spacey-sooty · Dec 2, 2024 · d2f02b6 · d2f02b6
1 parent 91d1498
commit d2f02b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/edu/wpi/first/gradlerio/deploy/CreateLogFileTask.java b/src/main/java/edu/wpi/first/gradlerio/deploy/CreateLogFileTask.java
@@ -7,12 +7,17 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.Project;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.logging.LogLevel;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.OutputFile;
 
 import java.util.HashMap;
+
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.net.InetAddress;
 import java.io.File;
@@ -32,6 +37,11 @@ public class CreateLogFileTask extends DefaultTask {
     private String json;
     private String gitDirectory;
 
+    @Inject
+    public CreateLogFileTask(Project project) {
+      deployFile = project.getObjects().fileProperty();
+    }
+
     @TaskAction
     public void execute() throws IOException {
         deployFile.getAsFile().get().getParentFile().mkdirs();
@@ -80,10 +90,6 @@ public void execute() throws IOException {
         ResourceGroovyMethods.setText(deployFile.getAsFile().get(), json);
     }
 
-    public void setDeployFile(String path) {
-      deployFile.fileValue(new File(path));
-    }
-
     public void setGitDirectory(String dir) {
         gitDirectory = dir;
     }

diff --git a/src/main/java/edu/wpi/first/gradlerio/deploy/FRCExtension.java b/src/main/java/edu/wpi/first/gradlerio/deploy/FRCExtension.java
@@ -27,7 +27,7 @@ public FRCExtension(Project project, DeployExtension deployExtension) {
 
         deployLogFile = project.getTasks().register("writeDeployFile", CreateLogFileTask.class, t -> {
             t.setGitDirectory(project.getRootDir().toString());
-            t.setDeployFile(project.getLayout().getBuildDirectory().toString() + "debug/deploy_info.json");
+            t.getDeployFile().set(project.getLayout().getBuildDirectory().file("debug/deploy_info.json"));
         });
 
         deployExtension.getDeployTask().configure(t -> {