Update deploy-utils, fix deprecated method (#183)

wpilibsuite · Dec 11, 2023 · f981df1 · f981df1
1 parent c7c7d28
commit f981df1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/ToolchainPlugin/build.gradle b/ToolchainPlugin/build.gradle
@@ -17,7 +17,7 @@ repositories {
 dependencies {
     // For some utility classes. We don't actually apply DeployUtils to the FRCToolchain,
     // but we do in GradleRIO
-    api 'edu.wpi.first:DeployUtils:2023.0.0'
+    api 'edu.wpi.first:DeployUtils:2024.0.0'
     api 'de.undercouch:gradle-download-task:4.0.1'
 
     testImplementation('org.spockframework:spock-core:2.0-M4-groovy-3.0') {

diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ java {
 
 allprojects {
     group = "edu.wpi.first"
-    version = "2024.5.2"
+    version = "2024.6.0"
 
     if (project.hasProperty('publishVersion')) {
         version = project.publishVersion

diff --git a/src/main/java/edu/wpi/first/nativeutils/sourcelink/SourceLinkRules.java b/src/main/java/edu/wpi/first/nativeutils/sourcelink/SourceLinkRules.java
@@ -42,8 +42,7 @@ private void handleLinkedComponent(NativeBinarySpecInternal binary, AbstractLink
     String sourceLinkName = binary.getNamingScheme().getTaskName("generateSourceLinkFile");
 
     TaskProvider<LinkerSourceLinkGenerationTask> sourceGenTask = project.getTasks().register(sourceLinkName, LinkerSourceLinkGenerationTask.class);
-    File tmpDir = project.file(project.getBuildDir() + "/tmp/" + sourceLinkName);
-    File sourceLinkFile = project.file(tmpDir.toString() + "/SourceLink.json");
+    File sourceLinkFile = project.getLayout().getBuildDirectory().get().file("/tmp/" + sourceLinkName + "/SourceLink.json").getAsFile();
     sourceGenTask.configure(genTask -> {
         genTask.dependsOn(rootGenTask);
         Callable<Set<Object>> linkDepends = () -> linkTask.getLibs().getFrom();

diff --git a/testing/cpp/build.gradle b/testing/cpp/build.gradle
@@ -2,7 +2,7 @@ import edu.wpi.first.toolchain.NativePlatforms
 
 plugins {
     id "cpp"
-    id "edu.wpi.first.NativeUtils" version "2024.5.2"
+    id "edu.wpi.first.NativeUtils" version "2024.6.0"
 }
 
 nativeUtils.addWpiNativeUtils()