Skip to content

Commit f981df1

Browse files
authored
Update deploy-utils, fix deprecated method (#183)
1 parent c7c7d28 commit f981df1

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

ToolchainPlugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repositories {
1717
dependencies {
1818
// For some utility classes. We don't actually apply DeployUtils to the FRCToolchain,
1919
// but we do in GradleRIO
20-
api 'edu.wpi.first:DeployUtils:2023.0.0'
20+
api 'edu.wpi.first:DeployUtils:2024.0.0'
2121
api 'de.undercouch:gradle-download-task:4.0.1'
2222

2323
testImplementation('org.spockframework:spock-core:2.0-M4-groovy-3.0') {

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ java {
1313

1414
allprojects {
1515
group = "edu.wpi.first"
16-
version = "2024.5.2"
16+
version = "2024.6.0"
1717

1818
if (project.hasProperty('publishVersion')) {
1919
version = project.publishVersion

src/main/java/edu/wpi/first/nativeutils/sourcelink/SourceLinkRules.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ private void handleLinkedComponent(NativeBinarySpecInternal binary, AbstractLink
4242
String sourceLinkName = binary.getNamingScheme().getTaskName("generateSourceLinkFile");
4343

4444
TaskProvider<LinkerSourceLinkGenerationTask> sourceGenTask = project.getTasks().register(sourceLinkName, LinkerSourceLinkGenerationTask.class);
45-
File tmpDir = project.file(project.getBuildDir() + "/tmp/" + sourceLinkName);
46-
File sourceLinkFile = project.file(tmpDir.toString() + "/SourceLink.json");
45+
File sourceLinkFile = project.getLayout().getBuildDirectory().get().file("/tmp/" + sourceLinkName + "/SourceLink.json").getAsFile();
4746
sourceGenTask.configure(genTask -> {
4847
genTask.dependsOn(rootGenTask);
4948
Callable<Set<Object>> linkDepends = () -> linkTask.getLibs().getFrom();

testing/cpp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import edu.wpi.first.toolchain.NativePlatforms
22

33
plugins {
44
id "cpp"
5-
id "edu.wpi.first.NativeUtils" version "2024.5.2"
5+
id "edu.wpi.first.NativeUtils" version "2024.6.0"
66
}
77

88
nativeUtils.addWpiNativeUtils()

0 commit comments

Comments
 (0)