From e05353bb90be114ef48f85421b71e57f63c4848c Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Tue, 31 Dec 2024 18:23:25 -0800 Subject: [PATCH 1/2] Add WPIcal --- .../java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java | 3 +++ .../first/gradlerio/wpi/dependencies/tools/WPIToolsPlugin.java | 3 +++ versionupdates.gradle | 1 + 3 files changed, 7 insertions(+) diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java index 95630cbc..bc2f08e7 100644 --- a/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java +++ b/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java @@ -24,6 +24,7 @@ public abstract class WPIVersionsExtension { private static final String sysIdVersion = "2025.1.1-beta-3"; private static final String roboRIOTeamNumberSetterVersion = "2025.1.1-beta-3"; private static final String dataLogToolVersion = "2025.1.1-beta-3"; + private static final String wpicalToolVersion = "2025.1.1"; public abstract Property getWpilibVersion(); @@ -44,6 +45,7 @@ public abstract class WPIVersionsExtension { public abstract Property getSysIdVersion(); public abstract Property getRoboRIOTeamNumberSetterVersion(); public abstract Property getDataLogToolVersion(); + public abstract Property getwpicalToolVersion(); @Inject public WPIVersionsExtension() { @@ -65,6 +67,7 @@ public WPIVersionsExtension() { getSysIdVersion().convention(sysIdVersion); getRoboRIOTeamNumberSetterVersion().convention(roboRIOTeamNumberSetterVersion); getDataLogToolVersion().convention(dataLogToolVersion); + getwpicalToolVersion().convention(wpicalToolVersion); } } diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/WPIToolsPlugin.java b/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/WPIToolsPlugin.java index 52f38ffe..7b8b127c 100644 --- a/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/WPIToolsPlugin.java +++ b/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/WPIToolsPlugin.java @@ -51,6 +51,9 @@ public void apply(Project project) { cppTools.add(new WPICppTool(project, "DataLogTool", wpi.getVersions().getDataLogToolVersion(), "edu.wpi.first.tools:DataLogTool", toolsFolder)); + cppTools.add(new WPICppTool(project, "wpical", wpi.getVersions().getwpicalToolVersion(), + "edu.wpi.first.tools:wpical", toolsFolder)); + project.getTasks().register("InstallAllTools", task -> { task.setGroup("GradleRIO"); task.setDescription("Install All Tools"); diff --git a/versionupdates.gradle b/versionupdates.gradle index 59828c68..e9e0528d 100644 --- a/versionupdates.gradle +++ b/versionupdates.gradle @@ -14,6 +14,7 @@ def versionMap = [ niLibrariesVersion: 'edu.wpi.first.ni-libraries:runtime:+:allowedimages@zip', imguiVersion: 'edu.wpi.first.thirdparty.frc2024:imgui:+:headers', wpimathVersion: 'edu.wpi.first.wpimath:wpimath-java:+' + wpicalToolVersion: 'edu.wpi.first.tools:wpical:+:windowsx86-64@zip', ] configurations { From 18fd9b0b898918e59154c7a51011bbeae3666384 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Tue, 31 Dec 2024 21:55:19 -0800 Subject: [PATCH 2/2] Add missing comma --- versionupdates.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionupdates.gradle b/versionupdates.gradle index e9e0528d..48634c67 100644 --- a/versionupdates.gradle +++ b/versionupdates.gradle @@ -13,7 +13,7 @@ def versionMap = [ opencvVersion: 'edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:+', niLibrariesVersion: 'edu.wpi.first.ni-libraries:runtime:+:allowedimages@zip', imguiVersion: 'edu.wpi.first.thirdparty.frc2024:imgui:+:headers', - wpimathVersion: 'edu.wpi.first.wpimath:wpimath-java:+' + wpimathVersion: 'edu.wpi.first.wpimath:wpimath-java:+', wpicalToolVersion: 'edu.wpi.first.tools:wpical:+:windowsx86-64@zip', ]