Skip to content

Commit

Permalink
Update the buttonbox bridge to 2025
Browse files Browse the repository at this point in the history
  • Loading branch information
CoffeeCoder1 committed Nov 19, 2024
1 parent 4271165 commit 9e804b7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions buttonbox-bridge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand All @@ -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()
Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion buttonbox-bridge/vendordeps/ButtonBoxLib.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 9e804b7

Please sign in to comment.