From 9e804b76e79d981e08054c5e9c53a948ffd6bc55 Mon Sep 17 00:00:00 2001 From: Apollo Nargang Date: Mon, 18 Nov 2024 22:15:04 -0500 Subject: [PATCH] Update the buttonbox bridge to 2025 --- buttonbox-bridge/build.gradle | 7 ++++--- buttonbox-bridge/vendordeps/ButtonBoxLib.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/buttonbox-bridge/build.gradle b/buttonbox-bridge/build.gradle index 868d101..0edb92f 100644 --- a/buttonbox-bridge/build.gradle +++ b/buttonbox-bridge/build.gradle @@ -2,7 +2,7 @@ plugins { id "java" id 'application' id 'com.github.johnrengelman.shadow' version '8.1.1' - id "edu.wpi.first.GradleRIO" version "2024.3.2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1" id 'edu.wpi.first.WpilibTools' version '1.3.0' } @@ -25,7 +25,8 @@ nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpinet") nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpiutil") nativeConfig.dependencies.add wpilibTools.deps.wpilib("ntcore") nativeConfig.dependencies.add wpilibTools.deps.wpilib("cscore") -nativeConfig.dependencies.add wpilibTools.deps.wpilibOpenCv("frc" + wpi.frcYear.get(), wpi.versions.opencvVersion.get()) +// TODO: Update this to 2025 (has to wait until dependency is updated) +nativeConfig.dependencies.add wpilibTools.deps.wpilibOpenCv("frc" + "2024", wpi.versions.opencvVersion.get()) dependencies { implementation wpi.java.deps.wpilib() @@ -37,7 +38,7 @@ dependencies { implementation wpilibTools.deps.wpilibJava("ntcore") implementation wpilibTools.deps.wpilibJava("cscore") implementation wpilibTools.deps.wpilibJava("cameraserver") - implementation wpilibTools.deps.wpilibOpenCvJava("frc" + wpi.frcYear.get(), wpi.versions.opencvVersion.get()) + implementation wpilibTools.deps.wpilibOpenCvJava("frc" + "2024", wpi.versions.opencvVersion.get()) implementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: wpi.versions.jacksonVersion.get() implementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: wpi.versions.jacksonVersion.get() diff --git a/buttonbox-bridge/vendordeps/ButtonBoxLib.json b/buttonbox-bridge/vendordeps/ButtonBoxLib.json index 08ae9e6..37831af 100644 --- a/buttonbox-bridge/vendordeps/ButtonBoxLib.json +++ b/buttonbox-bridge/vendordeps/ButtonBoxLib.json @@ -2,7 +2,7 @@ "fileName": "ButtonBoxLib.json", "name": "ButtonBoxLib", "version": "test", - "frcYear": "2024", + "frcYear": "2025", "uuid": "274bba2e-7c91-45eb-860e-6c38f9034afc", "mavenUrls": [ "https://roboblazers7617.github.io/ButtonBoxLib/buttonbox-lib"